[PATCH v2] drm/amd/display: Use proper enums in process_channel_reply

[Harry Wentland]

On 2018-09-27 02:11 PM, Nick Desaulniers wrote:
> On Thu, Sep 27, 2018 at 11:08 AM Nathan Chancellor
> <natechancellor at gmail.com> wrote:
>>
>> On Thu, Sep 27, 2018 at 11:06:33AM -0700, Nathan Chancellor wrote:
>>> Clang warns when one enumerated type is implicitly converted to another.
>>>
>>> drivers/gpu/drm/amd/amdgpu/../display/dc/dce/dce_aux.c:315:19: warning:
>>> implicit conversion from enumeration type 'enum
>>> aux_channel_operation_result' to different enumeration type 'enum
>>> aux_transaction_reply' [-Wenum-conversion]
>>>                 reply->status = AUX_CHANNEL_OPERATION_FAILED_HPD_DISCON;
>>>                               ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>> drivers/gpu/drm/amd/amdgpu/../display/dc/i2caux/dce110/aux_engine_dce110.c:349:19:
>>> warning: implicit conversion from enumeration type 'enum
>>> aux_channel_operation_result' to different enumeration type 'enum
>>> aux_transaction_reply' [-Wenum-conversion]
>>>                 reply->status = AUX_CHANNEL_OPERATION_FAILED_HPD_DISCON;
>>>                               ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
>>>
>>> The current enum is incorrect, it should be from aux_transaction_reply,
>>> so use AUX_TRANSACTION_REPLY_HPD_DISCON.
>>>
>>> Reported-by: Nick Desaulniers <ndesaulniers at google.com>
>>> Suggested-by: Nick Desaulniers <ndesaulniers at google.com>
>>> Signed-off-by: Nathan Chancellor <natechancellor at gmail.com>
> 
> Reviewed-by: Nick Desaulniers <ndesaulniers at google.com>

Reviewed-by: Harry Wentland <harry.wentland at amd.com>

Pulling it in through amd-staging-drm-next.

> 
>>> ---
>>>
>>> v1 -> v2:
>>>
>>> * Rather than change status to an integer, use the proper enumerated
>>>   type from aux_transaction reply as suggested by Nick and confirmed
>>>   by Henry.
>>
>> Sigh Harry, sorry...
> 

No worries. You're not the first to get that wrong. :)

Harry

> Thanks for the patch, Nathan.  Don't worry about sending a v3 over
> this; its below the commit line so this detail wont get committed.
> 
>>
>>>
>>>  drivers/gpu/drm/amd/display/dc/dce/dce_aux.c                    | 2 +-
>>>  .../gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.c    | 2 +-
>>>  2 files changed, 2 insertions(+), 2 deletions(-)
>>>
>>> diff --git a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
>>> index 3f5b2e6f7553..aaeb7faac0c4 100644
>>> --- a/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
>>> +++ b/drivers/gpu/drm/amd/display/dc/dce/dce_aux.c
>>> @@ -312,7 +312,7 @@ static void process_channel_reply(
>>>
>>>       /* in case HPD is LOW, exit AUX transaction */
>>>       if ((sw_status & AUX_SW_STATUS__AUX_SW_HPD_DISCON_MASK)) {
>>> -             reply->status = AUX_CHANNEL_OPERATION_FAILED_HPD_DISCON;
>>> +             reply->status = AUX_TRANSACTION_REPLY_HPD_DISCON;
>>>               return;
>>>       }
>>>
>>> diff --git a/drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.c b/drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.c
>>> index 8eee8ace1259..59c3ed43d609 100644
>>> --- a/drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.c
>>> +++ b/drivers/gpu/drm/amd/display/dc/i2caux/dce110/aux_engine_dce110.c
>>> @@ -346,7 +346,7 @@ static void process_channel_reply(
>>>
>>>       /* in case HPD is LOW, exit AUX transaction */
>>>       if ((sw_status & AUX_SW_STATUS__AUX_SW_HPD_DISCON_MASK)) {
>>> -             reply->status = AUX_CHANNEL_OPERATION_FAILED_HPD_DISCON;
>>> +             reply->status = AUX_TRANSACTION_REPLY_HPD_DISCON;
>>>               return;
>>>       }
>>>
>>> --
>>> 2.19.0
>>>
> 
> 
>