diff options
author | Andrey Grodzovsky <andrey.grodzovsky@amd.com> | 2018-01-19 16:35:05 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2018-02-19 14:18:45 -0500 |
commit | d45d97b2437ec621ba56387e9cff8aa288aa88f9 (patch) | |
tree | 252b43a40d7c0804aafdc59de233b0154d6a121a /drivers | |
parent | f3b72c7b00bd36773005e1bfea6b2bb558eb254f (diff) |
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>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 9 |
2 files changed, 0 insertions, 15 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 741ca9e75590..12fcfd438776 100644 --- 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) | |||
411 | /* Zero all the fields */ | 411 | /* Zero all the fields */ |
412 | memset(&init_data, 0, sizeof(init_data)); | 412 | memset(&init_data, 0, sizeof(init_data)); |
413 | 413 | ||
414 | /* initialize DAL's lock (for SYNC context use) */ | ||
415 | spin_lock_init(&adev->dm.dal_lock); | ||
416 | |||
417 | /* initialize DAL's mutex */ | ||
418 | mutex_init(&adev->dm.dal_mutex); | ||
419 | |||
420 | if(amdgpu_dm_irq_init(adev)) { | 414 | if(amdgpu_dm_irq_init(adev)) { |
421 | DRM_ERROR("amdgpu: failed to initialize DM IRQ support.\n"); | 415 | DRM_ERROR("amdgpu: failed to initialize DM IRQ support.\n"); |
422 | goto error; | 416 | 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 33dc5dce1f6d..b3b5a40aee07 100644 --- 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 { | |||
85 | struct dal *dal; | 85 | struct dal *dal; |
86 | struct dc *dc; | 86 | struct dc *dc; |
87 | struct cgs_device *cgs_device; | 87 | struct cgs_device *cgs_device; |
88 | /* lock to be used when DAL is called from SYNC IRQ context */ | ||
89 | spinlock_t dal_lock; | ||
90 | 88 | ||
91 | struct amdgpu_device *adev; /*AMD base driver*/ | 89 | struct amdgpu_device *adev; /*AMD base driver*/ |
92 | struct drm_device *ddev; /*DRM base driver*/ | 90 | struct drm_device *ddev; /*DRM base driver*/ |
@@ -123,13 +121,6 @@ struct amdgpu_display_manager { | |||
123 | struct list_head timer_handler_list; | 121 | struct list_head timer_handler_list; |
124 | struct workqueue_struct *timer_workqueue; | 122 | struct workqueue_struct *timer_workqueue; |
125 | 123 | ||
126 | /* Use dal_mutex for any activity which is NOT syncronized by | ||
127 | * DRM mode setting locks. | ||
128 | * For example: amdgpu_dm_hpd_low_irq() calls into DAL *without* | ||
129 | * DRM mode setting locks being acquired. This is where dal_mutex | ||
130 | * is acquired before calling into DAL. */ | ||
131 | struct mutex dal_mutex; | ||
132 | |||
133 | struct backlight_device *backlight_dev; | 124 | struct backlight_device *backlight_dev; |
134 | 125 | ||
135 | const struct dc_link *backlight_link; | 126 | const struct dc_link *backlight_link; |