From: Damien Lespiau Date: Thu, 16 Jan 2014 16:51:35 +0000 (+0000) Subject: drm/i915: Don't use i915_preliminary_hw_support to mean pre-production X-Git-Tag: MMI-PSA29.97-13-9~12412^2~62^2~108 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=4167e32ce0db0af42b57b93eb8faf28fc094db10;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git drm/i915: Don't use i915_preliminary_hw_support to mean pre-production Those are two distinct concepts. Just use a comment to remind us to remove that W/A at some point. Signed-off-by: Damien Lespiau Signed-off-by: Daniel Vetter --- diff --git a/drivers/gpu/drm/i915/intel_pm.c b/drivers/gpu/drm/i915/intel_pm.c index d77cc81900f9..92cc85862b0b 100644 --- a/drivers/gpu/drm/i915/intel_pm.c +++ b/drivers/gpu/drm/i915/intel_pm.c @@ -4709,8 +4709,10 @@ static void gen8_init_clock_gating(struct drm_device *dev) /* FIXME(BDW): Check all the w/a, some might only apply to * pre-production hw. */ - WARN(!i915_preliminary_hw_support, - "GEN8_CENTROID_PIXEL_OPT_DIS not be needed for production\n"); + /* + * This GEN8_CENTROID_PIXEL_OPT_DIS W/A is only needed for + * pre-production hardware + */ I915_WRITE(HALF_SLICE_CHICKEN3, _MASKED_BIT_ENABLE(GEN8_CENTROID_PIXEL_OPT_DIS)); I915_WRITE(HALF_SLICE_CHICKEN3,