drm: Replace crtc fb with primary plane fb (v3)

Now that CRTC's have a primary plane, there's no need to track the
framebuffer in the CRTC.  Replace all references to the CRTC fb with the
primary plane's fb.

This patch was generated by the Coccinelle semantic patching tool using
the following rules:

        @@ struct drm_crtc C; @@
        -   (C).fb
        +   C.primary->fb

        @@ struct drm_crtc *C; @@
        -   (C)->fb
        +   C->primary->fb

v3: Generate patch via coccinelle.  Actual removal of crtc->fb has been
    moved to a subsequent patch.

v2: Fixup several lingering crtc->fb instances that were missed in the
    first patch iteration.  [Rob Clark]

Signed-off-by: Matt Roper <matthew.d.roper@intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>

11 files changed, 30 insertions, 30 deletions

diff --git a/drivers/gpu/drm/gma500/cdv_intel_display.c b/drivers/gpu/drm/gma500/cdv_intel_display.c
index 7ff91ce3b12a..66727328832d 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_display.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_display.c
@@ -469,7 +469,7 @@ static bool cdv_intel_pipe_enabled(struct drm_device *dev, int pipe)
         crtc = dev_priv->pipe_to_crtc_mapping[pipe];
         gma_crtc = to_gma_crtc(crtc);
 
-        if (crtc->fb == NULL || !gma_crtc->active)
+        if (crtc->primary->fb == NULL || !gma_crtc->active)
                 return false;
         return true;
 }
diff --git a/drivers/gpu/drm/gma500/cdv_intel_dp.c b/drivers/gpu/drm/gma500/cdv_intel_dp.c
index 0490ce36b53f..9ff30c2efadb 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_dp.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_dp.c
@@ -1693,7 +1693,7 @@ done:
                 struct drm_crtc *crtc = encoder->base.crtc;
                 drm_crtc_helper_set_mode(crtc, &crtc->mode,
                                          crtc->x, crtc->y,
-                                         crtc->fb);
+                                         crtc->primary->fb);
         }
 
         return 0;
diff --git a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
index 968b42a5a32b..b99084b3f706 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_hdmi.c
@@ -192,7 +192,7 @@ static int cdv_hdmi_set_property(struct drm_connector *connector,
                     crtc->saved_mode.vdisplay != 0) {
                         if (centre) {
                                 if (!drm_crtc_helper_set_mode(encoder->crtc, &crtc->saved_mode,
-                                            encoder->crtc->x, encoder->crtc->y, encoder->crtc->fb))
+                                            encoder->crtc->x, encoder->crtc->y, encoder->crtc->primary->fb))
                                         return -1;
                         } else {
                                 struct drm_encoder_helper_funcs *helpers
diff --git a/drivers/gpu/drm/gma500/cdv_intel_lvds.c b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
index 66a41c026834..8ecc920fc26d 100644
--- a/drivers/gpu/drm/gma500/cdv_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/cdv_intel_lvds.c
@@ -494,7 +494,7 @@ static int cdv_intel_lvds_set_property(struct drm_connector *connector,
                                                       &crtc->saved_mode,
                                                       encoder->crtc->x,
                                                       encoder->crtc->y,
-                                                      encoder->crtc->fb))
+                                                      encoder->crtc->primary->fb))
                                 return -1;
                 }
         } else if (!strcmp(property->name, "backlight") && encoder) {
diff --git a/drivers/gpu/drm/gma500/gma_display.c b/drivers/gpu/drm/gma500/gma_display.c
index d45476b72aad..9bb9bddd881a 100644
--- a/drivers/gpu/drm/gma500/gma_display.c
+++ b/drivers/gpu/drm/gma500/gma_display.c
@@ -59,7 +59,7 @@ int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y,
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
         struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
-        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
+        struct psb_framebuffer *psbfb = to_psb_fb(crtc->primary->fb);
         int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         unsigned long start, offset;
@@ -70,7 +70,7 @@ int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                 return 0;
 
         /* no fb bound */
-        if (!crtc->fb) {
+        if (!crtc->primary->fb) {
                 dev_err(dev->dev, "No FB bound\n");
                 goto gma_pipe_cleaner;
         }
@@ -81,19 +81,19 @@ int gma_pipe_set_base(struct drm_crtc *crtc, int x, int y,
         if (ret < 0)
                 goto gma_pipe_set_base_exit;
         start = psbfb->gtt->offset;
-        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
+        offset = y * crtc->primary->fb->pitches[0] + x * (crtc->primary->fb->bits_per_pixel / 8);
 
-        REG_WRITE(map->stride, crtc->fb->pitches[0]);
+        REG_WRITE(map->stride, crtc->primary->fb->pitches[0]);
 
         dspcntr = REG_READ(map->cntr);
         dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
 
-        switch (crtc->fb->bits_per_pixel) {
+        switch (crtc->primary->fb->bits_per_pixel) {
         case 8:
                 dspcntr |= DISPPLANE_8BPP;
                 break;
         case 16:
-                if (crtc->fb->depth == 15)
+                if (crtc->primary->fb->depth == 15)
                         dspcntr |= DISPPLANE_15_16BPP;
                 else
                         dspcntr |= DISPPLANE_16BPP;
@@ -518,8 +518,8 @@ void gma_crtc_disable(struct drm_crtc *crtc)
 
         crtc_funcs->dpms(crtc, DRM_MODE_DPMS_OFF);
 
-        if (crtc->fb) {
-                gt = to_psb_fb(crtc->fb)->gtt;
+        if (crtc->primary->fb) {
+                gt = to_psb_fb(crtc->primary->fb)->gtt;
                 psb_gtt_unpin(gt);
         }
 }
diff --git a/drivers/gpu/drm/gma500/mdfld_dsi_output.c b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
index 860a4ee9baaf..6e91b20ce2e5 100644
--- a/drivers/gpu/drm/gma500/mdfld_dsi_output.c
+++ b/drivers/gpu/drm/gma500/mdfld_dsi_output.c
@@ -287,7 +287,7 @@ static int mdfld_dsi_connector_set_property(struct drm_connector *connector,
                                                 &gma_crtc->saved_mode,
                                                 encoder->crtc->x,
                                                 encoder->crtc->y,
-                                                encoder->crtc->fb))
+                                                encoder->crtc->primary->fb))
                                         goto set_prop_error;
                         } else {
                                 struct drm_encoder_helper_funcs *funcs =
diff --git a/drivers/gpu/drm/gma500/mdfld_intel_display.c b/drivers/gpu/drm/gma500/mdfld_intel_display.c
index 321c00a944e9..8cc8a5abbc7b 100644
--- a/drivers/gpu/drm/gma500/mdfld_intel_display.c
+++ b/drivers/gpu/drm/gma500/mdfld_intel_display.c
@@ -166,7 +166,7 @@ static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
         struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
-        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
+        struct psb_framebuffer *psbfb = to_psb_fb(crtc->primary->fb);
         int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         unsigned long start, offset;
@@ -178,12 +178,12 @@ static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
         dev_dbg(dev->dev, "pipe = 0x%x.\n", pipe);
 
         /* no fb bound */
-        if (!crtc->fb) {
+        if (!crtc->primary->fb) {
                 dev_dbg(dev->dev, "No FB bound\n");
                 return 0;
         }
 
-        ret = check_fb(crtc->fb);
+        ret = check_fb(crtc->primary->fb);
         if (ret)
                 return ret;
 
@@ -196,18 +196,18 @@ static int mdfld__intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
                 return 0;
 
         start = psbfb->gtt->offset;
-        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
+        offset = y * crtc->primary->fb->pitches[0] + x * (crtc->primary->fb->bits_per_pixel / 8);
 
-        REG_WRITE(map->stride, crtc->fb->pitches[0]);
+        REG_WRITE(map->stride, crtc->primary->fb->pitches[0]);
         dspcntr = REG_READ(map->cntr);
         dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
 
-        switch (crtc->fb->bits_per_pixel) {
+        switch (crtc->primary->fb->bits_per_pixel) {
         case 8:
                 dspcntr |= DISPPLANE_8BPP;
                 break;
         case 16:
-                if (crtc->fb->depth == 15)
+                if (crtc->primary->fb->depth == 15)
                         dspcntr |= DISPPLANE_15_16BPP;
                 else
                         dspcntr |= DISPPLANE_16BPP;
@@ -700,7 +700,7 @@ static int mdfld_crtc_mode_set(struct drm_crtc *crtc,
         }
 #endif
 
-        ret = check_fb(crtc->fb);
+        ret = check_fb(crtc->primary->fb);
         if (ret)
                 return ret;
 
diff --git a/drivers/gpu/drm/gma500/oaktrail_crtc.c b/drivers/gpu/drm/gma500/oaktrail_crtc.c
index 8195e8592107..2de216c2374f 100644
--- a/drivers/gpu/drm/gma500/oaktrail_crtc.c
+++ b/drivers/gpu/drm/gma500/oaktrail_crtc.c
@@ -599,7 +599,7 @@ static int oaktrail_pipe_set_base(struct drm_crtc *crtc,
         struct drm_device *dev = crtc->dev;
         struct drm_psb_private *dev_priv = dev->dev_private;
         struct gma_crtc *gma_crtc = to_gma_crtc(crtc);
-        struct psb_framebuffer *psbfb = to_psb_fb(crtc->fb);
+        struct psb_framebuffer *psbfb = to_psb_fb(crtc->primary->fb);
         int pipe = gma_crtc->pipe;
         const struct psb_offset *map = &dev_priv->regmap[pipe];
         unsigned long start, offset;
@@ -608,7 +608,7 @@ static int oaktrail_pipe_set_base(struct drm_crtc *crtc,
         int ret = 0;
 
         /* no fb bound */
-        if (!crtc->fb) {
+        if (!crtc->primary->fb) {
                 dev_dbg(dev->dev, "No FB bound\n");
                 return 0;
         }
@@ -617,19 +617,19 @@ static int oaktrail_pipe_set_base(struct drm_crtc *crtc,
                 return 0;
 
         start = psbfb->gtt->offset;
-        offset = y * crtc->fb->pitches[0] + x * (crtc->fb->bits_per_pixel / 8);
+        offset = y * crtc->primary->fb->pitches[0] + x * (crtc->primary->fb->bits_per_pixel / 8);
 
-        REG_WRITE(map->stride, crtc->fb->pitches[0]);
+        REG_WRITE(map->stride, crtc->primary->fb->pitches[0]);
 
         dspcntr = REG_READ(map->cntr);
         dspcntr &= ~DISPPLANE_PIXFORMAT_MASK;
 
-        switch (crtc->fb->bits_per_pixel) {
+        switch (crtc->primary->fb->bits_per_pixel) {
         case 8:
                 dspcntr |= DISPPLANE_8BPP;
                 break;
         case 16:
-                if (crtc->fb->depth == 15)
+                if (crtc->primary->fb->depth == 15)
                         dspcntr |= DISPPLANE_15_16BPP;
                 else
                         dspcntr |= DISPPLANE_16BPP;
diff --git a/drivers/gpu/drm/gma500/psb_intel_display.c b/drivers/gpu/drm/gma500/psb_intel_display.c
index 21aed85eb96e..87b50ba64ed4 100644
--- a/drivers/gpu/drm/gma500/psb_intel_display.c
+++ b/drivers/gpu/drm/gma500/psb_intel_display.c
@@ -120,7 +120,7 @@ static int psb_intel_crtc_mode_set(struct drm_crtc *crtc,
         const struct gma_limit_t *limit;
 
         /* No scan out no play */
-        if (crtc->fb == NULL) {
+        if (crtc->primary->fb == NULL) {
                 crtc_funcs->mode_set_base(crtc, x, y, old_fb);
                 return 0;
         }
diff --git a/drivers/gpu/drm/gma500/psb_intel_lvds.c b/drivers/gpu/drm/gma500/psb_intel_lvds.c
index 891a028a0826..d7778d0472c1 100644
--- a/drivers/gpu/drm/gma500/psb_intel_lvds.c
+++ b/drivers/gpu/drm/gma500/psb_intel_lvds.c
@@ -614,7 +614,7 @@ int psb_intel_lvds_set_property(struct drm_connector *connector,
                                                       &crtc->saved_mode,
                                                       encoder->crtc->x,
                                                       encoder->crtc->y,
-                                                      encoder->crtc->fb))
+                                                      encoder->crtc->primary->fb))
                                 goto set_prop_error;
                 }
         } else if (!strcmp(property->name, "backlight")) {
diff --git a/drivers/gpu/drm/gma500/psb_intel_sdvo.c b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
index 681efecb718b..deeb0829b129 100644
--- a/drivers/gpu/drm/gma500/psb_intel_sdvo.c
+++ b/drivers/gpu/drm/gma500/psb_intel_sdvo.c
@@ -1844,7 +1844,7 @@ done:
         if (psb_intel_sdvo->base.base.crtc) {
                 struct drm_crtc *crtc = psb_intel_sdvo->base.base.crtc;
                 drm_crtc_helper_set_mode(crtc, &crtc->mode, crtc->x,
-                                         crtc->y, crtc->fb);
+                                         crtc->y, crtc->primary->fb);
         }
 
         return 0;