Merge tag 'drm-intel-next-fixes-2015-09-02' into drm-intel-next-queued

Backmerge -fixes since there's more DDI-E related cleanups on top of
the pile of -fixes for skl that just landed for 4.3.

Conflicts:
	drivers/gpu/drm/i915/intel_display.c
	drivers/gpu/drm/i914/intel_dp.c
	drivers/gpu/drm/i915/intel_lrc.c

Conflicts are all fairly harmless adjacent line stuff.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 2 insertions, 4 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index ed13baa7c976..efed11509f4a 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -82,7 +82,7 @@ static ssize_t amdgpu_set_dpm_state(struct device *dev,
         mutex_unlock(&adev->pm.mutex);
 
         /* Can't set dpm state when the card is off */
-        if (!(adev->flags & AMDGPU_IS_PX) ||
+        if (!(adev->flags & AMD_IS_PX) ||
             (ddev->switch_power_state == DRM_SWITCH_POWER_ON))
                 amdgpu_pm_compute_clocks(adev);
 fail:
@@ -538,7 +538,7 @@ static void amdgpu_dpm_change_power_state_locked(struct amdgpu_device *adev)
                 /* vce just modifies an existing state so force a change */
                 if (ps->vce_active != adev->pm.dpm.vce_active)
                         goto force;
-                if (adev->flags & AMDGPU_IS_APU) {
+                if (adev->flags & AMD_IS_APU) {
                         /* for APUs if the num crtcs changed but state is the same,
                          * all we need to do is update the display configuration.
                          */
@@ -580,7 +580,6 @@ force:
                 amdgpu_dpm_print_power_state(adev, adev->pm.dpm.requested_ps);
         }
 
-        mutex_lock(&adev->ddev->struct_mutex);
         mutex_lock(&adev->ring_lock);
 
         /* update whether vce is active */
@@ -628,7 +627,6 @@ force:
 
 done:
         mutex_unlock(&adev->ring_lock);
-        mutex_unlock(&adev->ddev->struct_mutex);
 }
 
 void amdgpu_dpm_enable_uvd(struct amdgpu_device *adev, bool enable)