drm: mxsfb: Wrap FIFO reset and comments into mxsfb_reset_block()
Subsystems (4)
Marek Vasut
maintainerPATCH v3 1/4 drm: mxsfb: Wrap FIFO reset and comments into mxsfb_reset_block()
Wrap FIFO reset and comments into mxsfb_reset_block(), this is a clean up. No functional change.
---
V2: Add RB from Lucas
V3: Rebase on latest next and discarded clock and irq cleanups
--- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 36 +++++++++++++++++-------------- 1 file changed, 20 insertions(+), 16 deletions(-)
drivers/gpu/drm/mxsfb/mxsfb_kms.c +20 -16
@@ -191,6 +191,12 @@ static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb) {int ret; +/* +* It seems, you can't re-program the controller if it is still +* running. This may lead to shifted pictures (FIFO issue?), so +* first stop the controller and drain its FIFOs. +*/ + ret =clear_poll_bit (mxsfb->base +LCDC_CTRL ,CTRL_SFTRST );if (ret)return ret;
@@ -201,7 +207,20 @@ static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb)if (ret)return ret; -return clear_poll_bit (mxsfb->base +LCDC_CTRL ,CTRL_CLKGATE ); + ret =clear_poll_bit (mxsfb->base +LCDC_CTRL ,CTRL_CLKGATE ); +if (ret) +return ret; + +/* Clear the FIFOs */ +writel (CTRL1_FIFO_CLEAR , mxsfb->base +LCDC_CTRL1 +REG_SET ); +readl (mxsfb->base +LCDC_CTRL1 ); +writel (CTRL1_FIFO_CLEAR , mxsfb->base +LCDC_CTRL1 +REG_CLR ); +readl (mxsfb->base +LCDC_CTRL1 ); + +if (mxsfb->devdata->has_overlay) +writel (0 , mxsfb->base +LCDC_AS_CTRL ); + +return 0 ; }static dma_addr_t mxsfb_get_fb_paddr (struct drm_plane *plane)
@@ -228,26 +247,11 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb,u32 vdctrl0, vsync_pulse_len, hsync_pulse_len;int err; -/* -* It seems, you can't re-program the controller if it is still -* running. This may lead to shifted pictures (FIFO issue?), so -* first stop the controller and drain its FIFOs. -*/ -/* Mandatory eLCDIF reset as per the Reference Manual */ err =mxsfb_reset_block (mxsfb);if (err)return ; -/* Clear the FIFOs */ -writel (CTRL1_FIFO_CLEAR , mxsfb->base +LCDC_CTRL1 +REG_SET ); -readl (mxsfb->base +LCDC_CTRL1 ); -writel (CTRL1_FIFO_CLEAR , mxsfb->base +LCDC_CTRL1 +REG_CLR ); -readl (mxsfb->base +LCDC_CTRL1 ); - -if (mxsfb->devdata->has_overlay) -writel (0 , mxsfb->base +LCDC_AS_CTRL ); -mxsfb_set_formats (mxsfb, bus_format);clk_set_rate (mxsfb->clk, m->crtc_clock *1000 );
Signature · 1 line
2.35.1
Marek Vasut
maintainerPATCH v3 2/4 drm: mxsfb: Replace mxsfb_get_fb_paddr() with drm_fb_cma_get_gem_addr()
Replace mxsfb_get_fb_paddr() with drm_fb_cma_get_gem_addr() to correctly handle FB offset.
---
V3: New patch
--- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 25 +++++++------------------ 1 file changed, 7 insertions(+), 18 deletions(-)
drivers/gpu/drm/mxsfb/mxsfb_kms.c +7 -18
@@ -223,21 +223,6 @@ static int mxsfb_reset_block(struct mxsfb_drm_private *mxsfb)return 0 ; } -static dma_addr_t mxsfb_get_fb_paddr (struct drm_plane *plane) -{ -struct drm_framebuffer *fb = plane->state->fb; -struct drm_gem_cma_object *gem; - -if (!fb) -return 0 ; - - gem =drm_fb_cma_get_gem_obj (fb,0 ); -if (!gem) -return 0 ; - -return gem->paddr; -} -static void mxsfb_crtc_mode_set_nofb (struct mxsfb_drm_private *mxsfb,const u32 bus_format) {
@@ -350,6 +335,8 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state) {struct mxsfb_drm_private *mxsfb =to_mxsfb_drm_private (crtc->dev); +struct drm_plane_state *new_pstate =drm_atomic_get_new_plane_state (state, + crtc->primary);struct drm_bridge_state *bridge_state;struct drm_device *drm = mxsfb->drm;u32 bus_format =0 ;
@@ -389,7 +376,7 @@ static void mxsfb_crtc_atomic_enable(struct drm_crtc *crtc,mxsfb_crtc_mode_set_nofb (mxsfb, bus_format);/* Write cur_buf as well to avoid an initial corrupt frame */ - paddr =mxsfb_get_fb_paddr (crtc->primary); + paddr =drm_fb_cma_get_gem_addr (new_pstate->fb, new_pstate,0 );if (paddr) {writel (paddr, mxsfb->base + mxsfb->devdata->cur_buf);writel (paddr, mxsfb->base + mxsfb->devdata->next_buf);
@@ -492,9 +479,11 @@ static void mxsfb_plane_primary_atomic_update(struct drm_plane *plane, struct drm_atomic_state *state) {struct mxsfb_drm_private *mxsfb =to_mxsfb_drm_private (plane->dev); +struct drm_plane_state *new_pstate =drm_atomic_get_new_plane_state (state, + plane);dma_addr_t paddr; - paddr =mxsfb_get_fb_paddr (plane); + paddr =drm_fb_cma_get_gem_addr (new_pstate->fb, new_pstate,0 );if (paddr)writel (paddr, mxsfb->base + mxsfb->devdata->next_buf); }
@@ -510,7 +499,7 @@ static void mxsfb_plane_overlay_atomic_update(struct drm_plane *plane,dma_addr_t paddr;u32 ctrl; - paddr =mxsfb_get_fb_paddr (plane); + paddr =drm_fb_cma_get_gem_addr (new_pstate->fb, new_pstate,0 );if (!paddr) {writel (0 , mxsfb->base +LCDC_AS_CTRL );return ;
Signature · 1 line
2.35.1
Re: [PATCH v3 2/4] drm: mxsfb: Replace mxsfb_get_fb_paddr() with drm_fb_cma_get_gem_addr()
Quoted 11 lines · Marek Vasut
Replace
mxsfb_get_fb_paddr()withdrm_fb_cma_get_gem_addr()to correctly handle FB offset.Signed-off-by Marek Vasut <[email protected]>Cc Alexander Stein <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Lucas Stach <[email protected]>Cc Peng Fan <[email protected]>Cc Robby Cai <[email protected]>Cc Sam Ravnborg <[email protected]>Cc Stefan Agner <[email protected]>
Marek Vasut
maintainerPATCH v3 3/4 drm: mxsfb: Factor out mxsfb_set_mode()
In reply to Marek VasutPull mode registers programming from mxsfb_enable_controller() into dedicated function mxsfb_set_mode(). This is a clean up. No functional change.
---
V2: No change
V3: Rebase on latest next and discarded clock and irq cleanups
--- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 96 +++++++++++++++++-------------- 1 file changed, 52 insertions(+), 44 deletions(-)
drivers/gpu/drm/mxsfb/mxsfb_kms.c +52 -44
@@ -96,6 +96,57 @@ static void mxsfb_set_formats(struct mxsfb_drm_private *mxsfb,writel (ctrl, mxsfb->base +LCDC_CTRL ); } +static void mxsfb_set_mode (struct mxsfb_drm_private *mxsfb,u32 bus_flags) +{ +struct drm_display_mode *m = &mxsfb->crtc.state->adjusted_mode; +u32 vdctrl0, vsync_pulse_len, hsync_pulse_len; + +writel (TRANSFER_COUNT_SET_VCOUNT (m->crtc_vdisplay) | +TRANSFER_COUNT_SET_HCOUNT (m->crtc_hdisplay), + mxsfb->base + mxsfb->devdata->transfer_count); + + vsync_pulse_len = m->crtc_vsync_end - m->crtc_vsync_start; + + vdctrl0 =VDCTRL0_ENABLE_PRESENT |/* Always in DOTCLOCK mode */ +VDCTRL0_VSYNC_PERIOD_UNIT | +VDCTRL0_VSYNC_PULSE_WIDTH_UNIT | +VDCTRL0_SET_VSYNC_PULSE_WIDTH (vsync_pulse_len); +if (m->flags &DRM_MODE_FLAG_PHSYNC ) + vdctrl0 |=VDCTRL0_HSYNC_ACT_HIGH ; +if (m->flags &DRM_MODE_FLAG_PVSYNC ) + vdctrl0 |=VDCTRL0_VSYNC_ACT_HIGH ; +/* Make sure Data Enable is high active by default */ +if (!(bus_flags &DRM_BUS_FLAG_DE_LOW )) + vdctrl0 |=VDCTRL0_ENABLE_ACT_HIGH ; +/* +* DRM_BUS_FLAG_PIXDATA_DRIVE_ defines are controller centric, +* controllers VDCTRL0_DOTCLK is display centric. +* Drive on positive edge -> display samples on falling edge +* DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE -> VDCTRL0_DOTCLK_ACT_FALLING +*/ +if (bus_flags &DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE ) + vdctrl0 |=VDCTRL0_DOTCLK_ACT_FALLING ; + +writel (vdctrl0, mxsfb->base +LCDC_VDCTRL0 ); + +/* Frame length in lines. */ +writel (m->crtc_vtotal, mxsfb->base +LCDC_VDCTRL1 ); + +/* Line length in units of clocks or pixels. */ + hsync_pulse_len = m->crtc_hsync_end - m->crtc_hsync_start; +writel (set_hsync_pulse_width (mxsfb, hsync_pulse_len) | +VDCTRL2_SET_HSYNC_PERIOD (m->crtc_htotal), + mxsfb->base +LCDC_VDCTRL2 ); + +writel (SET_HOR_WAIT_CNT (m->crtc_htotal - m->crtc_hsync_start) | +SET_VERT_WAIT_CNT (m->crtc_vtotal - m->crtc_vsync_start), + mxsfb->base +LCDC_VDCTRL3 ); + +writel (SET_DOTCLK_H_VALID_DATA_CNT (m->hdisplay), + mxsfb->base +LCDC_VDCTRL4 ); + +} +static void mxsfb_enable_controller (struct mxsfb_drm_private *mxsfb) {u32 reg;
@@ -229,7 +280,6 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb,struct drm_device *drm = mxsfb->crtc.dev;struct drm_display_mode *m = &mxsfb->crtc.state->adjusted_mode;u32 bus_flags = mxsfb->connector->display_info.bus_flags; -u32 vdctrl0, vsync_pulse_len, hsync_pulse_len;int err;/* Mandatory eLCDIF reset as per the Reference Manual */
@@ -251,49 +301,7 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb, bus_flags);DRM_DEV_DEBUG_DRIVER (drm->dev,"Mode flags: 0x%08X\n" , m->flags); -writel (TRANSFER_COUNT_SET_VCOUNT (m->crtc_vdisplay) | -TRANSFER_COUNT_SET_HCOUNT (m->crtc_hdisplay), - mxsfb->base + mxsfb->devdata->transfer_count); - - vsync_pulse_len = m->crtc_vsync_end - m->crtc_vsync_start; - - vdctrl0 =VDCTRL0_ENABLE_PRESENT |/* Always in DOTCLOCK mode */ -VDCTRL0_VSYNC_PERIOD_UNIT | -VDCTRL0_VSYNC_PULSE_WIDTH_UNIT | -VDCTRL0_SET_VSYNC_PULSE_WIDTH (vsync_pulse_len); -if (m->flags &DRM_MODE_FLAG_PHSYNC ) - vdctrl0 |=VDCTRL0_HSYNC_ACT_HIGH ; -if (m->flags &DRM_MODE_FLAG_PVSYNC ) - vdctrl0 |=VDCTRL0_VSYNC_ACT_HIGH ; -/* Make sure Data Enable is high active by default */ -if (!(bus_flags &DRM_BUS_FLAG_DE_LOW )) - vdctrl0 |=VDCTRL0_ENABLE_ACT_HIGH ; -/* -* DRM_BUS_FLAG_PIXDATA_DRIVE_ defines are controller centric, -* controllers VDCTRL0_DOTCLK is display centric. -* Drive on positive edge -> display samples on falling edge -* DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE -> VDCTRL0_DOTCLK_ACT_FALLING -*/ -if (bus_flags &DRM_BUS_FLAG_PIXDATA_DRIVE_POSEDGE ) - vdctrl0 |=VDCTRL0_DOTCLK_ACT_FALLING ; - -writel (vdctrl0, mxsfb->base +LCDC_VDCTRL0 ); - -/* Frame length in lines. */ -writel (m->crtc_vtotal, mxsfb->base +LCDC_VDCTRL1 ); - -/* Line length in units of clocks or pixels. */ - hsync_pulse_len = m->crtc_hsync_end - m->crtc_hsync_start; -writel (set_hsync_pulse_width (mxsfb, hsync_pulse_len) | -VDCTRL2_SET_HSYNC_PERIOD (m->crtc_htotal), - mxsfb->base +LCDC_VDCTRL2 ); - -writel (SET_HOR_WAIT_CNT (m->crtc_htotal - m->crtc_hsync_start) | -SET_VERT_WAIT_CNT (m->crtc_vtotal - m->crtc_vsync_start), - mxsfb->base +LCDC_VDCTRL3 ); - -writel (SET_DOTCLK_H_VALID_DATA_CNT (m->hdisplay), - mxsfb->base +LCDC_VDCTRL4 ); +mxsfb_set_mode (mxsfb, bus_flags); } static int mxsfb_crtc_atomic_check(struct drm_crtc *crtc,
Signature · 1 line
2.35.1
Re: [PATCH v3 3/4] drm: mxsfb: Factor out mxsfb_set_mode()
Quoted 4 lines · Marek Vasut
Pull mode registers programming from
mxsfb_enable_controller()into dedicated functionmxsfb_set_mode(). This is a clean up. No functional change.
Quoted 8 lines
Signed-off-by Marek Vasut <[email protected]>Cc Alexander Stein <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Lucas Stach <[email protected]>Cc Peng Fan <[email protected]>Cc Robby Cai <[email protected]>Cc Sam Ravnborg <[email protected]>Cc Stefan Agner <[email protected]>
Marek Vasut
maintainerPATCH v3 4/4 drm: mxsfb: Reorder mxsfb_crtc_mode_set_nofb()
In reply to Marek VasutReorder mxsfb_crtc_mode_set_nofb() such that all functions which perform register IO are called from one single location in this function. This is a clean up. No functional change.
---
V2: Add RB from Lucas
V3: Rebase on latest next and discarded clock and irq cleanups
--- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
drivers/gpu/drm/mxsfb/mxsfb_kms.c +9 -9
@@ -282,15 +282,6 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb,u32 bus_flags = mxsfb->connector->display_info.bus_flags;int err; -/* Mandatory eLCDIF reset as per the Reference Manual */ - err =mxsfb_reset_block (mxsfb); -if (err) -return ; - -mxsfb_set_formats (mxsfb, bus_format); - -clk_set_rate (mxsfb->clk, m->crtc_clock *1000 ); -if (mxsfb->bridge && mxsfb->bridge->timings) bus_flags = mxsfb->bridge->timings->input_bus_flags;
@@ -301,6 +292,15 @@ static void mxsfb_crtc_mode_set_nofb(struct mxsfb_drm_private *mxsfb, bus_flags);DRM_DEV_DEBUG_DRIVER (drm->dev,"Mode flags: 0x%08X\n" , m->flags); +/* Mandatory eLCDIF reset as per the Reference Manual */ + err =mxsfb_reset_block (mxsfb); +if (err) +return ; + +mxsfb_set_formats (mxsfb, bus_format); + +clk_set_rate (mxsfb->clk, m->crtc_clock *1000 ); +mxsfb_set_mode (mxsfb, bus_flags); }
Signature · 1 line
2.35.1
Re: [PATCH v3 4/4] drm: mxsfb: Reorder mxsfb_crtc_mode_set_nofb()
Quoted 4 lines · Marek Vasut
Reorder
mxsfb_crtc_mode_set_nofb()such that all functions which perform register IO are called from one single location in this function. This is a clean up. No functional change.
Quoted 9 lines
Reviewed-by Lucas Stach <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Alexander Stein <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Lucas Stach <[email protected]>Cc Peng Fan <[email protected]>Cc Robby Cai <[email protected]>Cc Sam Ravnborg <[email protected]>Cc Stefan Agner <[email protected]>
Quoted 12 lines · Marek Vasut
Wrap FIFO reset and comments into
mxsfb_reset_block(), this is a clean up. No functional change.Reviewed-by Lucas Stach <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Alexander Stein <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Lucas Stach <[email protected]>Cc Peng Fan <[email protected]>Cc Robby Cai <[email protected]>Cc Sam Ravnborg <[email protected]>Cc Stefan Agner <[email protected]>
Marek Vasut
maintainerQuoted 13 lines · Sam Ravnborg
Quoted 12 lines · Marek Vasut
Wrap FIFO reset and comments into
mxsfb_reset_block(), this is a clean up. No functional change.Reviewed-by Lucas Stach <[email protected]>Signed-off-by Marek Vasut <[email protected]>Cc Alexander Stein <[email protected]>Cc Laurent Pinchart <[email protected]>Cc Lucas Stach <[email protected]>Cc Peng Fan <[email protected]>Cc Robby Cai <[email protected]>Cc Sam Ravnborg <[email protected]>Cc Stefan Agner <[email protected]>
Quoted 1 line
Acked-by Sam Ravnborg <[email protected]>
If that's OK with everyone, I will apply those soon.