mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-20 01:20:54 +00:00
drm: mxsfb: Obtain bus flags from bridge state
In case the MXSFB is connected to a bridge, attempt to obtain bus flags from that bridge state too. The bus flags may specify e.g. the DE signal polarity. Acked-by: Alexander Stein <alexander.stein@ew.tq-group.com> Signed-off-by: Marek Vasut <marex@denx.de> Cc: Alexander Stein <alexander.stein@ew.tq-group.com> Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Cc: Lucas Stach <l.stach@pengutronix.de> Cc: Peng Fan <peng.fan@nxp.com> Cc: Robby Cai <robby.cai@nxp.com> Cc: Sam Ravnborg <sam@ravnborg.org> Cc: Stefan Agner <stefan@agner.ch> Reviewed-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Link: https://patchwork.freedesktop.org/patch/msgid/20220417021011.337066-1-marex@denx.de
This commit is contained in:
parent
3604f1e531
commit
57e6f0562c
1 changed files with 5 additions and 2 deletions
|
@ -275,6 +275,7 @@ static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb)
|
||||||
}
|
}
|
||||||
|
|
||||||
static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb,
|
static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb,
|
||||||
|
struct drm_bridge_state *bridge_state,
|
||||||
const u32 bus_format)
|
const u32 bus_format)
|
||||||
{
|
{
|
||||||
struct drm_device *drm = mxsfb->crtc.dev;
|
struct drm_device *drm = mxsfb->crtc.dev;
|
||||||
|
@ -284,6 +285,8 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb,
|
||||||
|
|
||||||
if (mxsfb->bridge && mxsfb->bridge->timings)
|
if (mxsfb->bridge && mxsfb->bridge->timings)
|
||||||
bus_flags = mxsfb->bridge->timings->input_bus_flags;
|
bus_flags = mxsfb->bridge->timings->input_bus_flags;
|
||||||
|
else if (bridge_state)
|
||||||
|
bus_flags = bridge_state->input_bus_cfg.flags;
|
||||||
|
|
||||||
DRM_DEV_DEBUG_DRIVER(drm->dev, "Pixel clock: %dkHz (actual: %dkHz)\n",
|
DRM_DEV_DEBUG_DRIVER(drm->dev, "Pixel clock: %dkHz (actual: %dkHz)\n",
|
||||||
m->crtc_clock,
|
m->crtc_clock,
|
||||||
|
@ -345,7 +348,7 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
|
||||||
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
|
struct mxsfb_drm_private *mxsfb = to_mxsfb_drm_private(crtc->dev);
|
||||||
struct drm_plane_state *new_pstate = drm_atomic_get_new_plane_state(state,
|
struct drm_plane_state *new_pstate = drm_atomic_get_new_plane_state(state,
|
||||||
crtc->primary);
|
crtc->primary);
|
||||||
struct drm_bridge_state *bridge_state;
|
struct drm_bridge_state *bridge_state = NULL;
|
||||||
struct drm_device *drm = mxsfb->drm;
|
struct drm_device *drm = mxsfb->drm;
|
||||||
u32 bus_format = 0;
|
u32 bus_format = 0;
|
||||||
dma_addr_t paddr;
|
dma_addr_t paddr;
|
||||||
|
@ -381,7 +384,7 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,
|
||||||
if (!bus_format)
|
if (!bus_format)
|
||||||
bus_format = MEDIA_BUS_FMT_RGB888_1X24;
|
bus_format = MEDIA_BUS_FMT_RGB888_1X24;
|
||||||
|
|
||||||
mxsfb_crtc_mode_set_nofb(mxsfb, bus_format);
|
mxsfb_crtc_mode_set_nofb(mxsfb, bridge_state, bus_format);
|
||||||
|
|
||||||
/* Write cur_buf as well to avoid an initial corrupt frame */
|
/* Write cur_buf as well to avoid an initial corrupt frame */
|
||||||
paddr = drm_fb_cma_get_gem_addr(new_pstate->fb, new_pstate, 0);
|
paddr = drm_fb_cma_get_gem_addr(new_pstate->fb, new_pstate, 0);
|
||||||
|
|
Loading…
Reference in a new issue