Re: [PATCH v4 2/6] drm/amdgpu: use pci_set_master in amdgpu_device_mode1_reset

[Christian König]

On 11/9/26 18:13, Pierre-Eric Pelloux-Prayer wrote:
> It's explicitly disabled above but never re-enabled, assuming
> that amdgpu_device_load_pci_state would restore it. But if
> pci_clear_master was called before entering amdgpu_device_mode1_reset
> the saved state won't have the master status.
> 
> Reported-by: Sashiko-bot <sashiko-bot@xxxxxxxxxx>
> Closes: https://sashiko.dev/#/patchset/20261029152000.22001-1-pierre-eric.pelloux-prayer@xxxxxxx?part=4
> Signed-off-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@xxxxxxx>

Acked-by: Christian König <christian.koenig@xxxxxxx>

> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> index 5069042b5279..730e9e93d078 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
> @@ -4981,6 +4981,10 @@ int amdgpu_device_mode1_reset(struct amdgpu_device *adev)
>  	smp_mb();
>  
>  	amdgpu_device_load_pci_state(adev->pdev);
> +
> +	/* enable BM back */
> +	pci_set_master(adev->pdev);
> +
>  	ret = amdgpu_psp_wait_for_bootloader(adev);
>  	if (ret)
>  		goto mode1_reset_failed;