drm/i915: add inte_crt->adpa_reg

With the base addresses shifting around, this is easier to handle.
Also move to the real reg offset on vlv.

Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

diff --git a/drivers/gpu/drm/i915/i915_reg.h b/drivers/gpu/drm/i915/i915_reg.h
index d122c93643e6e9804000ff8361eab6a77d6fecb2..81a3de6b093ce95d49117d21f1c4d189cb683f1d 100644 (file)
--- a/drivers/gpu/drm/i915/i915_reg.h
+++ b/drivers/gpu/drm/i915/i915_reg.h
@@ -1552,6 +1552,7 @@
 /* VGA port control */
 #define ADPA                   0x61100
 #define PCH_ADPA                0xe1100
+#define VLV_ADPA               (VLV_DISPLAY_BASE + ADPA)
 
 #define   ADPA_DAC_ENABLE      (1<<31)
 #define   ADPA_DAC_DISABLE     0

diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index e1d02be368a5860e3eb081ae790991e17f3e09b3..bc5e2c97db616aef9fb0be8f4e2b3b1e72390aa4 100644 (file)
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -47,6 +47,7 @@
 struct intel_crt {
        struct intel_encoder base;
        bool force_hotplug_required;
+       u32 adpa_reg;
 };
 
 static struct intel_crt *intel_attached_crt(struct drm_connector *connector)
@@ -55,6 +56,11 @@ static struct intel_crt *intel_attached_crt(struct drm_connector *connector)
                            struct intel_crt, base);
 }
 
+static struct intel_crt *intel_encoder_to_crt(struct intel_encoder *encoder)
+{
+       return container_of(encoder, struct intel_crt, base);
+}
+
 static void pch_crt_dpms(struct drm_encoder *encoder, int mode)
 {
        struct drm_device *dev = encoder->dev;
@@ -145,19 +151,15 @@ static void intel_crt_mode_set(struct drm_encoder *encoder,
 
        struct drm_device *dev = encoder->dev;
        struct drm_crtc *crtc = encoder->crtc;
+       struct intel_crt *crt =
+               intel_encoder_to_crt(to_intel_encoder(encoder));
        struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
        struct drm_i915_private *dev_priv = dev->dev_private;
        int dpll_md_reg;
        u32 adpa, dpll_md;
-       u32 adpa_reg;
 
        dpll_md_reg = DPLL_MD(intel_crtc->pipe);
 
-       if (HAS_PCH_SPLIT(dev))
-               adpa_reg = PCH_ADPA;
-       else
-               adpa_reg = ADPA;
-
        /*
         * Disable separate mode multiplier used when cloning SDVO to CRT
         * XXX this needs to be adjusted when we really are cloning
@@ -185,7 +187,7 @@ static void intel_crt_mode_set(struct drm_encoder *encoder,
        if (!HAS_PCH_SPLIT(dev))
                I915_WRITE(BCLRPAT(intel_crtc->pipe), 0);
 
-       I915_WRITE(adpa_reg, adpa);
+       I915_WRITE(crt->adpa_reg, adpa);
 }
 
 static bool intel_ironlake_crt_detect_hotplug(struct drm_connector *connector)
@@ -675,6 +677,13 @@ void intel_crt_init(struct drm_device *dev)
        else
                encoder_helper_funcs = &gmch_encoder_funcs;
 
+       if (HAS_PCH_SPLIT(dev))
+               crt->adpa_reg = PCH_ADPA;
+       else if (IS_VALLEYVIEW(dev))
+               crt->adpa_reg = VLV_ADPA;
+       else
+               crt->adpa_reg = ADPA;
+
        drm_encoder_helper_add(&crt->base.base, encoder_helper_funcs);
        drm_connector_helper_add(connector, &intel_crt_connector_helper_funcs);