Hi, Stu:
On Fri, 2018-08-03 at 11:11 +0800, Stu Hsieh wrote:
> This patch update some variable name from ovl to comp
>
> Because RDMA would be first HW in ddp, the naming ovl
> should be change to comp.
>
> Signed-off-by: Stu Hsieh <stu.hsieh@xxxxxxxxxxxx>
Reviewed-by: CK Hu <ck.hu@xxxxxxxxxxxx>
> ---
> drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 26 +++++++++++++-------------
> drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 2 +-
> 2 files changed, 14 insertions(+), 14 deletions(-)
>
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> index b4d3dfca4003..e61f4985ae7f 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c
> @@ -172,9 +172,9 @@ static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
> static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)
> {
> struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> - struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
> + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
>
> - mtk_ddp_comp_enable_vblank(ovl, &mtk_crtc->base);
> + mtk_ddp_comp_enable_vblank(comp, &mtk_crtc->base);
>
> return 0;
> }
> @@ -182,9 +182,9 @@ static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)
> static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc)
> {
> struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> - struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
> + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
>
> - mtk_ddp_comp_disable_vblank(ovl);
> + mtk_ddp_comp_disable_vblank(comp);
> }
>
> static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc)
> @@ -335,7 +335,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
> {
> struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_crtc_state *state = to_mtk_crtc_state(mtk_crtc->base.state);
> - struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
> + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
> unsigned int i;
>
> /*
> @@ -344,7 +344,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
> * queue update module registers on vblank.
> */
> if (state->pending_config) {
> - mtk_ddp_comp_config(ovl, state->pending_width,
> + mtk_ddp_comp_config(comp, state->pending_width,
> state->pending_height,
> state->pending_vrefresh, 0);
>
> @@ -359,7 +359,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc)
> plane_state = to_mtk_plane_state(plane->state);
>
> if (plane_state->pending.config) {
> - mtk_ddp_comp_layer_config(ovl, i, plane_state);
> + mtk_ddp_comp_layer_config(comp, i, plane_state);
> plane_state->pending.config = false;
> }
> }
> @@ -371,12 +371,12 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
> struct drm_crtc_state *old_state)
> {
> struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> - struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
> + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
> int ret;
>
> DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
>
> - ret = mtk_smi_larb_get(ovl->larb_dev);
> + ret = mtk_smi_larb_get(comp->larb_dev);
> if (ret) {
> DRM_ERROR("Failed to get larb: %d\n", ret);
> return;
> @@ -384,7 +384,7 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
>
> ret = mtk_crtc_ddp_hw_init(mtk_crtc);
> if (ret) {
> - mtk_smi_larb_put(ovl->larb_dev);
> + mtk_smi_larb_put(comp->larb_dev);
> return;
> }
>
> @@ -396,7 +396,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
> struct drm_crtc_state *old_state)
> {
> struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> - struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0];
> + struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];
> int i;
>
> DRM_DEBUG_DRIVER("%s %d\n", __func__, crtc->base.id);
> @@ -419,7 +419,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,
>
> drm_crtc_vblank_off(crtc);
> mtk_crtc_ddp_hw_fini(mtk_crtc);
> - mtk_smi_larb_put(ovl->larb_dev);
> + mtk_smi_larb_put(comp->larb_dev);
>
> mtk_crtc->enabled = false;
> }
> @@ -517,7 +517,7 @@ static int mtk_drm_crtc_init(struct drm_device *drm,
> return ret;
> }
>
> -void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *ovl)
> +void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *comp)
> {
> struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);
> struct mtk_drm_private *priv = crtc->dev->dev_private;
> diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> index 0399321b1414..e64aa45915df 100644
> --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.h
> @@ -24,7 +24,7 @@
> #define MTK_MIN_BPC 3
>
> void mtk_drm_crtc_commit(struct drm_crtc *crtc);
> -void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *ovl);
> +void mtk_crtc_ddp_irq(struct drm_crtc *crtc, struct mtk_ddp_comp *comp);
> int mtk_drm_crtc_create(struct drm_device *drm_dev,
> const enum mtk_ddp_comp_id *path,
> unsigned int path_len);
_______________________________________________
dri-devel mailing list
dri-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/dri-devel
