Merge branch 'primary-plane' of git://people.freedesktop.org/~robclark/linux into drm-next

Here's the latest iteration of the universal planes work, which I believe is
finally ready for merging.  Aside from the minor driver patches to use the
new drm_for_each_legacy_plane() macro for plane loops, these should all have
an r-b from Rob Clark now.

Actual userspace-visibility is currently hidden behind a
drm.universal_planes module parameter so that we can do some experimental
testing of this before flipping it on universally.

* 'primary-plane' of git://people.freedesktop.org/~robclark/linux:
  drm/doc: Update plane documentation and add plane helper library
  drm: Allow userspace to ask for universal plane list (v2)
  drm: Remove unused drm_crtc->fb
  drm: Replace crtc fb with primary plane fb (v3)
  drm/msm: Switch to universal plane API's
  drm: Add drm_crtc_init_with_planes() (v2)
  drm: Add plane type property (v2)
  drm: Add drm_universal_plane_init()
  drm: Add primary plane helpers (v3)
  drm: Make drm_crtc_check_viewport non-static
  drm/shmobile: Restrict plane loops to only operate on legacy planes
  drm/i915: Restrict plane loops to only operate on overlay planes (v2)
  drm/exynos: Restrict plane loops to only operate on overlay planes (v2)
  drm: Add support for multiple plane types (v2)

4 files changed, 24 insertions, 23 deletions

diff --git a/drivers/gpu/drm/nouveau/dispnv04/crtc.c b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
index 1caef1fd139e..41be3424c906 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/crtc.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/crtc.c
@@ -239,7 +239,7 @@ nv_crtc_mode_set_vga(struct drm_crtc *crtc, struct drm_display_mode *mode)
         struct drm_device *dev = crtc->dev;
         struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
         struct nv04_crtc_reg *regp = &nv04_display(dev)->mode_reg.crtc_reg[nv_crtc->index];
-        struct drm_framebuffer *fb = crtc->fb;
+        struct drm_framebuffer *fb = crtc->primary->fb;
 
         /* Calculate our timings */
         int horizDisplay        = (mode->crtc_hdisplay >> 3)            - 1;
@@ -574,7 +574,7 @@ nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode * mode)
                 regp->CRTC[NV_CIO_CRE_86] = 0x1;
         }
 
-        regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] = (crtc->fb->depth + 1) / 8;
+        regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] = (crtc->primary->fb->depth + 1) / 8;
         /* Enable slaved mode (called MODE_TV in nv4ref.h) */
         if (lvds_output || tmds_output || tv_output)
                 regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] |= (1 << 7);
@@ -588,7 +588,7 @@ nv_crtc_mode_set_regs(struct drm_crtc *crtc, struct drm_display_mode * mode)
         regp->ramdac_gen_ctrl = NV_PRAMDAC_GENERAL_CONTROL_BPC_8BITS |
                                 NV_PRAMDAC_GENERAL_CONTROL_VGA_STATE_SEL |
                                 NV_PRAMDAC_GENERAL_CONTROL_PIXMIX_ON;
-        if (crtc->fb->depth == 16)
+        if (crtc->primary->fb->depth == 16)
                 regp->ramdac_gen_ctrl |= NV_PRAMDAC_GENERAL_CONTROL_ALT_MODE_SEL;
         if (nv_device(drm->device)->chipset >= 0x11)
                 regp->ramdac_gen_ctrl |= NV_PRAMDAC_GENERAL_CONTROL_PIPE_LONG;
@@ -609,7 +609,7 @@ static int
 nv_crtc_swap_fbs(struct drm_crtc *crtc, struct drm_framebuffer *old_fb)
 {
         struct nv04_display *disp = nv04_display(crtc->dev);
-        struct nouveau_framebuffer *nvfb = nouveau_framebuffer(crtc->fb);
+        struct nouveau_framebuffer *nvfb = nouveau_framebuffer(crtc->primary->fb);
         struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
         int ret;
 
@@ -808,7 +808,7 @@ nv_crtc_gamma_set(struct drm_crtc *crtc, u16 *r, u16 *g, u16 *b, uint32_t start,
          * mark the lut values as dirty by setting depth==0, and it'll be
          * uploaded on the first mode_set_base()
          */
-        if (!nv_crtc->base.fb) {
+        if (!nv_crtc->base.primary->fb) {
                 nv_crtc->lut.depth = 0;
                 return;
         }
@@ -832,7 +832,7 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,
         NV_DEBUG(drm, "index %d\n", nv_crtc->index);
 
         /* no fb bound */
-        if (!atomic && !crtc->fb) {
+        if (!atomic && !crtc->primary->fb) {
                 NV_DEBUG(drm, "No FB bound\n");
                 return 0;
         }
@@ -844,8 +844,8 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,
                 drm_fb = passed_fb;
                 fb = nouveau_framebuffer(passed_fb);
         } else {
-                drm_fb = crtc->fb;
-                fb = nouveau_framebuffer(crtc->fb);
+                drm_fb = crtc->primary->fb;
+                fb = nouveau_framebuffer(crtc->primary->fb);
         }
 
         nv_crtc->fb.offset = fb->nvbo->bo.offset;
@@ -857,9 +857,9 @@ nv04_crtc_do_mode_set_base(struct drm_crtc *crtc,
 
         /* Update the framebuffer format. */
         regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] &= ~3;
-        regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] |= (crtc->fb->depth + 1) / 8;
+        regp->CRTC[NV_CIO_CRE_PIXEL_INDEX] |= (crtc->primary->fb->depth + 1) / 8;
         regp->ramdac_gen_ctrl &= ~NV_PRAMDAC_GENERAL_CONTROL_ALT_MODE_SEL;
-        if (crtc->fb->depth == 16)
+        if (crtc->primary->fb->depth == 16)
                 regp->ramdac_gen_ctrl |= NV_PRAMDAC_GENERAL_CONTROL_ALT_MODE_SEL;
         crtc_wr_cio_state(crtc, regp, NV_CIO_CRE_PIXEL_INDEX);
         NVWriteRAMDAC(dev, nv_crtc->index, NV_PRAMDAC_GENERAL_CONTROL,
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
index 7fdc51e2a571..a2d669b4acf2 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
@@ -415,7 +415,7 @@ static void nv04_dfp_mode_set(struct drm_encoder *encoder,
         /* Output property. */
         if ((nv_connector->dithering_mode == DITHERING_MODE_ON) ||
             (nv_connector->dithering_mode == DITHERING_MODE_AUTO &&
-             encoder->crtc->fb->depth > connector->display_info.bpc * 3)) {
+             encoder->crtc->primary->fb->depth > connector->display_info.bpc * 3)) {
                 if (nv_device(drm->device)->chipset == 0x11)
                         regp->dither = savep->dither | 0x00010000;
                 else {
diff --git a/drivers/gpu/drm/nouveau/nouveau_display.c b/drivers/gpu/drm/nouveau/nouveau_display.c
index b1547b032150..3ff030dc1ee3 100644
--- a/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -571,7 +571,7 @@ nouveau_display_suspend(struct drm_device *dev)
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                 struct nouveau_framebuffer *nouveau_fb;
 
-                nouveau_fb = nouveau_framebuffer(crtc->fb);
+                nouveau_fb = nouveau_framebuffer(crtc->primary->fb);
                 if (!nouveau_fb || !nouveau_fb->nvbo)
                         continue;
 
@@ -598,7 +598,7 @@ nouveau_display_repin(struct drm_device *dev)
         list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
                 struct nouveau_framebuffer *nouveau_fb;
 
-                nouveau_fb = nouveau_framebuffer(crtc->fb);
+                nouveau_fb = nouveau_framebuffer(crtc->primary->fb);
                 if (!nouveau_fb || !nouveau_fb->nvbo)
                         continue;
 
@@ -695,7 +695,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
         const int swap_interval = (flags & DRM_MODE_PAGE_FLIP_ASYNC) ? 0 : 1;
         struct drm_device *dev = crtc->dev;
         struct nouveau_drm *drm = nouveau_drm(dev);
-        struct nouveau_bo *old_bo = nouveau_framebuffer(crtc->fb)->nvbo;
+        struct nouveau_bo *old_bo = nouveau_framebuffer(crtc->primary->fb)->nvbo;
         struct nouveau_bo *new_bo = nouveau_framebuffer(fb)->nvbo;
         struct nouveau_page_flip_state *s;
         struct nouveau_channel *chan = drm->channel;
@@ -769,7 +769,7 @@ nouveau_crtc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb,
                 goto fail_unreserve;
 
         /* Update the crtc struct and cleanup */
-        crtc->fb = fb;
+        crtc->primary->fb = fb;
 
         nouveau_bo_fence(old_bo, fence);
         ttm_bo_unreserve(&old_bo->bo);
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 2dccafc6e9db..58af547b0b93 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -651,7 +651,7 @@ nv50_crtc_set_dither(struct nouveau_crtc *nv_crtc, bool update)
         nv_connector = nouveau_crtc_connector_get(nv_crtc);
         connector = &nv_connector->base;
         if (nv_connector->dithering_mode == DITHERING_MODE_AUTO) {
-                if (nv_crtc->base.fb->depth > connector->display_info.bpc * 3)
+                if (nv_crtc->base.primary->fb->depth > connector->display_info.bpc * 3)
                         mode = DITHERING_MODE_DYNAMIC2X2;
         } else {
                 mode = nv_connector->dithering_mode;
@@ -785,7 +785,8 @@ nv50_crtc_set_scale(struct nouveau_crtc *nv_crtc, bool update)
 
                 if (update) {
                         nv50_display_flip_stop(crtc);
-                        nv50_display_flip_next(crtc, crtc->fb, NULL, 1);
+                        nv50_display_flip_next(crtc, crtc->primary->fb,
+                                               NULL, 1);
                 }
         }
 
@@ -1028,7 +1029,7 @@ nv50_crtc_commit(struct drm_crtc *crtc)
         }
 
         nv50_crtc_cursor_show_hide(nv_crtc, nv_crtc->cursor.visible, true);
-        nv50_display_flip_next(crtc, crtc->fb, NULL, 1);
+        nv50_display_flip_next(crtc, crtc->primary->fb, NULL, 1);
 }
 
 static bool
@@ -1042,7 +1043,7 @@ nv50_crtc_mode_fixup(struct drm_crtc *crtc, const struct drm_display_mode *mode,
 static int
 nv50_crtc_swap_fbs(struct drm_crtc *crtc, struct drm_framebuffer *old_fb)
 {
-        struct nouveau_framebuffer *nvfb = nouveau_framebuffer(crtc->fb);
+        struct nouveau_framebuffer *nvfb = nouveau_framebuffer(crtc->primary->fb);
         struct nv50_head *head = nv50_head(crtc);
         int ret;
 
@@ -1139,7 +1140,7 @@ nv50_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *umode,
         nv50_crtc_set_dither(nv_crtc, false);
         nv50_crtc_set_scale(nv_crtc, false);
         nv50_crtc_set_color_vibrance(nv_crtc, false);
-        nv50_crtc_set_image(nv_crtc, crtc->fb, x, y, false);
+        nv50_crtc_set_image(nv_crtc, crtc->primary->fb, x, y, false);
         return 0;
 }
 
@@ -1151,7 +1152,7 @@ nv50_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
         struct nouveau_crtc *nv_crtc = nouveau_crtc(crtc);
         int ret;
 
-        if (!crtc->fb) {
+        if (!crtc->primary->fb) {
                 NV_DEBUG(drm, "No FB bound\n");
                 return 0;
         }
@@ -1161,8 +1162,8 @@ nv50_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
                 return ret;
 
         nv50_display_flip_stop(crtc);
-        nv50_crtc_set_image(nv_crtc, crtc->fb, x, y, true);
-        nv50_display_flip_next(crtc, crtc->fb, NULL, 1);
+        nv50_crtc_set_image(nv_crtc, crtc->primary->fb, x, y, true);
+        nv50_display_flip_next(crtc, crtc->primary->fb, NULL, 1);
         return 0;
 }