2022-10-28 20:57:40

by Hamza Mahfooz

Subject: [PATCH] drm/amd/display: drop vblank_lock from struct amdgpu_display_manager

As of commit 09a5df6c444c ("drm/amd/display: Fix multi-display support
for idle opt workqueue"), vblank_lock is no longer being used. So, don't
init it in amdgpu_dm_init() and remove it from struct
amdgpu_display_manager.

Signed-off-by: Hamza Mahfooz <[email protected]>
---
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 -
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 -------
2 files changed, 8 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 eb4ce7216104..11afb4b24fd9 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -1394,7 +1394,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)

mutex_init(&adev->dm.dc_lock);
mutex_init(&adev->dm.audio_lock);
- spin_lock_init(&adev->dm.vblank_lock);

if(amdgpu_dm_irq_init(adev)) {
DRM_ERROR("amdgpu: failed to initialize DM IRQ support.\n");
diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
index b5ce15c43bcc..b618b2586e7b 100644
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -365,13 +365,6 @@ struct amdgpu_display_manager {
*/
struct mutex audio_lock;

- /**
- * @vblank_lock:
- *
- * Guards access to deferred vblank work state.
- */
- spinlock_t vblank_lock;
-
/**
* @audio_component:
*
--
2.38.0

2022-10-31 15:56:31

by Harry Wentland

Subject: Re: [PATCH] drm/amd/display: drop vblank_lock from struct amdgpu_display_manager

On 2022-10-28 16:44, Hamza Mahfooz wrote:
> As of commit 09a5df6c444c ("drm/amd/display: Fix multi-display support
> for idle opt workqueue"), vblank_lock is no longer being used. So, don't
> init it in amdgpu_dm_init() and remove it from struct
> amdgpu_display_manager.
>
> Signed-off-by: Hamza Mahfooz <[email protected]>

Reviewed-by: Harry Wentland <[email protected]>

Harry

> ---
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 -
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 -------
> 2 files changed, 8 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 eb4ce7216104..11afb4b24fd9 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -1394,7 +1394,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
>
> mutex_init(&adev->dm.dc_lock);
> mutex_init(&adev->dm.audio_lock);
> - spin_lock_init(&adev->dm.vblank_lock);
>
> if(amdgpu_dm_irq_init(adev)) {
> DRM_ERROR("amdgpu: failed to initialize DM IRQ support.\n");
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> index b5ce15c43bcc..b618b2586e7b 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
> @@ -365,13 +365,6 @@ struct amdgpu_display_manager {
> */
> struct mutex audio_lock;
>
> - /**
> - * @vblank_lock:
> - *
> - * Guards access to deferred vblank work state.
> - */
> - spinlock_t vblank_lock;
> -
> /**
> * @audio_component:
> *