]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commitdiff
drm/i915: Don't call gen8_fbc_sw_flush() on chv
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 3 Sep 2014 11:09:50 +0000 (14:09 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 3 Sep 2014 13:14:03 +0000 (15:14 +0200)
CHV doesn't have FBC, so don't go calling gen8_fbc_sw_flush() on it.

Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
[danvet: Add a FIXME comment while at it that we should rework this a
lot more.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

index d49d639bd3839665b81c86bf341920e1ca4f92ab..b8a00ed67e093ac406ab80f859983cbff8c7dfee 100644 (file)
@@ -9098,7 +9098,12 @@ void intel_frontbuffer_flush(struct drm_device *dev,
 
        intel_edp_psr_flush(dev, frontbuffer_bits);
 
-       if (IS_GEN8(dev))
+       /*
+        * FIXME: Unconditional fbc flushing here is a rather gross hack and
+        * needs to be reworked into a proper frontbuffer tracking scheme like
+        * psr employs.
+        */
+       if (IS_BROADWELL(dev))
                gen8_fbc_sw_flush(dev, FBC_REND_CACHE_CLEAN);
 }