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

Pull drm updates from Dave Airlie:
 "This is the main git pull for the drm,

  I pretty much froze major pulls at -rc5/6 time, and haven't had much
  fallout, so will probably continue doing that.

  Lots of changes all over, big internal header cleanup to make it clear
  drm features are legacy things and what are things that modern KMS
  drivers should be using.  Also big move to use the new generic fences
  in all the TTM drivers.

  core:
        atomic prep work,
        vblank rework changes, allows immediate vblank disables
        major header reworking and cleanups to better delinate legacy
        interfaces from what KMS drivers should be using.
        cursor planes locking fixes

  ttm:
        move to generic fences (affects all TTM drivers)
        ppc64 caching fixes

  radeon:
        userptr support,
        uvd for old asics,
        reset rework for fence changes
        better buffer placement changes,
        dpm feature enablement
        hdmi audio support fixes

  intel:
        Cherryview work,
        180 degree rotation,
        skylake prep work,
        execlist command submission
        full ppgtt prep work
        cursor improvements
        edid caching,
        vdd handling improvements

  nouveau:
        fence reworking
        kepler memory clock work
        gt21x clock work
        fan control improvements
        hdmi infoframe fixes
        DP audio

  ast:
        ppc64 fixes
        caching fix

  rcar:
        rcar-du DT support

  ipuv3:
        prep work for capture support

  msm:
        LVDS support for mdp4, new panel, gpu refactoring

  exynos:
        exynos3250 SoC support, drop bad mmap interface,
        mipi dsi changes, and component match support"

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (640 commits)
  drm/mst: rework payload table allocation to conform better.
  drm/ast: Fix HW cursor image
  drm/radeon/kv: add uvd/vce info to dpm debugfs output
  drm/radeon/ci: add uvd/vce info to dpm debugfs output
  drm/radeon: export reservation_object from dmabuf to ttm
  drm/radeon: cope with foreign fences inside the reservation object
  drm/radeon: cope with foreign fences inside display
  drm/core: use helper to check driver features
  drm/radeon/cik: write gfx ucode version to ucode addr reg
  drm/radeon/si: print full CS when we hit a packet 0
  drm/radeon: remove unecessary includes
  drm/radeon/combios: declare legacy_connector_convert as static
  drm/radeon/atombios: declare connector convert tables as static
  drm/radeon: drop btc_get_max_clock_from_voltage_dependency_table
  drm/radeon/dpm: drop clk/voltage dependency filters for BTC
  drm/radeon/dpm: drop clk/voltage dependency filters for CI
  drm/radeon/dpm: drop clk/voltage dependency filters for SI
  drm/radeon/dpm: drop clk/voltage dependency filters for NI
  drm/radeon: disable audio when we disable hdmi (v2)
  drm/radeon: split audio enable between eg and r600 (v2)
  ...

5 files changed, 14 insertions, 11 deletions

diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index a4cc0e60a1be..9f158eab517a 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1089,7 +1089,7 @@ static char	*link_train_names[] = {
 };
 #endif
 
-#define CDV_DP_VOLTAGE_MAX          DP_TRAIN_VOLTAGE_SWING_1200
+#define CDV_DP_VOLTAGE_MAX          DP_TRAIN_VOLTAGE_SWING_LEVEL_3
 /*
 static uint8_t
 cdv_intel_dp_pre_emphasis_max(uint8_t voltage_swing)
@@ -1276,7 +1276,7 @@ cdv_intel_dp_set_vswing_premph(struct gma_encoder *encoder, uint8_t signal_level
                 cdv_sb_write(dev, ddi_reg->VSwing2, dp_vswing_premph_table[index]);
 
         /* ;gfx_dpio_set_reg(0x814c, 0x40802040) */
-        if ((vswing + premph) == DP_TRAIN_VOLTAGE_SWING_1200)
+        if ((vswing + premph) == DP_TRAIN_VOLTAGE_SWING_LEVEL_3)
                 cdv_sb_write(dev, ddi_reg->VSwing3, 0x70802040);
         else
                 cdv_sb_write(dev, ddi_reg->VSwing3, 0x40802040);
diff --git a/drivers/gpu/drm/gma500/framebuffer.c b/drivers/gpu/drm/gma500/framebuffer.c
index d0dd3bea8aa5..ddd90ddbc200 100644
--- a/drivers/gpu/drm/gma500/framebuffer.c
+++ b/drivers/gpu/drm/gma500/framebuffer.c
@@ -540,7 +540,8 @@ static void psbfb_gamma_get(struct drm_crtc *crtc, u16 *red,
 static int psbfb_probe(struct drm_fb_helper *helper,
                                 struct drm_fb_helper_surface_size *sizes)
 {
-        struct psb_fbdev *psb_fbdev = (struct psb_fbdev *)helper;
+        struct psb_fbdev *psb_fbdev =
+                container_of(helper, struct psb_fbdev, psb_fb_helper);
         struct drm_device *dev = psb_fbdev->psb_fb_helper.dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
         int bytespp;
diff --git a/drivers/gpu/drm/gma500/gtt.h b/drivers/gpu/drm/gma500/gtt.h
index f5860a739bd8..cdbb350c9d5d 100644
--- a/drivers/gpu/drm/gma500/gtt.h
+++ b/drivers/gpu/drm/gma500/gtt.h
@@ -21,6 +21,7 @@
 #define _PSB_GTT_H_
 
 #include <drm/drmP.h>
+#include <drm/drm_gem.h>
 
 /* This wants cleaning up with respect to the psb_dev and un-needed stuff */
 struct psb_gtt {
diff --git a/drivers/gpu/drm/gma500/intel_bios.c b/drivers/gpu/drm/gma500/intel_bios.c
index d3497348c4d5..63bde4e86c6a 100644
--- a/drivers/gpu/drm/gma500/intel_bios.c
+++ b/drivers/gpu/drm/gma500/intel_bios.c
@@ -116,30 +116,30 @@ parse_edp(struct drm_psb_private *dev_priv, struct bdb_header *bdb)
 
         switch (edp_link_params->preemphasis) {
         case 0:
-                dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_0;
+                dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_0;
                 break;
         case 1:
-                dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_3_5;
+                dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_1;
                 break;
         case 2:
-                dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_6;
+                dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_2;
                 break;
         case 3:
-                dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPHASIS_9_5;
+                dev_priv->edp.preemphasis = DP_TRAIN_PRE_EMPH_LEVEL_3;
                 break;
         }
         switch (edp_link_params->vswing) {
         case 0:
-                dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_400;
+                dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_0;
                 break;
         case 1:
-                dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_600;
+                dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_1;
                 break;
         case 2:
-                dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_800;
+                dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_2;
                 break;
         case 3:
-                dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_1200;
+                dev_priv->edp.vswing = DP_TRAIN_VOLTAGE_SWING_LEVEL_3;
                 break;
         }
         DRM_DEBUG_KMS("VBT reports EDP: VSwing  %d, Preemph %d\n",
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c
index eec993f93b1a..6ec3a905fdd2 100644
--- a/drivers/gpu/drm/gma500/psb_drv.c
+++ b/drivers/gpu/drm/gma500/psb_drv.c
@@ -476,6 +476,7 @@ static struct drm_driver driver = {
         .unload = psb_driver_unload,
         .lastclose = psb_driver_lastclose,
         .preclose = psb_driver_preclose,
+        .set_busid = drm_pci_set_busid,
 
         .num_ioctls = ARRAY_SIZE(psb_ioctls),
         .device_is_agp = psb_driver_device_is_agp,