drm/radeon: replace vmram_mutex with mclk_lock v2

It is a rw_semaphore now and only write locked
while changing the clock. Also the lock is renamed
to better reflect what it is protecting.

v2: Keep the ttm_vm_ops on IGPs

Signed-off-by: Christian König <deathsimple@vodafone.de>
Reviewed-by: Jerome Glisse <jglisse@redhat.com>

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index 4563e50cbdde..586f30e2cec8 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1059,6 +1059,8 @@ struct radeon_power_state {
 
 struct radeon_pm {
         struct mutex            mutex;
+        /* write locked while reprogramming mclk */
+        struct rw_semaphore     mclk_lock;
         u32                     active_crtcs;
         int                     active_crtc_count;
         int                     req_vblank;
@@ -1554,7 +1556,6 @@ struct radeon_device {
         struct work_struct audio_work;
         int num_crtc; /* number of crtcs */
         struct mutex dc_hw_i2c_mutex; /* display controller hw i2c mutex */
-        struct mutex vram_mutex;
         bool audio_enabled;
         struct r600_audio audio_status; /* audio stuff */
         struct notifier_block acpi_nb;