[5.4,104/141] drm/i915: Avoid div-by-zero on gen2

Message ID	20210517140246.279576967@linuxfoundation.org
State	New
Headers	show Return-Path: <stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Chris Wilson <chris@chris-wilson.co.uk>, =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= <ville.syrjala@linux.intel.com>, Jani Nikula <jani.nikula@intel.com> Subject: [PATCH 5.4 104/141] drm/i915: Avoid div-by-zero on gen2 Date: Mon, 17 May 2021 16:02:36 +0200 Message-Id: <20210517140246.279576967@linuxfoundation.org> In-Reply-To: <20210517140242.729269392@linuxfoundation.org> References: <20210517140242.729269392@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [5.4,003/141] tpm, tpm_tis: Reserve locality in tpm_tis_resume() [5.4,005/141] PM: runtime: Fix unpaired parent child_count for force_resume [5.4,008/141] ASoC: Intel: bytcr_rt5640: Enable jack-detect support on Asus T100TAF [5.4,009/141] net: stmmac: Set FIFO sizes for ipq806x [5.4,010/141] ASoC: rsnd: core: Check convert rate in rsnd_hw_params [5.4,011/141] i2c: bail out early when RDWR parameters are wrong [5.4,012/141] ALSA: hdsp: dont disable if not enabled [5.4,013/141] ALSA: hdspm: dont disable if not enabled [5.4,015/141] ALSA: bebob: enable to deliver MIDI messages for multiple ports [5.4,017/141] Bluetooth: initialize skb_queue_head at l2cap_chan_create() [5.4,019/141] Bluetooth: check for zapped sk before connecting [5.4,020/141] ip6_vti: proper dev_{hold\|put} in ndo_[un]init methods [5.4,021/141] ASoC: Intel: bytcr_rt5640: Add quirk for the Chuwi Hi8 tablet [5.4,025/141] mt76: mt76x0: disable GTK offloading [5.4,028/141] Revert "iommu/amd: Fix performance counter initialization" [5.4,037/141] ASoC: rt286: Generalize support for ALC3263 codec [5.4,039/141] net: sched: tapr: prevent cycle_time == 0 in parse_taprio_schedule [5.4,040/141] samples/bpf: Fix broken tracex1 due to kprobe argument change [5.4,041/141] powerpc/pseries: Stop calling printk in rtas_stop_self() [5.4,044/141] wl3501_cs: Fix out-of-bounds warnings in wl3501_mgmt_join [5.4,046/141] powerpc/iommu: Annotate nested lock for lockdep [5.4,048/141] net: ethernet: mtk_eth_soc: fix RX VLAN offload [5.4,049/141] bnxt_en: Add PCI IDs for Hyper-V VF devices. [5.4,051/141] ASoC: rt286: Make RT286_SET_GPIO_* readable and writable [5.4,054/141] PCI: iproc: Fix return value of iproc_msi_irq_domain_alloc() [5.4,055/141] PCI: Release OF node in pci_scan_device()s error path [5.4,056/141] ARM: 9064/1: hw_breakpoint: Do not directly check the events overflow_handler hook [5.4,059/141] NFS: Deal correctly with attribute generation counter overflow [5.4,060/141] PCI: endpoint: Fix missing destroy_workqueue() [5.4,061/141] pNFS/flexfiles: fix incorrect size check in decode_nfs_fh() [5.4,064/141] ceph: fix inode leak on getattr error in __fh_to_dentry [5.4,068/141] net: hns3: add check for HNS3_NIC_STATE_INITED in hns3_reset_notify_up_enet() [5.4,070/141] net: hns3: use netif_tx_disable to stop the transmit queue [5.4,072/141] sctp: do asoc update earlier in sctp_sf_do_dupcook_a [5.4,073/141] RISC-V: Fix error code returned by riscv_hartid_to_cpuid() [5.4,074/141] sunrpc: Fix misplaced barrier in call_decode [5.4,075/141] ethernet:enic: Fix a use after free bug in enic_hard_start_xmit [5.4,077/141] netfilter: xt_SECMARK: add new revision to fix structure layout [5.4,083/141] ksm: fix potential missing rmap_item for stable_node [5.4,084/141] net: fix nla_strcmp to handle more then one trailing null character [5.4,086/141] netfilter: nfnetlink_osf: Fix a missing skb_header_pointer() NULL check [5.4,087/141] can: m_can: m_can_tx_work_queue(): fix tx_skb race condition [5.4,088/141] sched: Fix out-of-bound access in uclamp [5.4,090/141] kernel: kexec_file: fix error return code of kexec_calculate_store_digests() [5.4,092/141] i40e: Fix use-after-free in i40e_client_subtask() [5.4,093/141] i40e: fix the restart auto-negotiation after FEC modified [5.4,094/141] i40e: Fix PHY type identifiers for 2.5G and 5G adapters [5.4,096/141] ARC: mm: PAE: use 40-bit physical page mask [5.4,099/141] hfsplus: prevent corruption in shrinking truncate [5.4,104/141] drm/i915: Avoid div-by-zero on gen2 [5.4,105/141] iio: proximity: pulsedlight: Fix rumtime PM imbalance on error [5.4,112/141] iomap: fix sub-page uptodate handling [5.4,114/141] usb: dwc3: pci: Enable usb2-gadget-lpm-disable for Intel Merrifield [5.4,117/141] usb: core: hub: fix race condition about TRSMRCY of resume [5.4,118/141] usb: dwc3: gadget: Return success always for kick transfer in ep queue [5.4,120/141] xhci: Add reset resume quirk for AMD xhci controller. [5.4,124/141] KVM: x86: Cancel pvclock_gtod_work on module removal [5.4,125/141] mm: fix struct page layout on 32-bit systems [5.4,126/141] FDDI: defxx: Make MMIO the configuration default except for EISA [5.4,130/141] thermal/core/fair share: Lock the thermal zone while looping over instances [5.4,132/141] ARM: 9011/1: centralize phys-to-virt conversion of DT/ATAGS address [5.4,133/141] ARM: 9012/1: move device tree mapping out of linear region [5.4,134/141] ARM: 9020/1: mm: use correct section size macro to describe the FDT virtual address [5.4,136/141] usb: typec: tcpm: Fix error while calculating PPS out values [5.4,139/141] clk: exynos7: Mark aclk_fsys1_200 as critical [5.4,140/141] nvme: do not try to reconfigure APST when the controller is not live

Message ID

20210517140246.279576967@linuxfoundation.org

State

New

Headers

From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
To: linux-kernel@vger.kernel.org
Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org,
	Chris Wilson <chris@chris-wilson.co.uk>, 
	=?utf-8?b?VmlsbGUgU3lyasOkbMOk?= <ville.syrjala@linux.intel.com>,
	Jani Nikula <jani.nikula@intel.com>
Subject: [PATCH 5.4 104/141] drm/i915: Avoid div-by-zero on gen2
Date: Mon, 17 May 2021 16:02:36 +0200
Message-Id: <20210517140246.279576967@linuxfoundation.org>
In-Reply-To: <20210517140242.729269392@linuxfoundation.org>
References: <20210517140242.729269392@linuxfoundation.org>
User-Agent: quilt/0.66
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Precedence: bulk

Series

None | expand

Commit Message

Greg Kroah-Hartman May 17, 2021, 2:02 p.m. UTC

From: Ville Syrjälä <ville.syrjala@linux.intel.com>

commit 4819d16d91145966ce03818a95169df1fd56b299 upstream.

Gen2 tiles are 2KiB in size so i915_gem_object_get_tile_row_size()
can in fact return <4KiB, which leads to div-by-zero here.
Avoid that.

Not sure i915_gem_object_get_tile_row_size() is entirely
sane anyway since it doesn't account for the different tile
layouts on i8xx/i915...

I'm not able to hit this before commit 6846895fde05 ("drm/i915:
Replace PIN_NONFAULT with calls to PIN_NOEVICT") and it looks
like I also need to run recent version of Mesa. With those in
place xonotic trips on this quite easily on my 85x.

Cc: stable@vger.kernel.org
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20210421153401.13847-2-ville.syrjala@linux.intel.com
(cherry picked from commit ed52c62d386f764194e0184fdb905d5f24194cae)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/gpu/drm/i915/gem/i915_gem_mman.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/gpu/drm/i915/gem/i915_gem_mman.c
+++ b/drivers/gpu/drm/i915/gem/i915_gem_mman.c
@@ -181,7 +181,7 @@  compute_partial_view(const struct drm_i9
 	struct i915_ggtt_view view;
 
 	if (i915_gem_object_is_tiled(obj))
-		chunk = roundup(chunk, tile_row_pages(obj));
+		chunk = roundup(chunk, tile_row_pages(obj) ?: 1);
 
 	view.type = I915_GGTT_VIEW_PARTIAL;
 	view.partial.offset = rounddown(page_offset, chunk);

[5.4,104/141] drm/i915: Avoid div-by-zero on gen2

Commit Message

Patch