[Intel-gfx] [PATCH 3/3] drm/i915: Update color management during vblank evasion.

[Lionel Landwerlin]

On 30/03/16 17:41, Lionel Landwerlin wrote:
> On 30/03/16 16:16, Maarten Lankhorst wrote:
>> Without this a vblank may occur between updating color management
>> and planes, which should be prevented.
>>
>> intel_color_set_csc was called in update pipe config because the
>> handover from hardware may not have any csc set, which resulted
>> in a black screen. Because of this also update color management
>> during fastset.
>>
>> Signed-off-by: Maarten Lankhorst <maarten.lankhorst at linux.intel.com>
> Tested-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin at intel.com>

>
>> ---
>>   drivers/gpu/drm/i915/intel_display.c | 25 ++++++++++---------------
>>   1 file changed, 10 insertions(+), 15 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/i915/intel_display.c 
>> b/drivers/gpu/drm/i915/intel_display.c
>> index 4f913e5febf1..179461b45ce3 100644
>> --- a/drivers/gpu/drm/i915/intel_display.c
>> +++ b/drivers/gpu/drm/i915/intel_display.c
>> @@ -3222,9 +3222,6 @@ static void intel_update_pipe_config(struct 
>> intel_crtc *crtc,
>>                 old_crtc_state->pipe_src_w, old_crtc_state->pipe_src_h,
>>                 pipe_config->pipe_src_w, pipe_config->pipe_src_h);
>>   -    if (HAS_DDI(dev))
>> -        intel_color_set_csc(&pipe_config->base);
>> -
>>       /*
>>        * Update pipe size and adjust fitter if needed: the reason for 
>> this is
>>        * that in compute_mode_changes we check the native mode (not 
>> the pfit
>> @@ -13603,18 +13600,6 @@ static int intel_atomic_commit(struct 
>> drm_device *dev,
>>               dev_priv->display.crtc_enable(crtc);
>>           }
>>   -        if (!modeset &&
>> -            crtc->state->active &&
>> -            crtc->state->color_mgmt_changed) {
>> -            /*
>> -             * Only update color management when not doing
>> -             * a modeset as this will be done by
>> -             * crtc_enable already.
>> -             */
>> -            intel_color_set_csc(crtc->state);
>> -            intel_color_load_luts(crtc->state);
>> -        }
>> -
>>           if (!modeset)
>> intel_pre_plane_update(to_intel_crtc_state(old_crtc_state));
>>   @@ -13933,6 +13918,16 @@ static void intel_begin_crtc_commit(struct 
>> drm_crtc *crtc,
>>       if (modeset)
>>           return;
>>   +    if (crtc->state->color_mgmt_changed || 
>> to_intel_crtc_state(crtc->state)->update_pipe) {
>> +        /*
>> +         * Only update color management when not doing
>> +         * a modeset as this will be done by
>> +         * crtc_enable already.
>> +         */
> I guess we can drop this comment.
>> + intel_color_set_csc(crtc->state);
>> +        intel_color_load_luts(crtc->state);
>> +    }
>> +
>>       if (to_intel_crtc_state(crtc->state)->update_pipe)
>>           intel_update_pipe_config(intel_crtc, old_intel_state);
>>       else if (INTEL_INFO(dev)->gen >= 9)
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx