drm/i915: Only set CURSOR_PIPE_CSC_ENABLE when cursor is enabled
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Fri, 12 Sep 2014 17:53:33 +0000 (20:53 +0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 19 Sep 2014 12:43:12 +0000 (14:43 +0200)
It seems cleaner if we keep CURCNTR at 0 when the cursor is disabled,
so don't set the CURSOR_PIPE_CSC_ENABLE bit unless the cursor is
enabled.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
drivers/gpu/drm/i915/intel_display.c

Simple merge