| Message ID | 1483961145-18453-4-git-send-email-shawnguo@kernel.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Mon, Jan 9, 2017 at 6:25 AM, Shawn Guo <shawnguo@kernel.org> wrote: > From: Shawn Guo <shawn.guo@linaro.org> > > Use drm_crtc_from_index() to find drm_crtc for given index, so that we > do not need to maintain a pointer array in struct mtk_drm_private. > > Signed-off-by: Shawn Guo <shawn.guo@linaro.org> > Cc: CK Hu <ck.hu@mediatek.com> Applied to drm-misc-next Thanks! Sean > --- > drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 9 ++++----- > drivers/gpu/drm/mediatek/mtk_drm_drv.h | 1 - > 2 files changed, 4 insertions(+), 6 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > index 01a21dd835b5..a73de1e669c2 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c > @@ -170,8 +170,8 @@ static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) > > int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe) > { > - struct mtk_drm_private *priv = drm->dev_private; > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(priv->crtc[pipe]); > + struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe); > + struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0]; > > mtk_ddp_comp_enable_vblank(ovl, &mtk_crtc->base); > @@ -181,8 +181,8 @@ int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe) > > void mtk_drm_crtc_disable_vblank(struct drm_device *drm, unsigned int pipe) > { > - struct mtk_drm_private *priv = drm->dev_private; > - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(priv->crtc[pipe]); > + struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe); > + struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); > struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0]; > > mtk_ddp_comp_disable_vblank(ovl); > @@ -588,7 +588,6 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, > goto unprepare; > drm_mode_crtc_set_gamma_size(&mtk_crtc->base, MTK_LUT_SIZE); > drm_crtc_enable_color_mgmt(&mtk_crtc->base, 0, false, MTK_LUT_SIZE); > - priv->crtc[pipe] = &mtk_crtc->base; > priv->num_pipes++; > > return 0; > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > index aa9389446785..df322a7a5fcb 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h > @@ -32,7 +32,6 @@ struct mtk_drm_private { > struct drm_device *drm; > struct device *dma_dev; > > - struct drm_crtc *crtc[MAX_CRTC]; > unsigned int num_pipes; > > struct device_node *mutex_node; > -- > 1.9.1 >
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c index 01a21dd835b5..a73de1e669c2 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_crtc.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_crtc.c @@ -170,8 +170,8 @@ static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe) { - struct mtk_drm_private *priv = drm->dev_private; - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(priv->crtc[pipe]); + struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe); + struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0]; mtk_ddp_comp_enable_vblank(ovl, &mtk_crtc->base); @@ -181,8 +181,8 @@ int mtk_drm_crtc_enable_vblank(struct drm_device *drm, unsigned int pipe) void mtk_drm_crtc_disable_vblank(struct drm_device *drm, unsigned int pipe) { - struct mtk_drm_private *priv = drm->dev_private; - struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(priv->crtc[pipe]); + struct drm_crtc *crtc = drm_crtc_from_index(drm, pipe); + struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc); struct mtk_ddp_comp *ovl = mtk_crtc->ddp_comp[0]; mtk_ddp_comp_disable_vblank(ovl); @@ -588,7 +588,6 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, goto unprepare; drm_mode_crtc_set_gamma_size(&mtk_crtc->base, MTK_LUT_SIZE); drm_crtc_enable_color_mgmt(&mtk_crtc->base, 0, false, MTK_LUT_SIZE); - priv->crtc[pipe] = &mtk_crtc->base; priv->num_pipes++; return 0; diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.h b/drivers/gpu/drm/mediatek/mtk_drm_drv.h index aa9389446785..df322a7a5fcb 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.h @@ -32,7 +32,6 @@ struct mtk_drm_private { struct drm_device *drm; struct device *dma_dev; - struct drm_crtc *crtc[MAX_CRTC]; unsigned int num_pipes; struct device_node *mutex_node;