drm/amd/display: Remove unsued mutex and spinlock.

They seem to be obsolete.

Signed-off-by: Andrey Grodzovsky <andrey.grodzovsky@amd.com>
Reviewed-by: Harry Wentland <harry.wentland@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>

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 741ca9e75590cce8c625402b8c6e6207ced25122..12fcfd43877610f051077684b8365d1a64bae901 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
@@ -411,12 +411,6 @@ static int amdgpu_dm_init(struct amdgpu_device *adev)
        /* Zero all the fields */
        memset(&init_data, 0, sizeof(init_data));
 
-       /* initialize DAL's lock (for SYNC context use) */
-       spin_lock_init(&adev->dm.dal_lock);
-
-       /* initialize DAL's mutex */
-       mutex_init(&adev->dm.dal_mutex);
-
        if(amdgpu_dm_irq_init(adev)) {
                DRM_ERROR("amdgpu: failed to initialize DM IRQ support.\n");
                goto error;

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 33dc5dce1f6d625e0ce70585bffd1df28f474704..b3b5a40aee07e371f30f080f06604ef668f0bdef 100644 (file)
--- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
+++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h
@@ -85,8 +85,6 @@ struct amdgpu_display_manager {
        struct dal *dal;
        struct dc *dc;
        struct cgs_device *cgs_device;
-       /* lock to be used when DAL is called from SYNC IRQ context */
-       spinlock_t dal_lock;
 
        struct amdgpu_device *adev;     /*AMD base driver*/
        struct drm_device *ddev;        /*DRM base driver*/
@@ -123,13 +121,6 @@ struct amdgpu_display_manager {
        struct list_head timer_handler_list;
        struct workqueue_struct *timer_workqueue;
 
-       /* Use dal_mutex for any activity which is NOT syncronized by
-        * DRM mode setting locks.
-        * For example: amdgpu_dm_hpd_low_irq() calls into DAL *without*
-        * DRM mode setting locks being acquired. This is where dal_mutex
-        * is acquired before calling into DAL. */
-       struct mutex dal_mutex;
-
        struct backlight_device *backlight_dev;
 
        const struct dc_link *backlight_link;