From: "H. Nikolaus Schaller" <hns@goldelico.com> To: Paul Cercueil <paul@crapouillou.net> Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch>, Sam Ravnborg <sam@ravnborg.org>, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, od@zcrc.me, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-mips@vger.kernel.org, stable@vger.kernel.org, Daniel Vetter <daniel.vetter@ffwll.ch> Subject: Re: [PATCH v3 4/4] drm/ingenic: Fix non-OSD mode Date: Sun, 24 Jan 2021 10:30:50 +0100 [thread overview] Message-ID: <30F302B6-04A1-472B-B026-009F7665E39C@goldelico.com> (raw) In-Reply-To: <20210124085552.29146-5-paul@crapouillou.net> Hi Paul, we observed the same issue on the jz4730 (which is almost identical to the jz4740 wrt. LCDC) and our solution [1] was simpler. It leaves the hwdesc f0 and f1 as they are and just takes f1 for really programming the first DMA descriptor if there is no OSD. We have tested on jz4730 and jz4780. Maybe you want to consider that. Then I can officially post it. [1] https://github.com/goldelico/letux-kernel/commit/3be1de5fdabf2cc1c17f198ded3328cc6e4b9844 > Am 24.01.2021 um 09:55 schrieb Paul Cercueil <paul@crapouillou.net>: > > Even though the JZ4740 did not have the OSD mode, it had (according to > the documentation) two DMA channels, but there is absolutely no > information about how to select the second DMA channel. > > Make the ingenic-drm driver work in non-OSD mode by using the > foreground0 plane (which is bound to the DMA0 channel) as the primary > plane, instead of the foreground1 plane, which is the primary plane > when in OSD mode. > > Fixes: 3c9bea4ef32b ("drm/ingenic: Add support for OSD mode") > Cc: <stable@vger.kernel.org> # v5.8+ > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > index b23011c1c5d9..59ce43862e16 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > @@ -554,7 +554,7 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane, > height = state->src_h >> 16; > cpp = state->fb->format->cpp[0]; > > - if (priv->soc_info->has_osd && plane->type == DRM_PLANE_TYPE_OVERLAY) > + if (!priv->soc_info->has_osd || plane->type == DRM_PLANE_TYPE_OVERLAY) > hwdesc = &priv->dma_hwdescs->hwdesc_f0; > else > hwdesc = &priv->dma_hwdescs->hwdesc_f1; we just replace this with if (priv->soc_info->has_osd && plane->type != DRM_PLANE_TYPE_OVERLAY) hwdesc = &priv->dma_hwdescs->hwdesc_f1; else hwdesc = &priv->dma_hwdescs->hwdesc_f0; and the remainder can stay as is. > @@ -826,6 +826,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) > const struct jz_soc_info *soc_info; > struct ingenic_drm *priv; > struct clk *parent_clk; > + struct drm_plane *primary; > struct drm_bridge *bridge; > struct drm_panel *panel; > struct drm_encoder *encoder; > @@ -940,9 +941,11 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) > if (soc_info->has_osd) > priv->ipu_plane = drm_plane_from_index(drm, 0); > > - drm_plane_helper_add(&priv->f1, &ingenic_drm_plane_helper_funcs); > + primary = priv->soc_info->has_osd ? &priv->f1 : &priv->f0; > > - ret = drm_universal_plane_init(drm, &priv->f1, 1, > + drm_plane_helper_add(primary, &ingenic_drm_plane_helper_funcs); > + > + ret = drm_universal_plane_init(drm, primary, 1, > &ingenic_drm_primary_plane_funcs, > priv->soc_info->formats_f1, > priv->soc_info->num_formats_f1, > @@ -954,7 +957,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) > > drm_crtc_helper_add(&priv->crtc, &ingenic_drm_crtc_helper_funcs); > > - ret = drm_crtc_init_with_planes(drm, &priv->crtc, &priv->f1, > + ret = drm_crtc_init_with_planes(drm, &priv->crtc, primary, > NULL, &ingenic_drm_crtc_funcs, NULL); > if (ret) { > dev_err(dev, "Failed to init CRTC: %i\n", ret); > -- > 2.29.2 > BR and thanks, Nikolaus
WARNING: multiple messages have this Message-ID (diff)
From: "H. Nikolaus Schaller" <hns@goldelico.com> To: Paul Cercueil <paul@crapouillou.net> Cc: David Airlie <airlied@linux.ie>, Daniel Vetter <daniel.vetter@ffwll.ch>, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-mips@vger.kernel.org, od@zcrc.me, Laurent Pinchart <Laurent.pinchart@ideasonboard.com>, stable@vger.kernel.org, Sam Ravnborg <sam@ravnborg.org> Subject: Re: [PATCH v3 4/4] drm/ingenic: Fix non-OSD mode Date: Sun, 24 Jan 2021 10:30:50 +0100 [thread overview] Message-ID: <30F302B6-04A1-472B-B026-009F7665E39C@goldelico.com> (raw) In-Reply-To: <20210124085552.29146-5-paul@crapouillou.net> Hi Paul, we observed the same issue on the jz4730 (which is almost identical to the jz4740 wrt. LCDC) and our solution [1] was simpler. It leaves the hwdesc f0 and f1 as they are and just takes f1 for really programming the first DMA descriptor if there is no OSD. We have tested on jz4730 and jz4780. Maybe you want to consider that. Then I can officially post it. [1] https://github.com/goldelico/letux-kernel/commit/3be1de5fdabf2cc1c17f198ded3328cc6e4b9844 > Am 24.01.2021 um 09:55 schrieb Paul Cercueil <paul@crapouillou.net>: > > Even though the JZ4740 did not have the OSD mode, it had (according to > the documentation) two DMA channels, but there is absolutely no > information about how to select the second DMA channel. > > Make the ingenic-drm driver work in non-OSD mode by using the > foreground0 plane (which is bound to the DMA0 channel) as the primary > plane, instead of the foreground1 plane, which is the primary plane > when in OSD mode. > > Fixes: 3c9bea4ef32b ("drm/ingenic: Add support for OSD mode") > Cc: <stable@vger.kernel.org> # v5.8+ > Signed-off-by: Paul Cercueil <paul@crapouillou.net> > Acked-by: Daniel Vetter <daniel.vetter@ffwll.ch> > --- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 11 +++++++---- > 1 file changed, 7 insertions(+), 4 deletions(-) > > diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > index b23011c1c5d9..59ce43862e16 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > @@ -554,7 +554,7 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane, > height = state->src_h >> 16; > cpp = state->fb->format->cpp[0]; > > - if (priv->soc_info->has_osd && plane->type == DRM_PLANE_TYPE_OVERLAY) > + if (!priv->soc_info->has_osd || plane->type == DRM_PLANE_TYPE_OVERLAY) > hwdesc = &priv->dma_hwdescs->hwdesc_f0; > else > hwdesc = &priv->dma_hwdescs->hwdesc_f1; we just replace this with if (priv->soc_info->has_osd && plane->type != DRM_PLANE_TYPE_OVERLAY) hwdesc = &priv->dma_hwdescs->hwdesc_f1; else hwdesc = &priv->dma_hwdescs->hwdesc_f0; and the remainder can stay as is. > @@ -826,6 +826,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) > const struct jz_soc_info *soc_info; > struct ingenic_drm *priv; > struct clk *parent_clk; > + struct drm_plane *primary; > struct drm_bridge *bridge; > struct drm_panel *panel; > struct drm_encoder *encoder; > @@ -940,9 +941,11 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) > if (soc_info->has_osd) > priv->ipu_plane = drm_plane_from_index(drm, 0); > > - drm_plane_helper_add(&priv->f1, &ingenic_drm_plane_helper_funcs); > + primary = priv->soc_info->has_osd ? &priv->f1 : &priv->f0; > > - ret = drm_universal_plane_init(drm, &priv->f1, 1, > + drm_plane_helper_add(primary, &ingenic_drm_plane_helper_funcs); > + > + ret = drm_universal_plane_init(drm, primary, 1, > &ingenic_drm_primary_plane_funcs, > priv->soc_info->formats_f1, > priv->soc_info->num_formats_f1, > @@ -954,7 +957,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) > > drm_crtc_helper_add(&priv->crtc, &ingenic_drm_crtc_helper_funcs); > > - ret = drm_crtc_init_with_planes(drm, &priv->crtc, &priv->f1, > + ret = drm_crtc_init_with_planes(drm, &priv->crtc, primary, > NULL, &ingenic_drm_crtc_funcs, NULL); > if (ret) { > dev_err(dev, "Failed to init CRTC: %i\n", ret); > -- > 2.29.2 > BR and thanks, Nikolaus _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2021-01-24 9:34 UTC|newest] Thread overview: 32+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-01-24 8:55 [PATCH v3 0/4] Fixes to bridge/panel and ingenic-drm Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-01-24 8:55 ` [PATCH v3 1/4] drm: bridge/panel: Cleanup connector on bridge detach Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-03-24 2:16 ` Laurent Pinchart 2021-03-24 2:16 ` Laurent Pinchart 2021-01-24 8:55 ` [PATCH v3 2/4] drm/simple_kms_helper: Add macro drmm_plain_simple_encoder_alloc() Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-03-24 2:24 ` Laurent Pinchart 2021-03-24 2:24 ` Laurent Pinchart 2021-01-24 8:55 ` [PATCH v3 3/4] drm/ingenic: Register devm action to cleanup encoders Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-03-24 2:27 ` Laurent Pinchart 2021-03-24 2:27 ` Laurent Pinchart 2021-01-24 8:55 ` [PATCH v3 4/4] drm/ingenic: Fix non-OSD mode Paul Cercueil 2021-01-24 8:55 ` Paul Cercueil 2021-01-24 9:30 ` H. Nikolaus Schaller [this message] 2021-01-24 9:30 ` H. Nikolaus Schaller 2021-01-24 9:43 ` Paul Cercueil 2021-01-24 9:43 ` Paul Cercueil 2021-01-24 9:47 ` H. Nikolaus Schaller 2021-01-24 9:47 ` H. Nikolaus Schaller 2021-01-25 18:56 ` H. Nikolaus Schaller 2021-01-25 18:56 ` H. Nikolaus Schaller 2021-03-24 2:31 ` Laurent Pinchart 2021-03-24 2:31 ` Laurent Pinchart 2021-02-24 13:44 ` [PATCH v3 0/4] Fixes to bridge/panel and ingenic-drm Paul Cercueil 2021-02-24 13:44 ` Paul Cercueil 2021-03-23 16:03 ` Paul Cercueil 2021-03-23 16:03 ` Paul Cercueil 2021-03-24 2:32 ` Laurent Pinchart 2021-03-24 2:32 ` Laurent Pinchart
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=30F302B6-04A1-472B-B026-009F7665E39C@goldelico.com \ --to=hns@goldelico.com \ --cc=Laurent.pinchart@ideasonboard.com \ --cc=airlied@linux.ie \ --cc=daniel.vetter@ffwll.ch \ --cc=daniel@ffwll.ch \ --cc=dri-devel@lists.freedesktop.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mips@vger.kernel.org \ --cc=od@zcrc.me \ --cc=paul@crapouillou.net \ --cc=sam@ravnborg.org \ --cc=stable@vger.kernel.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.