From: Liu Ying <gnuiyl@gmail.com>
To: dri-devel@lists.freedesktop.org
Cc: Russell King <rmk+kernel@arm.linux.org.uk>,
Daniel Vetter <daniel.vetter@ffwll.ch>
Subject: [PATCH v2 05/10] drm/imx: atomic phase 2 step 2: Track plane_state->fb correctly in ->page_flip
Date: Tue, 31 May 2016 17:24:26 +0800 [thread overview]
Message-ID: <1464686671-20299-6-git-send-email-gnuiyl@gmail.com> (raw)
In-Reply-To: <1464686671-20299-1-git-send-email-gnuiyl@gmail.com>
Use drm_atomic_set_fb_for_plane() in the legacy ->page_flip path to track
the pointer plane_state->fb correctly.
Signed-off-by: Liu Ying <gnuiyl@gmail.com>
---
v1->v2:
* None.
drivers/gpu/drm/imx/ipuv3-crtc.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/gpu/drm/imx/ipuv3-crtc.c b/drivers/gpu/drm/imx/ipuv3-crtc.c
index 8a0ef13..7df51e8 100644
--- a/drivers/gpu/drm/imx/ipuv3-crtc.c
+++ b/drivers/gpu/drm/imx/ipuv3-crtc.c
@@ -18,6 +18,7 @@
#include <linux/device.h>
#include <linux/platform_device.h>
#include <drm/drmP.h>
+#include <drm/drm_atomic.h>
#include <drm/drm_atomic_helper.h>
#include <drm/drm_crtc_helper.h>
#include <linux/fb.h>
@@ -217,6 +218,9 @@ static int ipu_page_flip(struct drm_crtc *crtc,
ipu_crtc->flip_state = IPU_FLIP_SUBMITTED;
}
+ if (crtc->primary->state)
+ drm_atomic_set_fb_for_plane(crtc->primary->state, fb);
+
return 0;
free_flip_work:
--
2.7.4
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-05-31 9:24 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-31 9:24 [PATCH v2 00/10] imx drm atomic mode setting conversion Liu Ying
2016-05-31 9:24 ` [PATCH v2 01/10] drm/imx: ipuv3 plane: Check different types of plane separately Liu Ying
2016-05-31 9:24 ` [PATCH v2 02/10] gpu: ipu-v3: ipu-dmfc: Use static DMFC FIFO allocation mechanism Liu Ying
2016-05-31 9:24 ` [PATCH v2 03/10] drm/imx: atomic phase 1: Use transitional atomic CRTC and plane helpers Liu Ying
2016-05-31 9:24 ` [PATCH v2 04/10] drm/imx: atomic phase 2 step 1: Wire up state ->reset, ->duplicate and ->destroy Liu Ying
2016-05-31 9:24 ` Liu Ying [this message]
2016-05-31 9:24 ` [PATCH v2 06/10] drm/imx: atomic phase 3 step 1: Atomic updates for planes Liu Ying
2016-05-31 9:24 ` [PATCH v2 07/10] drm/imx: atomic phase 3 step 2: Use atomic configuration Liu Ying
2016-05-31 9:24 ` [PATCH v2 08/10] drm/imx: atomic phase 3 step 3: Legacy callback fixups Liu Ying
2016-05-31 9:24 ` [PATCH v2 09/10] drm/imx: atomic phase 3 step 4: Use generic atomic page flip Liu Ying
2016-05-31 11:03 ` Daniel Vetter
2016-06-11 20:29 ` Daniel Vetter
2016-05-31 9:24 ` [PATCH v2 10/10] drm/imx: atomic phase 3 step 5: Advertise DRIVER_ATOMIC Liu Ying
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464686671-20299-6-git-send-email-gnuiyl@gmail.com \
--to=gnuiyl@gmail.com \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=rmk+kernel@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox