RZ/G2L SoC's does not have group/plane registers compared to RCar, hence it needs a different CRTC implementation. Factorise rcar_du_vsp{complete, enable,plane_atomic_check} so that it can support RZ/G2L SoC without any code changes.
Signed-off-by: Biju Das biju.das.jz@bp.renesas.com --- v1->v2: * No change RFC->v1: * New patch --- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 3 +++ drivers/gpu/drm/rcar-du/rcar_du_drv.h | 9 +++++++++ drivers/gpu/drm/rcar-du/rcar_du_vsp.c | 12 ++++++++---- 3 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 0df1430b9664..b944885d7f65 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -38,6 +38,9 @@ static struct rcar_du_crtc_helper_funcs rcar_crtc_helper_funcs = { .du_planes_init = rcar_du_planes_init, .du_crtc_create = rcar_du_crtc_create, .du_atomic_check_planes = rcar_du_atomic_check_planes, + .__du_plane_setup = __rcar_du_plane_setup, + .__du_plane_atomic_check = __rcar_du_plane_atomic_check, + .du_crtc_finish_page_flip = rcar_du_crtc_finish_page_flip, };
static const struct rcar_du_device_info rzg1_du_r8a7743_info = { diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.h b/drivers/gpu/drm/rcar-du/rcar_du_drv.h index 164cd9854aaf..bb2146621eb4 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.h +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.h @@ -66,6 +66,9 @@ struct rcar_du_output_routing { * @du_planes_init: pointer to du_plane_init function * @du_crtc_create: pointer to du_crtc_create function * @du_atomic_check_planes: pointer to du_atomic_check_planes function + * @__du_plane_setup: pointer to __du_plane_setup function + * @__du_plane_atomic_check: pointer to __du_plane_atomic_check function + * @du_crtc_finish_page_flip: pointer to du_crtc_finish_page_flip function */ struct rcar_du_crtc_helper_funcs { int (*du_planes_init)(struct rcar_du_group *rgrp); @@ -73,6 +76,12 @@ struct rcar_du_crtc_helper_funcs { unsigned int hwindex); int (*du_atomic_check_planes)(struct drm_device *dev, struct drm_atomic_state *state); + void (*__du_plane_setup)(struct rcar_du_group *rgrp, + const struct rcar_du_plane_state *state); + int (*__du_plane_atomic_check)(struct drm_plane *plane, + struct drm_plane_state *state, + const struct rcar_du_format_info **format); + void (*du_crtc_finish_page_flip)(struct rcar_du_crtc *rcrtc); };
/* diff --git a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c index cf045a203aa5..41928a94c903 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_vsp.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_vsp.c @@ -35,12 +35,13 @@ static void rcar_du_vsp_complete(void *private, unsigned int status, u32 crc) { struct rcar_du_crtc *crtc = private; + struct rcar_du_device *rcdu = crtc->dev;
if (crtc->vblank_enable) drm_crtc_handle_vblank(&crtc->crtc);
if (status & VSP1_DU_STATUS_COMPLETE) - rcar_du_crtc_finish_page_flip(crtc); + rcdu->info->fns->du_crtc_finish_page_flip(crtc); if (status & VSP1_DU_STATUS_WRITEBACK) rcar_du_writeback_complete(crtc);
@@ -82,7 +83,7 @@ void rcar_du_vsp_enable(struct rcar_du_crtc *crtc) else state.hwindex = crtc->index % 2;
- __rcar_du_plane_setup(crtc->group, &state); + rcdu->info->fns->__du_plane_setup(crtc->group, &state);
/* * Ensure that the plane source configuration takes effect by requesting @@ -294,12 +295,15 @@ static void rcar_du_vsp_plane_cleanup_fb(struct drm_plane *plane, static int rcar_du_vsp_plane_atomic_check(struct drm_plane *plane, struct drm_atomic_state *state) { + struct rcar_du_vsp *vsp = to_rcar_vsp_plane(plane)->vsp; + struct rcar_du_device *rcdu = vsp->dev; + struct drm_plane_state *new_plane_state = drm_atomic_get_new_plane_state(state, plane); struct rcar_du_vsp_plane_state *rstate = to_rcar_vsp_plane_state(new_plane_state);
- return __rcar_du_plane_atomic_check(plane, new_plane_state, - &rstate->format); + return rcdu->info->fns->__du_plane_atomic_check(plane, new_plane_state, + &rstate->format); }
static void rcar_du_vsp_plane_atomic_update(struct drm_plane *plane,