]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
drm/i915: Simplify NEEDS_WaRsDisableCoarsePowerGating
authorChris Wilson <chris@chris-wilson.co.uk>
Fri, 15 Nov 2019 12:27:55 +0000 (12:27 +0000)
committerChris Wilson <chris@chris-wilson.co.uk>
Fri, 15 Nov 2019 16:43:33 +0000 (16:43 +0000)
It applies to all gen9 and gen10 now, so we can use a single test
against the gen bitmask.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Tvrtko Ursulin <tvrtko.ursulin@linux.intel.com>
Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20191115122755.830355-1-chris@chris-wilson.co.uk
drivers/gpu/drm/i915/i915_drv.h

index 1779f600fcfb37a75fb070d38d2fab1f1ab74000..7bc1d8c102b2f1c4bb0fd9e98d4ec4659cb69742 100644 (file)
@@ -1660,7 +1660,7 @@ IS_SUBPLATFORM(const struct drm_i915_private *i915,
 
 /* WaRsDisableCoarsePowerGating:skl,cnl */
 #define NEEDS_WaRsDisableCoarsePowerGating(dev_priv) \
-       (IS_CANNONLAKE(dev_priv) || IS_GEN(dev_priv, 9))
+       IS_GEN_RANGE(dev_priv, 9, 10)
 
 #define HAS_GMBUS_IRQ(dev_priv) (INTEL_GEN(dev_priv) >= 4)
 #define HAS_GMBUS_BURST_READ(dev_priv) (INTEL_GEN(dev_priv) >= 10 || \