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>

3 files changed, 15 insertions, 15 deletions

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 159af7ee111f..a2dde5ad8138 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -468,7 +468,7 @@ static int do_surface_dirty_sou(struct vmw_private *dev_priv,
         num_units = 0;
         list_for_each_entry(crtc, &dev_priv->dev->mode_config.crtc_list,
                             head) {
-                if (crtc->fb != &framebuffer->base)
+                if (crtc->primary->fb != &framebuffer->base)
                         continue;
                 units[num_units++] = vmw_crtc_to_du(crtc);
         }
@@ -882,7 +882,7 @@ static int do_dmabuf_dirty_sou(struct drm_file *file_priv,
 
         num_units = 0;
         list_for_each_entry(crtc, &dev_priv->dev->mode_config.crtc_list, head) {
-                if (crtc->fb != &framebuffer->base)
+                if (crtc->primary->fb != &framebuffer->base)
                         continue;
                 units[num_units++] = vmw_crtc_to_du(crtc);
         }
@@ -1243,7 +1243,7 @@ int vmw_kms_present(struct vmw_private *dev_priv,
 
         num_units = 0;
         list_for_each_entry(crtc, &dev_priv->dev->mode_config.crtc_list, head) {
-                if (crtc->fb != &vfb->base)
+                if (crtc->primary->fb != &vfb->base)
                         continue;
                 units[num_units++] = vmw_crtc_to_du(crtc);
         }
@@ -1380,7 +1380,7 @@ int vmw_kms_readback(struct vmw_private *dev_priv,
 
         num_units = 0;
         list_for_each_entry(crtc, &dev_priv->dev->mode_config.crtc_list, head) {
-                if (crtc->fb != &vfb->base)
+                if (crtc->primary->fb != &vfb->base)
                         continue;
                 units[num_units++] = vmw_crtc_to_du(crtc);
         }
@@ -1723,7 +1723,7 @@ int vmw_du_page_flip(struct drm_crtc *crtc,
                      uint32_t page_flip_flags)
 {
         struct vmw_private *dev_priv = vmw_priv(crtc->dev);
-        struct drm_framebuffer *old_fb = crtc->fb;
+        struct drm_framebuffer *old_fb = crtc->primary->fb;
         struct vmw_framebuffer *vfb = vmw_framebuffer_to_vfb(fb);
         struct drm_file *file_priv ;
         struct vmw_fence_obj *fence = NULL;
@@ -1741,7 +1741,7 @@ int vmw_du_page_flip(struct drm_crtc *crtc,
         if (!vmw_kms_screen_object_flippable(dev_priv, crtc))
                 return -EINVAL;
 
-        crtc->fb = fb;
+        crtc->primary->fb = fb;
 
         /* do a full screen dirty update */
         clips.x1 = clips.y1 = 0;
@@ -1781,7 +1781,7 @@ int vmw_du_page_flip(struct drm_crtc *crtc,
         return ret;
 
 out_no_fence:
-        crtc->fb = old_fb;
+        crtc->primary->fb = old_fb;
         return ret;
 }
 
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
index a055a26819c2..b2b9bd23aeee 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c
@@ -93,7 +93,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
 
                 if (crtc == NULL)
                         return 0;
-                fb = entry->base.crtc.fb;
+                fb = entry->base.crtc.primary->fb;
 
                 return vmw_kms_write_svga(dev_priv, w, h, fb->pitches[0],
                                           fb->bits_per_pixel, fb->depth);
@@ -101,7 +101,7 @@ static int vmw_ldu_commit_list(struct vmw_private *dev_priv)
 
         if (!list_empty(&lds->active)) {
                 entry = list_entry(lds->active.next, typeof(*entry), active);
-                fb = entry->base.crtc.fb;
+                fb = entry->base.crtc.primary->fb;
 
                 vmw_kms_write_svga(dev_priv, fb->width, fb->height, fb->pitches[0],
                                    fb->bits_per_pixel, fb->depth);
@@ -259,7 +259,7 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set)
 
                 connector->encoder = NULL;
                 encoder->crtc = NULL;
-                crtc->fb = NULL;
+                crtc->primary->fb = NULL;
                 crtc->enabled = false;
 
                 vmw_ldu_del_active(dev_priv, ldu);
@@ -280,7 +280,7 @@ static int vmw_ldu_crtc_set_config(struct drm_mode_set *set)
 
         vmw_fb_off(dev_priv);
 
-        crtc->fb = fb;
+        crtc->primary->fb = fb;
         encoder->crtc = crtc;
         connector->encoder = encoder;
         crtc->x = set->x;
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
index 22406c8651ea..a95d3a0cabe4 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c
@@ -307,7 +307,7 @@ static int vmw_sou_crtc_set_config(struct drm_mode_set *set)
 
                 connector->encoder = NULL;
                 encoder->crtc = NULL;
-                crtc->fb = NULL;
+                crtc->primary->fb = NULL;
                 crtc->x = 0;
                 crtc->y = 0;
                 crtc->enabled = false;
@@ -368,7 +368,7 @@ static int vmw_sou_crtc_set_config(struct drm_mode_set *set)
 
                 connector->encoder = NULL;
                 encoder->crtc = NULL;
-                crtc->fb = NULL;
+                crtc->primary->fb = NULL;
                 crtc->x = 0;
                 crtc->y = 0;
                 crtc->enabled = false;
@@ -381,7 +381,7 @@ static int vmw_sou_crtc_set_config(struct drm_mode_set *set)
         connector->encoder = encoder;
         encoder->crtc = crtc;
         crtc->mode = *mode;
-        crtc->fb = fb;
+        crtc->primary->fb = fb;
         crtc->x = set->x;
         crtc->y = set->y;
         crtc->enabled = true;
@@ -572,5 +572,5 @@ void vmw_kms_screen_object_update_implicit_fb(struct vmw_private *dev_priv,
         BUG_ON(!sou->base.is_implicit);
 
         dev_priv->sou_priv->implicit_fb =
-                vmw_framebuffer_to_vfb(sou->base.crtc.fb);
+                vmw_framebuffer_to_vfb(sou->base.crtc.primary->fb);
 }