On Tue, 12 Aug 2014, Paulo Zanoni <[email protected]> wrote: > 2014-08-12 13:39 GMT-03:00 <[email protected]>: >> From: Ville Syrjälä <[email protected]> >> >> 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. > > If this is going to replace part of the fix I recently submitted, it > needs Cc: [email protected].
Picked this up for -fixes. BR, Jani. > > I briefly smoke-tested it and it appears to properly replace the > "intel_crtc->active" early return which you pointed. > >> >> Cc: Paulo Zanoni <[email protected]> >> Signed-off-by: Ville Syrjälä <[email protected]> >> --- >> drivers/gpu/drm/i915/intel_display.c | 4 ++-- >> 1 file changed, 2 insertions(+), 2 deletions(-) >> >> diff --git a/drivers/gpu/drm/i915/intel_display.c >> b/drivers/gpu/drm/i915/intel_display.c >> index 511c8f4..123cbf1 100644 >> --- a/drivers/gpu/drm/i915/intel_display.c >> +++ b/drivers/gpu/drm/i915/intel_display.c >> @@ -11701,8 +11701,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; >> -- >> 1.8.5.5 >> > > > > -- > Paulo Zanoni > _______________________________________________ > Intel-gfx mailing list > [email protected] > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
