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>

1 files changed, 10 insertions, 10 deletions

diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index c0f2d6266070..2dd806b9bcd2 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -309,7 +309,7 @@ static void __drm_helper_disable_unused_functions(struct drm_device *dev)
                                 (*crtc_funcs->disable)(crtc);
                         else
                                 (*crtc_funcs->dpms)(crtc, DRM_MODE_DPMS_OFF);
-                        crtc->fb = NULL;
+                        crtc->primary->fb = NULL;
                 }
         }
 }
@@ -653,19 +653,19 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
         save_set.mode = &set->crtc->mode;
         save_set.x = set->crtc->x;
         save_set.y = set->crtc->y;
-        save_set.fb = set->crtc->fb;
+        save_set.fb = set->crtc->primary->fb;
 
         /* We should be able to check here if the fb has the same properties
          * and then just flip_or_move it */
-        if (set->crtc->fb != set->fb) {
+        if (set->crtc->primary->fb != set->fb) {
                 /* If we have no fb then treat it as a full mode set */
-                if (set->crtc->fb == NULL) {
+                if (set->crtc->primary->fb == NULL) {
                         DRM_DEBUG_KMS("crtc has no fb, full mode set\n");
                         mode_changed = true;
                 } else if (set->fb == NULL) {
                         mode_changed = true;
                 } else if (set->fb->pixel_format !=
-                           set->crtc->fb->pixel_format) {
+                           set->crtc->primary->fb->pixel_format) {
                         mode_changed = true;
                 } else
                         fb_changed = true;
@@ -766,13 +766,13 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
                         DRM_DEBUG_KMS("attempting to set mode from"
                                         " userspace\n");
                         drm_mode_debug_printmodeline(set->mode);
-                        set->crtc->fb = set->fb;
+                        set->crtc->primary->fb = set->fb;
                         if (!drm_crtc_helper_set_mode(set->crtc, set->mode,
                                                       set->x, set->y,
                                                       save_set.fb)) {
                                 DRM_ERROR("failed to set mode on [CRTC:%d]\n",
                                           set->crtc->base.id);
-                                set->crtc->fb = save_set.fb;
+                                set->crtc->primary->fb = save_set.fb;
                                 ret = -EINVAL;
                                 goto fail;
                         }
@@ -787,13 +787,13 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
         } else if (fb_changed) {
                 set->crtc->x = set->x;
                 set->crtc->y = set->y;
-                set->crtc->fb = set->fb;
+                set->crtc->primary->fb = set->fb;
                 ret = crtc_funcs->mode_set_base(set->crtc,
                                                 set->x, set->y, save_set.fb);
                 if (ret != 0) {
                         set->crtc->x = save_set.x;
                         set->crtc->y = save_set.y;
-                        set->crtc->fb = save_set.fb;
+                        set->crtc->primary->fb = save_set.fb;
                         goto fail;
                 }
         }
@@ -990,7 +990,7 @@ void drm_helper_resume_force_mode(struct drm_device *dev)
                         continue;
 
                 ret = drm_crtc_helper_set_mode(crtc, &crtc->mode,
-                                               crtc->x, crtc->y, crtc->fb);
+                                               crtc->x, crtc->y, crtc->primary->fb);
 
                 /* Restoring the old config should never fail! */
                 if (ret == false)