[PATCH] drm/xe: Fix drm-next merge

[Lucas De Marchi]

On Mon, Nov 04, 2024 at 08:24:16PM +0100, Thomas Hellström wrote:
>On Mon, 2024-11-04 at 10:31 -0800, Lucas De Marchi wrote:
>> Fix merge in commit c787c2901e2c ("Merge drm/drm-next into
>> drm-xe-next"). That workaround needs to be done only once.
>>
>> Fixes: c787c2901e2c ("Merge drm/drm-next into drm-xe-next")
>> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
>> ---
>>  drivers/gpu/drm/xe/xe_guc_ct.c | 19 -------------------
>>  1 file changed, 19 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/xe/xe_guc_ct.c
>> b/drivers/gpu/drm/xe/xe_guc_ct.c
>> index a405b9218ad2d..550eeed43903b 100644
>> --- a/drivers/gpu/drm/xe/xe_guc_ct.c
>> +++ b/drivers/gpu/drm/xe/xe_guc_ct.c
>> @@ -1017,7 +1017,6 @@ static int guc_ct_send_recv(struct xe_guc_ct
>> *ct, const u32 *action, u32 len,
>>  	}
>>  
>>  	ret = wait_event_timeout(ct->g2h_fence_wq, g2h_fence.done,
>> HZ);
>> -
>
>This looks unrelated.
>Otherwise LGTM.
>Reviewed-by: Thomas Hellström <thomas.hellstrom at linux.intel.com>

I added a note in the commit message about this line and pushed to
drm-xe-next.

Thanks
Lucas De Marchi