On 2017-10-17 04:12 PM, Nicolai Hähnle wrote:
> On 17.10.2017 19:45, Tom St Denis wrote:
>> If the allocation fails in amdgpu_dm_connector_funcs_reset() the
>> API cannot continue so trigger a BUG_ON.
>
> That seems questionable to be honest. The drm_atomic_helper version of this function ends up setting connector->state = NULL; in this case.
>
If we feel this BUG_ON is a priority this patch is
Acked-by: Harry Wentland <harry.wentland at amd.com>
Ultimately it wouldn't be hard to just copy/pase the drm_atomic_helper
version, plus the amdgpu_dm specific stuff. That sounds like the more
correct approach to me and will keep us from weird behavior should Daniel
do another drive-by-refactor in the atomic framework.
Harry
> Cheers,
> Nicolai
>
>>
>> Signed-off-by: Tom St Denis <tom.stdenis at amd.com>
>> ---
>> Â drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 +
>> Â 1 file changed, 1 insertion(+)
>>
>> 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 58e29a2a5ca6..ac58ba4f10cf 100644
>> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
>> @@ -2722,6 +2722,7 @@ void amdgpu_dm_connector_funcs_reset(struct drm_connector *connector)
>> Â Â Â Â Â kfree(state);
>> Â Â Â Â Â Â state = kzalloc(sizeof(*state), GFP_KERNEL);
>> +Â Â Â BUG_ON(state == NULL);
>> Â Â Â Â Â Â if (state) {
>> Â Â Â Â Â Â Â Â Â state->scaling = RMX_OFF;
>>
>
>
