diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2014-08-12 19:39:52 +0300 |
|---|---|---|
| committer | Jani Nikula <jani.nikula@intel.com> | 2014-08-18 10:42:42 +0300 |
| commit | 1add143caf593cfc7514f1c83470fba0664ae0a3 (patch) | |
| tree | 384448730f8336d16861512ed6641074018eb58b /drivers/gpu | |
| parent | a459249c73eaec1daf4e4657ea3564cc3550e66c (diff) | |
| download | blackbird-obmc-linux-1add143caf593cfc7514f1c83470fba0664ae0a3.tar.gz blackbird-obmc-linux-1add143caf593cfc7514f1c83470fba0664ae0a3.zip | |
drm/i915: Don't try to enable cursor from setplane when crtc is disabled
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>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/i915/intel_display.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index c2b81469abbc..283830045ee2 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -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; |
