Merge branch 'drm-next-3.13' of git://people.freedesktop.org/~agd5f/linux into drm-next

Initial pull request for radeon drm-next 3.13.  Highlights:
- Enable DPM on a number of asics by default
- Enable audio by default
- Dynamically power down dGPUs on PowerXpress systems
- Lots of bug fixes
* 'drm-next-3.13' of git://people.freedesktop.org/~agd5f/linux: (36 commits)
  drm/radeon: don't share PPLLs on DCE4.1
  drm/radeon/dpm: fix typo in setting smc flag
  drm/radeon: fixup locking inversion between, mmap_sem and reservations
  drm/radeon: clear the page directory using the DMA
  drm/radeon: initially clear page tables
  drm/radeon: drop CP page table updates & cleanup v2
  drm/radeon: add vm_set_page tracepoint
  drm/radeon: rework and fix reset detection v2
  drm/radeon: don't use PACKET2 on CIK
  drm/radeon: fix UVD destroy IB size
  drm/radeon: activate UVD clocks before sending the destroy msg
  drm/radeon/si: fix define for MC_SEQ_TRAIN_WAKEUP_CNTL
  drm/radeon: fix endian handling in rlc buffer setup
  drm/radeon/dpm: retain user selected performance level across state changes
  drm/radeon: disable force performance state when thermal state is active
  drm/radeon: enable DPM by default on r7xx asics
  drm/radeon: enable DPM by default on evergreen asics
  drm/radeon: enable DPM by default on BTC asics
  drm/radeon: enable DPM by default on SI asics
  drm/radeon: enable DPM by default on SUMO/PALM APUs
  ...

1 files changed, 92 insertions, 12 deletions

diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index 79159b5da05b..e972143e5a36 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -31,6 +31,8 @@
 #include "radeon.h"
 #include "atom.h"
 
+#include <linux/pm_runtime.h>
+
 extern void
 radeon_combios_connected_scratch_regs(struct drm_connector *connector,
                                       struct drm_encoder *encoder,
@@ -411,6 +413,21 @@ static int radeon_connector_set_property(struct drm_connector *connector, struct
                 }
         }
 
+        if (property == rdev->mode_info.dither_property) {
+                struct radeon_connector *radeon_connector = to_radeon_connector(connector);
+                /* need to find digital encoder on connector */
+                encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS);
+                if (!encoder)
+                        return 0;
+
+                radeon_encoder = to_radeon_encoder(encoder);
+
+                if (radeon_connector->dither != val) {
+                        radeon_connector->dither = val;
+                        radeon_property_change_mode(&radeon_encoder->base);
+                }
+        }
+
         if (property == rdev->mode_info.underscan_property) {
                 /* need to find digital encoder on connector */
                 encoder = radeon_find_encoder(connector, DRM_MODE_ENCODER_TMDS);
@@ -626,6 +643,11 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)
         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
         struct drm_encoder *encoder = radeon_best_single_encoder(connector);
         enum drm_connector_status ret = connector_status_disconnected;
+        int r;
+
+        r = pm_runtime_get_sync(connector->dev->dev);
+        if (r < 0)
+                return connector_status_disconnected;
 
         if (encoder) {
                 struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder);
@@ -651,6 +673,8 @@ radeon_lvds_detect(struct drm_connector *connector, bool force)
         /* check acpi lid status ??? */
 
         radeon_connector_update_scratch_regs(connector, ret);
+        pm_runtime_mark_last_busy(connector->dev->dev);
+        pm_runtime_put_autosuspend(connector->dev->dev);
         return ret;
 }
 
@@ -750,6 +774,11 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
         struct drm_encoder_helper_funcs *encoder_funcs;
         bool dret = false;
         enum drm_connector_status ret = connector_status_disconnected;
+        int r;
+
+        r = pm_runtime_get_sync(connector->dev->dev);
+        if (r < 0)
+                return connector_status_disconnected;
 
         encoder = radeon_best_single_encoder(connector);
         if (!encoder)
@@ -790,9 +819,8 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
                          * detected a monitor via load.
                          */
                         if (radeon_connector->detected_by_load)
-                                return connector->status;
-                        else
-                                return ret;
+                                ret = connector->status;
+                        goto out;
                 }
 
                 if (radeon_connector->dac_load_detect && encoder) {
@@ -817,6 +845,11 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
         }
 
         radeon_connector_update_scratch_regs(connector, ret);
+
+out:
+        pm_runtime_mark_last_busy(connector->dev->dev);
+        pm_runtime_put_autosuspend(connector->dev->dev);
+
         return ret;
 }
 
@@ -873,10 +906,15 @@ radeon_tv_detect(struct drm_connector *connector, bool force)
         struct drm_encoder_helper_funcs *encoder_funcs;
         struct radeon_connector *radeon_connector = to_radeon_connector(connector);
         enum drm_connector_status ret = connector_status_disconnected;
+        int r;
 
         if (!radeon_connector->dac_load_detect)
                 return ret;
 
+        r = pm_runtime_get_sync(connector->dev->dev);
+        if (r < 0)
+                return connector_status_disconnected;
+
         encoder = radeon_best_single_encoder(connector);
         if (!encoder)
                 ret = connector_status_disconnected;
@@ -887,6 +925,8 @@ radeon_tv_detect(struct drm_connector *connector, bool force)
         if (ret == connector_status_connected)
                 ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, false);
         radeon_connector_update_scratch_regs(connector, ret);
+        pm_runtime_mark_last_busy(connector->dev->dev);
+        pm_runtime_put_autosuspend(connector->dev->dev);
         return ret;
 }
 
@@ -954,12 +994,18 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
         struct drm_encoder *encoder = NULL;
         struct drm_encoder_helper_funcs *encoder_funcs;
         struct drm_mode_object *obj;
-        int i;
+        int i, r;
         enum drm_connector_status ret = connector_status_disconnected;
         bool dret = false, broken_edid = false;
 
-        if (!force && radeon_check_hpd_status_unchanged(connector))
-                return connector->status;
+        r = pm_runtime_get_sync(connector->dev->dev);
+        if (r < 0)
+                return connector_status_disconnected;
+
+        if (!force && radeon_check_hpd_status_unchanged(connector)) {
+                ret = connector->status;
+                goto exit;
+        }
 
         if (radeon_connector->ddc_bus)
                 dret = radeon_ddc_probe(radeon_connector, false);
@@ -1110,6 +1156,11 @@ out:
 
         /* updated in get modes as well since we need to know if it's analog or digital */
         radeon_connector_update_scratch_regs(connector, ret);
+
+exit:
+        pm_runtime_mark_last_busy(connector->dev->dev);
+        pm_runtime_put_autosuspend(connector->dev->dev);
+
         return ret;
 }
 
@@ -1377,9 +1428,16 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
         enum drm_connector_status ret = connector_status_disconnected;
         struct radeon_connector_atom_dig *radeon_dig_connector = radeon_connector->con_priv;
         struct drm_encoder *encoder = radeon_best_single_encoder(connector);
+        int r;
 
-        if (!force && radeon_check_hpd_status_unchanged(connector))
-                return connector->status;
+        r = pm_runtime_get_sync(connector->dev->dev);
+        if (r < 0)
+                return connector_status_disconnected;
+
+        if (!force && radeon_check_hpd_status_unchanged(connector)) {
+                ret = connector->status;
+                goto out;
+        }
 
         if (radeon_connector->edid) {
                 kfree(radeon_connector->edid);
@@ -1443,6 +1501,10 @@ radeon_dp_detect(struct drm_connector *connector, bool force)
         }
 
         radeon_connector_update_scratch_regs(connector, ret);
+out:
+        pm_runtime_mark_last_busy(connector->dev->dev);
+        pm_runtime_put_autosuspend(connector->dev->dev);
+
         return ret;
 }
 
@@ -1660,7 +1722,10 @@ radeon_add_atom_connector(struct drm_device *dev,
                                                       0);
                         drm_object_attach_property(&radeon_connector->base.base,
                                                    rdev->mode_info.audio_property,
-                                                   RADEON_AUDIO_DISABLE);
+                                                   RADEON_AUDIO_AUTO);
+                        drm_object_attach_property(&radeon_connector->base.base,
+                                                   rdev->mode_info.dither_property,
+                                                   RADEON_FMT_DITHER_DISABLE);
                         subpixel_order = SubPixelHorizontalRGB;
                         connector->interlace_allowed = true;
                         if (connector_type == DRM_MODE_CONNECTOR_HDMIB)
@@ -1757,7 +1822,12 @@ radeon_add_atom_connector(struct drm_device *dev,
                         if (ASIC_IS_DCE2(rdev)) {
                                 drm_object_attach_property(&radeon_connector->base.base,
                                                               rdev->mode_info.audio_property,
-                                                              RADEON_AUDIO_DISABLE);
+                                                              RADEON_AUDIO_AUTO);
+                        }
+                        if (ASIC_IS_AVIVO(rdev)) {
+                                drm_object_attach_property(&radeon_connector->base.base,
+                                                           rdev->mode_info.dither_property,
+                                                           RADEON_FMT_DITHER_DISABLE);
                         }
                         if (connector_type == DRM_MODE_CONNECTOR_DVII) {
                                 radeon_connector->dac_load_detect = true;
@@ -1802,7 +1872,12 @@ radeon_add_atom_connector(struct drm_device *dev,
                         if (ASIC_IS_DCE2(rdev)) {
                                 drm_object_attach_property(&radeon_connector->base.base,
                                                               rdev->mode_info.audio_property,
-                                                              RADEON_AUDIO_DISABLE);
+                                                              RADEON_AUDIO_AUTO);
+                        }
+                        if (ASIC_IS_AVIVO(rdev)) {
+                                drm_object_attach_property(&radeon_connector->base.base,
+                                                           rdev->mode_info.dither_property,
+                                                           RADEON_FMT_DITHER_DISABLE);
                         }
                         subpixel_order = SubPixelHorizontalRGB;
                         connector->interlace_allowed = true;
@@ -1846,7 +1921,12 @@ radeon_add_atom_connector(struct drm_device *dev,
                         if (ASIC_IS_DCE2(rdev)) {
                                 drm_object_attach_property(&radeon_connector->base.base,
                                                               rdev->mode_info.audio_property,
-                                                              RADEON_AUDIO_DISABLE);
+                                                              RADEON_AUDIO_AUTO);
+                        }
+                        if (ASIC_IS_AVIVO(rdev)) {
+                                drm_object_attach_property(&radeon_connector->base.base,
+                                                           rdev->mode_info.dither_property,
+                                                           RADEON_FMT_DITHER_DISABLE);
                         }
                         connector->interlace_allowed = true;
                         /* in theory with a DP to VGA converter... */