| Message ID | 20201217140933.1133969-1-robert.foss@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v2] drm/bridge: lt9611: Fix handling of 4k panels | expand |
Hi, +Sam Ravnborg I think this patch is ready to get pulled into the drm-misc tree. On Thu, 17 Dec 2020 at 15:09, Robert Foss <robert.foss@linaro.org> wrote: > > 4k requires two dsi pipes, so don't report MODE_OK when only a > single pipe is configured. But rather report MODE_PANEL to > signal that requirements of the panel are not being met. > > Reported-by: Peter Collingbourne <pcc@google.com> > Suggested-by: Peter Collingbourne <pcc@google.com> > Signed-off-by: Robert Foss <robert.foss@linaro.org> > Tested-by: John Stultz <john.stultz@linaro.org> > Tested-by: Anibal Limon <anibal.limon@linaro.org> > Acked-By: Vinod Koul <vkoul@kernel.org> > Tested-by: Peter Collingbourne <pcc@google.com> > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > --- > drivers/gpu/drm/bridge/lontium-lt9611.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c > index d734d9402c35..e8eb8deb444b 100644 > --- a/drivers/gpu/drm/bridge/lontium-lt9611.c > +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c > @@ -867,8 +867,14 @@ static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *bridge, > const struct drm_display_mode *mode) > { > struct lt9611_mode *lt9611_mode = lt9611_find_mode(mode); > + struct lt9611 *lt9611 = bridge_to_lt9611(bridge); > > - return lt9611_mode ? MODE_OK : MODE_BAD; > + if (!lt9611_mode) > + return MODE_BAD; > + else if (lt9611_mode->intfs > 1 && !lt9611->dsi1) > + return MODE_PANEL; > + else > + return MODE_OK; > } > > static void lt9611_bridge_pre_enable(struct drm_bridge *bridge) > -- > 2.27.0 >
On Thu, Jan 21, 2021 at 1:50 AM Robert Foss <robert.foss@linaro.org> wrote: > +Sam Ravnborg > > I think this patch is ready to get pulled into the drm-misc tree. > > On Thu, 17 Dec 2020 at 15:09, Robert Foss <robert.foss@linaro.org> wrote: > > > > 4k requires two dsi pipes, so don't report MODE_OK when only a > > single pipe is configured. But rather report MODE_PANEL to > > signal that requirements of the panel are not being met. Hey All, I just wanted to follow up on this patch as it seems like it missed 5.12 ? Just wanted to make sure it didn't slip through the cracks. thanks -john
On Thu, Dec 17, 2020 at 6:09 AM Robert Foss <robert.foss@linaro.org> wrote: > > 4k requires two dsi pipes, so don't report MODE_OK when only a > single pipe is configured. But rather report MODE_PANEL to > signal that requirements of the panel are not being met. > > Reported-by: Peter Collingbourne <pcc@google.com> > Suggested-by: Peter Collingbourne <pcc@google.com> > Signed-off-by: Robert Foss <robert.foss@linaro.org> > Tested-by: John Stultz <john.stultz@linaro.org> > Tested-by: Anibal Limon <anibal.limon@linaro.org> > Acked-By: Vinod Koul <vkoul@kernel.org> > Tested-by: Peter Collingbourne <pcc@google.com> > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> This landed in commit d1a97648ae028a44536927c87837c45ada7141c9. Since this is a bug fix I'd like to request it to be applied to the 5.10 stable kernel. Peter
On Fri, Sep 17, 2021 at 12:47:05PM -0700, Peter Collingbourne wrote: > On Thu, Dec 17, 2020 at 6:09 AM Robert Foss <robert.foss@linaro.org> wrote: > > > > 4k requires two dsi pipes, so don't report MODE_OK when only a > > single pipe is configured. But rather report MODE_PANEL to > > signal that requirements of the panel are not being met. > > > > Reported-by: Peter Collingbourne <pcc@google.com> > > Suggested-by: Peter Collingbourne <pcc@google.com> > > Signed-off-by: Robert Foss <robert.foss@linaro.org> > > Tested-by: John Stultz <john.stultz@linaro.org> > > Tested-by: Anibal Limon <anibal.limon@linaro.org> > > Acked-By: Vinod Koul <vkoul@kernel.org> > > Tested-by: Peter Collingbourne <pcc@google.com> > > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > > This landed in commit d1a97648ae028a44536927c87837c45ada7141c9. Since > this is a bug fix I'd like to request it to be applied to the 5.10 > stable kernel. Now queued up, thanks. greg k-h
diff --git a/drivers/gpu/drm/bridge/lontium-lt9611.c b/drivers/gpu/drm/bridge/lontium-lt9611.c index d734d9402c35..e8eb8deb444b 100644 --- a/drivers/gpu/drm/bridge/lontium-lt9611.c +++ b/drivers/gpu/drm/bridge/lontium-lt9611.c @@ -867,8 +867,14 @@ static enum drm_mode_status lt9611_bridge_mode_valid(struct drm_bridge *bridge, const struct drm_display_mode *mode) { struct lt9611_mode *lt9611_mode = lt9611_find_mode(mode); + struct lt9611 *lt9611 = bridge_to_lt9611(bridge); - return lt9611_mode ? MODE_OK : MODE_BAD; + if (!lt9611_mode) + return MODE_BAD; + else if (lt9611_mode->intfs > 1 && !lt9611->dsi1) + return MODE_PANEL; + else + return MODE_OK; } static void lt9611_bridge_pre_enable(struct drm_bridge *bridge)