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

Pull drm updates from Dave Airlie:
 "This is the main drm pull request for 3.10.

  Wierd bits:
   - OMAP drm changes required OMAP dss changes, in drivers/video, so I
     took them in here.
   - one more fbcon fix for font handover
   - VT switch avoidance in pm code
   - scatterlist helpers for gpu drivers - have acks from akpm

  Highlights:
   - qxl kms driver - driver for the spice qxl virtual GPU

  Nouveau:
   - fermi/kepler VRAM compression
   - GK110/nvf0 modesetting support.

  Tegra:
   - host1x core merged with 2D engine support

  i915:
   - vt switchless resume
   - more valleyview support
   - vblank fixes
   - modesetting pipe config rework

  radeon:
   - UVD engine support
   - SI chip tiling support
   - GPU registers initialisation from golden values.

  exynos:
   - device tree changes
   - fimc block support

  Otherwise:
   - bunches of fixes all over the place."

* 'drm-next' of git://people.freedesktop.org/~airlied/linux: (513 commits)
  qxl: update to new idr interfaces.
  drm/nouveau: fix build with nv50->nvc0
  drm/radeon: fix handling of v6 power tables
  drm/radeon: clarify family checks in pm table parsing
  drm/radeon: consolidate UVD clock programming
  drm/radeon: fix UPLL_REF_DIV_MASK definition
  radeon: add bo tracking debugfs
  drm/radeon: add new richland pci ids
  drm/radeon: add some new SI PCI ids
  drm/radeon: fix scratch reg handling for UVD fence
  drm/radeon: allocate SA bo in the requested domain
  drm/radeon: fix possible segfault when parsing pm tables
  drm/radeon: fix endian bugs in atom_allocate_fb_scratch()
  OMAPDSS: TFP410: return EPROBE_DEFER if the i2c adapter not found
  OMAPDSS: VENC: Add error handling for venc_probe_pdata
  OMAPDSS: HDMI: Add error handling for hdmi_probe_pdata
  OMAPDSS: RFBI: Add error handling for rfbi_probe_pdata
  OMAPDSS: DSI: Add error handling for dsi_probe_pdata
  OMAPDSS: SDI: Add error handling for sdi_probe_pdata
  OMAPDSS: DPI: Add error handling for dpi_probe_pdata
  ...

1 files changed, 30 insertions, 19 deletions

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index bee8cb6108a7..eb5e6e95f3c7 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -286,8 +286,11 @@ void intel_panel_set_backlight(struct drm_device *dev, u32 level)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
 
-        dev_priv->backlight_level = level;
-        if (dev_priv->backlight_enabled)
+        dev_priv->backlight.level = level;
+        if (dev_priv->backlight.device)
+                dev_priv->backlight.device->props.brightness = level;
+
+        if (dev_priv->backlight.enabled)
                 intel_panel_actually_set_backlight(dev, level);
 }
 
@@ -295,7 +298,7 @@ void intel_panel_disable_backlight(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
 
-        dev_priv->backlight_enabled = false;
+        dev_priv->backlight.enabled = false;
         intel_panel_actually_set_backlight(dev, 0);
 
         if (INTEL_INFO(dev)->gen >= 4) {
@@ -318,8 +321,12 @@ void intel_panel_enable_backlight(struct drm_device *dev,
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
 
-        if (dev_priv->backlight_level == 0)
-                dev_priv->backlight_level = intel_panel_get_max_backlight(dev);
+        if (dev_priv->backlight.level == 0) {
+                dev_priv->backlight.level = intel_panel_get_max_backlight(dev);
+                if (dev_priv->backlight.device)
+                        dev_priv->backlight.device->props.brightness =
+                                dev_priv->backlight.level;
+        }
 
         if (INTEL_INFO(dev)->gen >= 4) {
                 uint32_t reg, tmp;
@@ -335,7 +342,7 @@ void intel_panel_enable_backlight(struct drm_device *dev,
                 if (tmp & BLM_PWM_ENABLE)
                         goto set_level;
 
-                if (dev_priv->num_pipe == 3)
+                if (INTEL_INFO(dev)->num_pipes == 3)
                         tmp &= ~BLM_PIPE_SELECT_IVB;
                 else
                         tmp &= ~BLM_PIPE_SELECT;
@@ -360,16 +367,16 @@ set_level:
          * BLC_PWM_CPU_CTL may be cleared to zero automatically when these
          * registers are set.
          */
-        dev_priv->backlight_enabled = true;
-        intel_panel_actually_set_backlight(dev, dev_priv->backlight_level);
+        dev_priv->backlight.enabled = true;
+        intel_panel_actually_set_backlight(dev, dev_priv->backlight.level);
 }
 
 static void intel_panel_init_backlight(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
 
-        dev_priv->backlight_level = intel_panel_get_backlight(dev);
-        dev_priv->backlight_enabled = dev_priv->backlight_level != 0;
+        dev_priv->backlight.level = intel_panel_get_backlight(dev);
+        dev_priv->backlight.enabled = dev_priv->backlight.level != 0;
 }
 
 enum drm_connector_status
@@ -405,8 +412,7 @@ static int intel_panel_update_status(struct backlight_device *bd)
 static int intel_panel_get_brightness(struct backlight_device *bd)
 {
         struct drm_device *dev = bl_get_data(bd);
-        struct drm_i915_private *dev_priv = dev->dev_private;
-        return dev_priv->backlight_level;
+        return intel_panel_get_backlight(dev);
 }
 
 static const struct backlight_ops intel_panel_bl_ops = {
@@ -422,33 +428,38 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
 
         intel_panel_init_backlight(dev);
 
+        if (WARN_ON(dev_priv->backlight.device))
+                return -ENODEV;
+
         memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
+        props.brightness = dev_priv->backlight.level;
         props.max_brightness = _intel_panel_get_max_backlight(dev);
         if (props.max_brightness == 0) {
                 DRM_DEBUG_DRIVER("Failed to get maximum backlight value\n");
                 return -ENODEV;
         }
-        dev_priv->backlight =
+        dev_priv->backlight.device =
                 backlight_device_register("intel_backlight",
                                           &connector->kdev, dev,
                                           &intel_panel_bl_ops, &props);
 
-        if (IS_ERR(dev_priv->backlight)) {
+        if (IS_ERR(dev_priv->backlight.device)) {
                 DRM_ERROR("Failed to register backlight: %ld\n",
-                          PTR_ERR(dev_priv->backlight));
-                dev_priv->backlight = NULL;
+                          PTR_ERR(dev_priv->backlight.device));
+                dev_priv->backlight.device = NULL;
                 return -ENODEV;
         }
-        dev_priv->backlight->props.brightness = intel_panel_get_backlight(dev);
         return 0;
 }
 
 void intel_panel_destroy_backlight(struct drm_device *dev)
 {
         struct drm_i915_private *dev_priv = dev->dev_private;
-        if (dev_priv->backlight)
-                backlight_device_unregister(dev_priv->backlight);
+        if (dev_priv->backlight.device) {
+                backlight_device_unregister(dev_priv->backlight.device);
+                dev_priv->backlight.device = NULL;
+        }
 }
 #else
 int intel_panel_setup_backlight(struct drm_connector *connector)