Merge branch 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux

Two regression fixes and a memory leak fix for amdgpu and radeon.

* 'drm-fixes-4.3' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: don't try to recreate sysfs entries on resume
  drm/radeon: don't try to recreate sysfs entries on resume
  drm/amdgpu: stop leaking page flip fence

5 files changed, 28 insertions, 18 deletions

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index 6647fb26ef25..0d13e6368b96 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -1654,6 +1654,7 @@ struct amdgpu_pm {
         u8                      fan_max_rpm;
         /* dpm */
         bool                    dpm_enabled;
+        bool                    sysfs_initialized;
         struct amdgpu_dpm       dpm;
         const struct firmware   *fw;    /* SMC firmware */
         uint32_t                fw_version;
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
index dc29ed8145c2..6c9e0902a414 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
@@ -184,10 +184,6 @@ int amdgpu_crtc_page_flip(struct drm_crtc *crtc,
                 goto cleanup;
         }
 
-        fence_get(work->excl);
-        for (i = 0; i < work->shared_count; ++i)
-                fence_get(work->shared[i]);
-
         amdgpu_bo_get_tiling_flags(new_rbo, &tiling_flags);
         amdgpu_bo_unreserve(new_rbo);
 
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
index ed2bbe5b10af..22a8c7d3a3ab 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c
@@ -695,6 +695,9 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)
 {
         int ret;
 
+        if (adev->pm.sysfs_initialized)
+                return 0;
+
         if (adev->pm.funcs->get_temperature == NULL)
                 return 0;
         adev->pm.int_hwmon_dev = hwmon_device_register_with_groups(adev->dev,
@@ -723,6 +726,8 @@ int amdgpu_pm_sysfs_init(struct amdgpu_device *adev)
                 return ret;
         }
 
+        adev->pm.sysfs_initialized = true;
+
         return 0;
 }
 
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h
index f03b7eb15233..b6cbd816537e 100644
--- a/drivers/gpu/drm/radeon/radeon.h
+++ b/drivers/gpu/drm/radeon/radeon.h
@@ -1658,6 +1658,7 @@ struct radeon_pm {
         u8                      fan_max_rpm;
         /* dpm */
         bool                    dpm_enabled;
+        bool                    sysfs_initialized;
         struct radeon_dpm       dpm;
 };
 
diff --git a/drivers/gpu/drm/radeon/radeon_pm.c b/drivers/gpu/drm/radeon/radeon_pm.c
index 6a0a176e26ec..5feee3b4c557 100644
--- a/drivers/gpu/drm/radeon/radeon_pm.c
+++ b/drivers/gpu/drm/radeon/radeon_pm.c
@@ -1528,19 +1528,23 @@ int radeon_pm_late_init(struct radeon_device *rdev)
 
         if (rdev->pm.pm_method == PM_METHOD_DPM) {
                 if (rdev->pm.dpm_enabled) {
-                        ret = device_create_file(rdev->dev, &dev_attr_power_dpm_state);
-                        if (ret)
-                                DRM_ERROR("failed to create device file for dpm state\n");
-                        ret = device_create_file(rdev->dev, &dev_attr_power_dpm_force_performance_level);
-                        if (ret)
-                                DRM_ERROR("failed to create device file for dpm state\n");
-                        /* XXX: these are noops for dpm but are here for backwards compat */
-                        ret = device_create_file(rdev->dev, &dev_attr_power_profile);
-                        if (ret)
-                                DRM_ERROR("failed to create device file for power profile\n");
-                        ret = device_create_file(rdev->dev, &dev_attr_power_method);
-                        if (ret)
-                                DRM_ERROR("failed to create device file for power method\n");
+                        if (!rdev->pm.sysfs_initialized) {
+                                ret = device_create_file(rdev->dev, &dev_attr_power_dpm_state);
+                                if (ret)
+                                        DRM_ERROR("failed to create device file for dpm state\n");
+                                ret = device_create_file(rdev->dev, &dev_attr_power_dpm_force_performance_level);
+                                if (ret)
+                                        DRM_ERROR("failed to create device file for dpm state\n");
+                                /* XXX: these are noops for dpm but are here for backwards compat */
+                                ret = device_create_file(rdev->dev, &dev_attr_power_profile);
+                                if (ret)
+                                        DRM_ERROR("failed to create device file for power profile\n");
+                                ret = device_create_file(rdev->dev, &dev_attr_power_method);
+                                if (ret)
+                                        DRM_ERROR("failed to create device file for power method\n");
+                                if (!ret)
+                                        rdev->pm.sysfs_initialized = true;
+                        }
 
                         mutex_lock(&rdev->pm.mutex);
                         ret = radeon_dpm_late_enable(rdev);
@@ -1556,7 +1560,8 @@ int radeon_pm_late_init(struct radeon_device *rdev)
                         }
                 }
         } else {
-                if (rdev->pm.num_power_states > 1) {
+                if ((rdev->pm.num_power_states > 1) &&
+                    (!rdev->pm.sysfs_initialized)) {
                         /* where's the best place to put these? */
                         ret = device_create_file(rdev->dev, &dev_attr_power_profile);
                         if (ret)
@@ -1564,6 +1569,8 @@ int radeon_pm_late_init(struct radeon_device *rdev)
                         ret = device_create_file(rdev->dev, &dev_attr_power_method);
                         if (ret)
                                 DRM_ERROR("failed to create device file for power method\n");
+                        if (!ret)
+                                rdev->pm.sysfs_initialized = true;
                 }
         }
         return ret;