[Intel-gfx] [PATCH 1/4] drm/i915: Don't try to enable cursor from setplane when crtc is disabled

[Jani Nikula]

On Tue, 12 Aug 2014, Paulo Zanoni <przanoni at gmail.com> wrote:
> 2014-08-12 13:39 GMT-03:00  <ville.syrjala at linux.intel.com>:
>> From: Ville Syrjälä <ville.syrjala at linux.intel.com>
>>
>> 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: stable at vger.kernel.org.

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 <przanoni at gmail.com>
>> Signed-off-by: Ville Syrjälä <ville.syrjala at linux.intel.com>
>> ---
>>  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
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center