From: Russell King - ARM Linux <linux@armlinux.org.uk>
To: Liu Ying <gnuiyl@gmail.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>, dri-devel@lists.freedesktop.org
Subject: Re: [PATCH v3 03/10] drm/imx: atomic phase 1: Use transitional atomic CRTC and plane helpers
Date: Sat, 13 Aug 2016 15:09:11 +0100 [thread overview]
Message-ID: <20160813140910.GA11506@n2100.armlinux.org.uk> (raw)
In-Reply-To: <20160813112947.GA6718@n2100.armlinux.org.uk>
Okay, this is what I've ended up with - I'm not sure whether it's
correct or not, but this dirty patch allows the full series to be
applied and still have working userspace.
I still need to undo all the reverts I have touching imx-drm between
patch 10 of this set and 4.8-rc1...
diff --git a/drivers/gpu/drm/imx/ipuv3-plane.c b/drivers/gpu/drm/imx/ipuv3-plane.c
index 3f5f9566b152..6f9a43880381 100644
--- a/drivers/gpu/drm/imx/ipuv3-plane.c
+++ b/drivers/gpu/drm/imx/ipuv3-plane.c
@@ -275,7 +275,7 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,
if (WARN_ON(!crtc_state))
return -EINVAL;
- /* CRTC should be enabled */
+ /* CRTC should be enabled -- why? */
if (!crtc_state->enable)
return -EINVAL;
@@ -319,10 +319,14 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,
* since we cannot touch active IDMAC channels, we do not support
* resizing the enabled plane or changing its format
*/
+#if 0
if (old_fb && (state->src_w != old_state->src_w ||
state->src_h != old_state->src_h ||
- fb->pixel_format != old_fb->pixel_format))
+ fb->pixel_format != old_fb->pixel_format)) {
+ printk("%s:%d: fail\n", __func__, __LINE__);
return -EINVAL;
+ }
+#endif
eba = drm_plane_state_to_eba(state);
@@ -332,8 +336,12 @@ static int ipu_plane_atomic_check(struct drm_plane *plane,
if (fb->pitches[0] < 1 || fb->pitches[0] > 16384)
return -EINVAL;
- if (old_fb && fb->pitches[0] != old_fb->pitches[0])
+#if 0
+ if (old_fb && fb->pitches[0] != old_fb->pitches[0]) {
+ printk("%s:%d: fail\n", __func__, __LINE__);
return -EINVAL;
+ }
+#endif
switch (fb->pixel_format) {
case DRM_FORMAT_YUV420:
@@ -388,10 +396,14 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
struct drm_plane_state *state = plane->state;
enum ipu_color_space ics;
+#if 0
if (old_state->fb) {
ipu_plane_atomic_set_base(ipu_plane, old_state);
return;
}
+#endif
+
+ ipu_plane_disable(ipu_plane);
switch (ipu_plane->dp_flow) {
case IPU_DP_FLOW_SYNC_BG:
--
RMK's Patch system: http://www.armlinux.org.uk/developer/patches/
FTTC broadband for 0.8mile line: currently at 9.6Mbps down 400kbps up
according to speedtest.net.
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-08-13 14:09 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-07-04 7:40 [PATCH v3 00/10] imx drm atomic mode setting conversion Liu Ying
2016-07-04 7:40 ` [PATCH v3 01/10] drm/imx: ipuv3 plane: Check different types of plane separately Liu Ying
2016-07-04 7:40 ` [PATCH v3 02/10] gpu: ipu-v3: ipu-dmfc: Use static DMFC FIFO allocation mechanism Liu Ying
2016-07-04 7:40 ` [PATCH v3 03/10] drm/imx: atomic phase 1: Use transitional atomic CRTC and plane helpers Liu Ying
2016-08-13 10:11 ` Russell King - ARM Linux
2016-08-13 10:45 ` Russell King - ARM Linux
2016-08-13 11:29 ` Russell King - ARM Linux
2016-08-13 14:09 ` Russell King - ARM Linux [this message]
2016-08-13 15:00 ` Russell King - ARM Linux
2016-08-14 9:44 ` Daniel Vetter
2016-08-14 10:46 ` Daniel Vetter
2016-08-14 11:43 ` Peter Senna Tschudin
2016-08-15 6:21 ` Ying Liu
2016-07-04 7:40 ` [PATCH v3 04/10] drm/imx: atomic phase 2 step 1: Wire up state ->reset, ->duplicate and ->destroy Liu Ying
2016-07-04 7:40 ` [PATCH v3 05/10] drm/imx: atomic phase 2 step 2: Track plane_state->fb correctly in ->page_flip Liu Ying
2016-07-04 7:40 ` [PATCH v3 06/10] drm/imx: Remove encoders' ->prepare callbacks Liu Ying
2016-07-04 7:40 ` [PATCH v3 07/10] drm/imx: atomic phase 3 step 1: Use atomic configuration Liu Ying
2016-07-04 7:40 ` [PATCH v3 08/10] drm/bridge: dw-hdmi: Remove the legacy drm_connector_funcs structure Liu Ying
2016-07-04 7:40 ` [PATCH v3 09/10] drm/imx: atomic phase 3 step 2: Legacy callback fixups Liu Ying
2016-07-04 7:40 ` [PATCH v3 10/10] drm/imx: atomic phase 3 step 3: Advertise DRIVER_ATOMIC Liu Ying
2016-07-12 12:51 ` [PATCH v3 00/10] imx drm atomic mode setting conversion Daniel Vetter
2016-07-12 16:48 ` Philipp Zabel
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=20160813140910.GA11506@n2100.armlinux.org.uk \
--to=linux@armlinux.org.uk \
--cc=daniel.vetter@ffwll.ch \
--cc=dri-devel@lists.freedesktop.org \
--cc=gnuiyl@gmail.com \
/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