From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:45420 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751904AbbGaTiD (ORCPT ); Fri, 31 Jul 2015 15:38:03 -0400 Subject: Patch "agp/intel: Fix typo in needs_ilk_vtd_wa()" has been added to the 4.1-stable tree To: chris@chris-wilson.co.uk, daniel.vetter@ffwll.ch, gregkh@linuxfoundation.org, jani.nikula@intel.com, lantw44@gmail.com Cc: , From: Date: Fri, 31 Jul 2015 12:38:00 -0700 Message-ID: <143837148012136@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled agp/intel: Fix typo in needs_ilk_vtd_wa() to the 4.1-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: agp-intel-fix-typo-in-needs_ilk_vtd_wa.patch and it can be found in the queue-4.1 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 8b572a4200828b4e75cc22ed2f494b58d5372d65 Mon Sep 17 00:00:00 2001 From: Chris Wilson Date: Sun, 28 Jun 2015 14:18:16 +0100 Subject: agp/intel: Fix typo in needs_ilk_vtd_wa() From: Chris Wilson commit 8b572a4200828b4e75cc22ed2f494b58d5372d65 upstream. In needs_ilk_vtd_wa(), we pass in the GPU device but compared it against the ids for the mobile GPU and the mobile host bridge. That latter is impossible and so likely was just a typo for the desktop GPU device id (which is also buggy). Fixes commit da88a5f7f7d434e2cde1b3e19d952e6d84533662 Author: Chris Wilson Date: Wed Feb 13 09:31:53 2013 +0000 drm/i915: Disable WC PTE updates to w/a buggy IOMMU on ILK Reported-by: Ting-Wei Lan Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=91127 References: https://bugzilla.freedesktop.org/show_bug.cgi?id=60391 Signed-off-by: Chris Wilson Cc: Daniel Vetter Reviewed-by: Daniel Vetter Signed-off-by: Jani Nikula Signed-off-by: Greg Kroah-Hartman --- drivers/char/agp/intel-gtt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -581,7 +581,7 @@ static inline int needs_ilk_vtd_wa(void) /* Query intel_iommu to see if we need the workaround. Presumably that * was loaded first. */ - if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_HB || + if ((gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_D_IG || gpu_devid == PCI_DEVICE_ID_INTEL_IRONLAKE_M_IG) && intel_iommu_gfx_mapped) return 1; Patches currently in stable-queue which might be from chris@chris-wilson.co.uk are queue-4.1/drm-i915-declare-the-swizzling-unknown-for-l-shaped-configurations.patch queue-4.1/drm-i915-fix-backlight-after-resume-on-855gm.patch queue-4.1/revert-drm-i915-declare-the-swizzling-unknown-for-l-shaped-configurations.patch queue-4.1/drm-stop-resetting-connector-state-to-unknown.patch queue-4.1/drm-i915-snapshot-seqno-of-most-recently-submitted-request.patch queue-4.1/drm-i915-use-two-32bit-reads-for-select-64bit-reg_read-ioctls.patch queue-4.1/agp-intel-fix-typo-in-needs_ilk_vtd_wa.patch