Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-next

Daniel writes:
Highlights of this -next round:
- ivb fdi B/C fixes
- hsw sprite/plane offset fixes from Damien
- unified dp/hdmi encoder for hsw, finally external dp support on hsw
  (Paulo)
- kill-agp and some other prep work in the gtt code from Ben
- some fb handling fixes from Ville
- massive pile of patches to align hsw VGA with the spec and make it
  actually work (Paulo)
- pile of workarounds from Jesse, mostly for vlv, but also some other
  related platforms
- start of a dev_priv reorg, that thing grew out of bounds and chaotic
- small bits&pieces all over the place, down to better error handling for
  load-detect on gen2 (Chris, Jani, Mika, Zhenyu, ...)

On top of the previous pile (just copypasta):
- tons of hsw dp prep patches form Paulo
- round scheduled work items and timers to nearest second (Chris)
- some hw workarounds (Jesse&Damien)
- vlv dp support and related fixups (Vijay et al.)
- basic haswell dp support, not yet wired up for external ports (Paulo)
- edp support (Paulo)
- tons of refactorings to prepare for the above (Paulo)
- panel rework, unifiying code between lvds and edp panels (Jani)
- panel fitter scaling modes (Jani + Yuly Novikov)
- panel power improvements, should now work without the BIOS setting it up
- extracting some dp helpers from radeon/i915 and move them to
  drm_dp_helper.c
- randome pile of workarounds (Damien, Ben, ...)
- some cleanups for the register restore code for suspend/resume
- secure batchbuffer support, should enable tear-free blits on gen6+
  Chris)
- random smaller fixlets and cleanups.

* 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel: (231 commits)
  drm/i915: Restore physical HWS_PGA after resume
  drm/i915: Report amount of usable graphics memory in MiB
  drm/i915/i2c: Track users of GMBUS force-bit
  drm/i915: Allocate the proper size for contexts.
  drm/i915: Update load-detect failure paths for modeset-rework
  drm/i915: Clear unused fields of mode for framebuffer creation
  drm/i915: Always calculate 8xx WM values based on a 32-bpp framebuffer
  drm/i915: Fix sparse warnings in from AGP kill code
  drm/i915: Missed lock change with rps lock
  drm/i915: Move the remaining gtt code
  drm/i915: flush system agent TLBs on SNB
  drm/i915: Kill off now unused gen6+ AGP code
  drm/i915: Calculate correct stolen size for GEN7+
  drm/i915: Stop using AGP layer for GEN6+
  drm/i915: drop the double-OP_STOREDW usage in blt_ring_flush
  drm/i915: don't rewrite the GTT on resume v4
  drm/i915: protect RPS/RC6 related accesses (including PCU) with a new mutex
  drm/i915: put ring frequency and turbo setup into a work queue v5
  drm/i915: don't block resume on fb console resume v2
  drm/i915: extract l3_parity substruct from dev_priv
  ...

1 files changed, 31 insertions, 21 deletions

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index e2aacd329545..41d463573baa 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -138,24 +138,24 @@ static u32 i915_read_blc_pwm_ctl(struct drm_i915_private *dev_priv)
 
         if (HAS_PCH_SPLIT(dev_priv->dev)) {
                 val = I915_READ(BLC_PWM_PCH_CTL2);
-                if (dev_priv->saveBLC_PWM_CTL2 == 0) {
-                        dev_priv->saveBLC_PWM_CTL2 = val;
+                if (dev_priv->regfile.saveBLC_PWM_CTL2 == 0) {
+                        dev_priv->regfile.saveBLC_PWM_CTL2 = val;
                 } else if (val == 0) {
                         I915_WRITE(BLC_PWM_PCH_CTL2,
-                                   dev_priv->saveBLC_PWM_CTL2);
-                        val = dev_priv->saveBLC_PWM_CTL2;
+                                   dev_priv->regfile.saveBLC_PWM_CTL2);
+                        val = dev_priv->regfile.saveBLC_PWM_CTL2;
                 }
         } else {
                 val = I915_READ(BLC_PWM_CTL);
-                if (dev_priv->saveBLC_PWM_CTL == 0) {
-                        dev_priv->saveBLC_PWM_CTL = val;
-                        dev_priv->saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_CTL2);
+                if (dev_priv->regfile.saveBLC_PWM_CTL == 0) {
+                        dev_priv->regfile.saveBLC_PWM_CTL = val;
+                        dev_priv->regfile.saveBLC_PWM_CTL2 = I915_READ(BLC_PWM_CTL2);
                 } else if (val == 0) {
                         I915_WRITE(BLC_PWM_CTL,
-                                   dev_priv->saveBLC_PWM_CTL);
+                                   dev_priv->regfile.saveBLC_PWM_CTL);
                         I915_WRITE(BLC_PWM_CTL2,
-                                   dev_priv->saveBLC_PWM_CTL2);
-                        val = dev_priv->saveBLC_PWM_CTL;
+                                   dev_priv->regfile.saveBLC_PWM_CTL2);
+                        val = dev_priv->regfile.saveBLC_PWM_CTL;
                 }
         }
 
@@ -416,21 +416,14 @@ static const struct backlight_ops intel_panel_bl_ops = {
         .get_brightness = intel_panel_get_brightness,
 };
 
-int intel_panel_setup_backlight(struct drm_device *dev)
+int intel_panel_setup_backlight(struct drm_connector *connector)
 {
+        struct drm_device *dev = connector->dev;
         struct drm_i915_private *dev_priv = dev->dev_private;
         struct backlight_properties props;
-        struct drm_connector *connector;
 
         intel_panel_init_backlight(dev);
 
-        if (dev_priv->int_lvds_connector)
-                connector = dev_priv->int_lvds_connector;
-        else if (dev_priv->int_edp_connector)
-                connector = dev_priv->int_edp_connector;
-        else
-                return -ENODEV;
-
         memset(&props, 0, sizeof(props));
         props.type = BACKLIGHT_RAW;
         props.max_brightness = _intel_panel_get_max_backlight(dev);
@@ -460,9 +453,9 @@ void intel_panel_destroy_backlight(struct drm_device *dev)
                 backlight_device_unregister(dev_priv->backlight);
 }
 #else
-int intel_panel_setup_backlight(struct drm_device *dev)
+int intel_panel_setup_backlight(struct drm_connector *connector)
 {
-        intel_panel_init_backlight(dev);
+        intel_panel_init_backlight(connector->dev);
         return 0;
 }
 
@@ -471,3 +464,20 @@ void intel_panel_destroy_backlight(struct drm_device *dev)
         return;
 }
 #endif
+
+int intel_panel_init(struct intel_panel *panel,
+                     struct drm_display_mode *fixed_mode)
+{
+        panel->fixed_mode = fixed_mode;
+
+        return 0;
+}
+
+void intel_panel_fini(struct intel_panel *panel)
+{
+        struct intel_connector *intel_connector =
+                container_of(panel, struct intel_connector, panel);
+
+        if (panel->fixed_mode)
+                drm_mode_destroy(intel_connector->base.dev, panel->fixed_mode);
+}