drm/i915: move the suspend/resume register file out of dev_priv

[deliverable/linux.git] / drivers / gpu / drm / i915 / intel_panel.c

diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index e91a0bbc5bca00446f5d3f488a3bbab4372ab452..856ab5dec18b4e874e1787082b0f684f2d70dbf2 100644 (file)
--- 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;
                }
        }