Skip to contentSkip to conversation

drm/mxsfb: Read bus flags from bridge if present

PATCH In review Guido Günther 2 participants 3 messages Jul 26, 2019

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover drm/mxsfb: Read bus flags from bridge if present

The bridge might have special requirmentes on the input bus. This is e.g. used by the imx-nwl bridge.

Robert, maybe you can add this patch to your 'Improvements and fixes for mxsfb DRM driver' since it depends on the first patch in this series anyway?

Tested with 'Improvements and fixes for mxsfb DRM driver'[0] and 'drm: bridge:
Add NWL MIPI DSI host controller support'[1] on next-20190725.

[0]: https://patchwork.freedesktop.org/series/62822/
[1]: https://patchwork.freedesktop.org/series/64185/

Guido Günther (1):
drm/mxsfb: Read bus flags from bridge if present

 drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH 1/1 drm/mxsfb: Read bus flags from bridge if present

The bridge might have special requirmentes on the input bus. This is e.g. used by the imx-nwl bridge.

---
 drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/mxsfb/mxsfb_crtc.c +4 -1
index e84bac3a541d..3b8eb3ac13b6 100644
@@ -215,7 +215,7 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
 {
 	struct drm_device *drm = mxsfb->pipe.crtc.dev;
 	struct drm_display_mode *m = &mxsfb->pipe.crtc.state->adjusted_mode;
-	const u32 bus_flags = mxsfb->connector->display_info.bus_flags;
+	u32 bus_flags = mxsfb->connector->display_info.bus_flags;
 	u32 vdctrl0, vsync_pulse_len, hsync_pulse_len;
 	int err;
 
@@ -239,6 +239,9 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb)
 
 	clk_set_rate(mxsfb->clk, m->crtc_clock * 1000);
 
+	if (mxsfb->bridge && mxsfb->bridge->timings)
+		bus_flags = mxsfb->bridge->timings->input_bus_flags;
+
 	DRM_DEV_DEBUG_DRIVER(drm->dev, "Pixel clock: %dkHz (actual: %dkHz)\n",
 			     m->crtc_clock,
 			     (int)(clk_get_rate(mxsfb->clk) / 1000));
Signature · 1 line
2.20.1
maintainer Reviewed-by on v1 1/1
#2 lore raw
Quoted 4 lines · Guido Günther

The bridge might have special requirmentes on the input bus. This is e.g. used by the imx-nwl bridge.

Looks good to me.

That is similar to what I sent for the imx DRM driver:

https://lkml.org/lkml/2018/9/12/913

I probably should follow up on that patchset.

--
Stefan

Quoted 30 lines
---
 drivers/gpu/drm/mxsfb/mxsfb_crtc.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/gpu/drm/mxsfb/mxsfb_crtc.c +4 -1
index e84bac3a541d..3b8eb3ac13b6 100644
@@ -215,7 +215,7 @@ static void mxsfb_crtc_mode_set_nofb(struct
 mxsfb_drm_private *mxsfb)
 {
 	struct drm_device *drm = mxsfb->pipe.crtc.dev;
 	struct drm_display_mode *m = &mxsfb->pipe.crtc.state->adjusted_mode;
-	const u32 bus_flags = mxsfb->connector->display_info.bus_flags;
+	u32 bus_flags = mxsfb->connector->display_info.bus_flags;
 	u32 vdctrl0, vsync_pulse_len, hsync_pulse_len;
 	int err;
@@ -239,6 +239,9 @@ static void mxsfb_crtc_mode_set_nofb(struct
 mxsfb_drm_private *mxsfb)
 
 	clk_set_rate(mxsfb->clk, m->crtc_clock * 1000);
 
+	if (mxsfb->bridge && mxsfb->bridge->timings)
+		bus_flags = mxsfb->bridge->timings->input_bus_flags;
+
 	DRM_DEV_DEBUG_DRIVER(drm->dev, "Pixel clock: %dkHz (actual: %dkHz)\n",
 			     m->crtc_clock,

(int)(clk_get_rate(mxsfb->clk) / 1000));