drm/i915: Move num_pipes to intel info

Requested by Daniel.

v2: Fix incorrect num_pipe settings. (Chris)

Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>

1 files changed, 10 insertions, 9 deletions

diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 72dd3fd8e9c1..b3b22d7d2cd0 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -2346,10 +2346,10 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                 return 0;
         }
 
-        if(intel_crtc->plane > dev_priv->num_pipe) {
+        if (intel_crtc->plane > INTEL_INFO(dev)->num_pipes) {
                 DRM_ERROR("no plane for crtc: plane %d, num_pipes %d\n",
                                 intel_crtc->plane,
-                                dev_priv->num_pipe);
+                                INTEL_INFO(dev)->num_pipes);
                 return -EINVAL;
         }
 
@@ -5390,7 +5390,7 @@ static bool ironlake_check_fdi_lanes(struct intel_crtc *intel_crtc)
                 return false;
         }
 
-        if (dev_priv->num_pipe == 2)
+        if (INTEL_INFO(dev)->num_pipes == 2)
                 return true;
 
         switch (intel_crtc->pipe) {
@@ -8887,9 +8887,10 @@ void intel_modeset_init(struct drm_device *dev)
         dev->mode_config.fb_base = dev_priv->gtt.mappable_base;
 
         DRM_DEBUG_KMS("%d display pipe%s available.\n",
-                      dev_priv->num_pipe, dev_priv->num_pipe > 1 ? "s" : "");
+                      INTEL_INFO(dev)->num_pipes,
+                      INTEL_INFO(dev)->num_pipes > 1 ? "s" : "");
 
-        for (i = 0; i < dev_priv->num_pipe; i++) {
+        for (i = 0; i < INTEL_INFO(dev)->num_pipes; i++) {
                 intel_crtc_init(dev, i);
                 ret = intel_plane_init(dev, i);
                 if (ret)
@@ -8946,10 +8947,11 @@ static void intel_enable_pipe_a(struct drm_device *dev)
 static bool
 intel_check_plane_mapping(struct intel_crtc *crtc)
 {
-        struct drm_i915_private *dev_priv = crtc->base.dev->dev_private;
+        struct drm_device *dev = crtc->base.dev;
+        struct drm_i915_private *dev_priv = dev->dev_private;
         u32 reg, val;
 
-        if (dev_priv->num_pipe == 1)
+        if (INTEL_INFO(dev)->num_pipes == 1)
                 return true;
 
         reg = DSPCNTR(!crtc->plane);
@@ -9391,10 +9393,9 @@ intel_display_print_error_state(struct seq_file *m,
                                 struct drm_device *dev,
                                 struct intel_display_error_state *error)
 {
-        drm_i915_private_t *dev_priv = dev->dev_private;
         int i;
 
-        seq_printf(m, "Num Pipes: %d\n", dev_priv->num_pipe);
+        seq_printf(m, "Num Pipes: %d\n", INTEL_INFO(dev)->num_pipes);
         for_each_pipe(i) {
                 seq_printf(m, "Pipe [%d]:\n", i);
                 seq_printf(m, "  CONF: %08x\n", error->pipe[i].conf);