On 2021-10-01 15:56, Sean Paul wrote:
> On Wed, Sep 29, 2021 at 03:39:26PM -0400, Mark Yacoub wrote:
>> From: Mark Yacoub <markyacoub@xxxxxxxxxx>
>>
>> [Why]
>> drm_atomic_helper_check_crtc now verifies both legacy and non-legacy LUT
>> sizes. There is no need to check it within amdgpu_dm_atomic_check.
>>
>> [How]
>> Remove the local call to verify LUT sizes and use DRM Core function
>> instead.
>>
>> Tested on ChromeOS Zork.
>>
>> Signed-off-by: Mark Yacoub <markyacoub@xxxxxxxxxxxx>
>> ---
>> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 8 ++++----
>> 1 file changed, 4 insertions(+), 4 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> index 07adac1a8c42b..96a1d006b777e 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -10683,6 +10683,10 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
>> }
>> }
>> #endif
>> + ret = drm_atomic_helper_check_crtc(state);
>> + if (ret)
>> + return ret;
>> +
>> for_each_oldnew_crtc_in_state(state, crtc, old_crtc_state, new_crtc_state, i) {
>> dm_old_crtc_state = to_dm_crtc_state(old_crtc_state);
>>
>> @@ -10692,10 +10696,6 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
>> dm_old_crtc_state->dsc_force_changed == false)
>> continue;
>>
>> - ret = amdgpu_dm_verify_lut_sizes(new_crtc_state);
>
> From a quick glance, I think you can now delete this function. It's called from
> amdgpu_dm_update_crtc_color_mgmt() which is part of the commit, so the lut sizes
> should have already been checked.
>
I agree. Would be nice if we could drop the extra call in the CM function
(after confirming that it isn't needed).
Harry
> If the call from amdgpu_dm_update_crtc_color_mgmt() is not possible to remove,
> you could replace it with a call to the new helper function. And if _that_ is
> not possible, please make amdgpu_dm_verify_lut_sizes() static :-)
>
> Sean
>
>> - if (ret)
>> - goto fail;
>> -
>> if (!new_crtc_state->enable)
>> continue;
>>
>> --
>> 2.33.0.685.g46640cef36-goog
>>
>
