From 5dcb7c124af7913f67456d79c371cfb24afe052e Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 31 Aug 2017 08:34:33 +0200 Subject: [PATCH] 4.4-stable patches added patches: drm-i915-fix-compiler-warning-in-drivers-gpu-drm-i915-intel_uncore.c.patch --- ...-drivers-gpu-drm-i915-intel_uncore.c.patch | 44 +++++++++++++++++++ queue-4.4/series | 1 + 2 files changed, 45 insertions(+) create mode 100644 queue-4.4/drm-i915-fix-compiler-warning-in-drivers-gpu-drm-i915-intel_uncore.c.patch diff --git a/queue-4.4/drm-i915-fix-compiler-warning-in-drivers-gpu-drm-i915-intel_uncore.c.patch b/queue-4.4/drm-i915-fix-compiler-warning-in-drivers-gpu-drm-i915-intel_uncore.c.patch new file mode 100644 index 00000000000..d383b906c17 --- /dev/null +++ b/queue-4.4/drm-i915-fix-compiler-warning-in-drivers-gpu-drm-i915-intel_uncore.c.patch @@ -0,0 +1,44 @@ +From foo@baz Thu Aug 31 08:30:43 CEST 2017 +Date: Thu, 31 Aug 2017 08:30:43 +0200 +To: Greg KH +From: Greg Kroah-Hartman +Subject: drm/i915: fix compiler warning in drivers/gpu/drm/i915/intel_uncore.c + +From: Greg Kroah-Hartman + +When building with gcc-7, the following warning happens: + +drivers/gpu/drm/i915/intel_uncore.c: In function ‘hsw_unclaimed_reg_detect’: +drivers/gpu/drm/i915/intel_uncore.c:638:36: warning: decrement of a boolean expression [-Wbool-operation] + i915.mmio_debug = mmio_debug_once--; + ^~ + +As it's really not wise to -- on a boolean value. + +Commit 7571494004d8 ("drm/i915: Do one shot unclaimed mmio detection +less frequently") which showed up in 4.6-rc1 does solve this issue, by +rewriting the mmio detection logic, but that isn't really good to +backport to 4.4-stable, so just fix up the obvious logic here to do the +right thing. + +Cc: Chris Wilson +Cc: Paulo Zanoni +Cc: Mika Kuoppala +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/gpu/drm/i915/intel_uncore.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/gpu/drm/i915/intel_uncore.c ++++ b/drivers/gpu/drm/i915/intel_uncore.c +@@ -635,7 +635,8 @@ hsw_unclaimed_reg_detect(struct drm_i915 + "enabling oneshot unclaimed register reporting. " + "Please use i915.mmio_debug=N for more information.\n"); + __raw_i915_write32(dev_priv, FPGA_DBG, FPGA_DBG_RM_NOCLAIM); +- i915.mmio_debug = mmio_debug_once--; ++ i915.mmio_debug = mmio_debug_once; ++ mmio_debug_once = false; + } + } + diff --git a/queue-4.4/series b/queue-4.4/series index 37fd9d2e60f..9090af91e63 100644 --- a/queue-4.4/series +++ b/queue-4.4/series @@ -12,3 +12,4 @@ x86-io-add-memory-clobber-to-insb-insw-insl-outsb-outsw-outsl.patch arm64-fpsimd-prevent-registers-leaking-across-exec.patch scsi-sg-protect-accesses-to-reserved-page-array.patch scsi-sg-reset-res_in_use-after-unlinking-reserved-array.patch +drm-i915-fix-compiler-warning-in-drivers-gpu-drm-i915-intel_uncore.c.patch -- 2.47.3