drm/i915: Don't try to enable cursor from setplane when crtc is disabled
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Tue, 12 Aug 2014 16:39:52 +0000 (19:39 +0300)
committerJani Nikula <jani.nikula@intel.com>
Mon, 18 Aug 2014 07:42:42 +0000 (10:42 +0300)
Make sure the cursor gets fully clipped when enabling it on a disabled
crtc via setplane. This will prevent the lower level code from
attempting to enable the cursor in hardware.

Cc: Paulo Zanoni <przanoni@gmail.com>
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>
Cc: stable@vger.kernel.org
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_display.c

index c2b81469abbcf77f6b839eee4139ecb69e17d1d6..283830045ee2d16e0535d2667204c1cbfd419c5b 100644 (file)
@@ -11693,8 +11693,8 @@ intel_cursor_plane_update(struct drm_plane *plane, struct drm_crtc *crtc,
        };
        const struct drm_rect clip = {
                /* integer pixels */
-               .x2 = intel_crtc->config.pipe_src_w,
-               .y2 = intel_crtc->config.pipe_src_h,
+               .x2 = intel_crtc->active ? intel_crtc->config.pipe_src_w : 0,
+               .y2 = intel_crtc->active ? intel_crtc->config.pipe_src_h : 0,
        };
        bool visible;
        int ret;