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)

1 files changed, 5 insertions, 5 deletions

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index 798bde2e5881..41bdd174657e 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -527,7 +527,7 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
         bool recreate_primary = false;
         int ret;
         int surf_id;
-        if (!crtc->fb) {
+        if (!crtc->primary->fb) {
                 DRM_DEBUG_KMS("No FB bound\n");
                 return 0;
         }
@@ -536,7 +536,7 @@ static int qxl_crtc_mode_set(struct drm_crtc *crtc,
                 qfb = to_qxl_framebuffer(old_fb);
                 old_bo = gem_to_qxl_bo(qfb->obj);
         }
-        qfb = to_qxl_framebuffer(crtc->fb);
+        qfb = to_qxl_framebuffer(crtc->primary->fb);
         bo = gem_to_qxl_bo(qfb->obj);
         if (!m)
                 /* and do we care? */
@@ -609,14 +609,14 @@ static void qxl_crtc_disable(struct drm_crtc *crtc)
         struct qxl_crtc *qcrtc = to_qxl_crtc(crtc);
         struct drm_device *dev = crtc->dev;
         struct qxl_device *qdev = dev->dev_private;
-        if (crtc->fb) {
-                struct qxl_framebuffer *qfb = to_qxl_framebuffer(crtc->fb);
+        if (crtc->primary->fb) {
+                struct qxl_framebuffer *qfb = to_qxl_framebuffer(crtc->primary->fb);
                 struct qxl_bo *bo = gem_to_qxl_bo(qfb->obj);
                 int ret;
                 ret = qxl_bo_reserve(bo, false);
                 qxl_bo_unpin(bo);
                 qxl_bo_unreserve(bo);
-                crtc->fb = NULL;
+                crtc->primary->fb = NULL;
         }
 
         qxl_monitors_config_set(qdev, qcrtc->index, 0, 0, 0, 0, 0);