From: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Date: Mon, 27 Feb 2017 20:43:24 +0000 (-0300)
Subject: drm: qxl: Atomic phase 2: Use drm_atomic_set_fb_for_plane helper
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=10a0bd8969f8d333fe794a08ebc5ebd60d1fe958;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

drm: qxl: Atomic phase 2: Use drm_atomic_set_fb_for_plane helper

Signed-off-by: Gabriel Krisman Bertazi <krisman@collabora.co.uk>
Link: http://patchwork.freedesktop.org/patch/msgid/20170227204328.18761-11-krisman@collabora.co.uk
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---

diff --git a/drivers/gpu/drm/qxl/qxl_display.c b/drivers/gpu/drm/qxl/qxl_display.c
index d5a00b6a07ea..d1c12ac222b7 100644
--- a/drivers/gpu/drm/qxl/qxl_display.c
+++ b/drivers/gpu/drm/qxl/qxl_display.c
@@ -31,6 +31,7 @@
 #include "drm_crtc_helper.h"
 #include <drm/drm_plane_helper.h>
 #include <drm/drm_atomic_helper.h>
+#include <drm/drm_atomic.h>
 
 static bool qxl_head_enabled(struct qxl_head *head)
 {
@@ -299,7 +300,8 @@ static int qxl_crtc_page_flip(struct drm_crtc *crtc,
 	int one_clip_rect = 1;
 	int ret = 0;
 
-	crtc->primary->fb = fb;
+	drm_atomic_set_fb_for_plane(crtc->primary->state, fb);
+
 	bo_old->is_primary = false;
 	bo->is_primary = true;