| Message ID | 1607746317-4696-11-git-send-email-yongqiang.niu@mediatek.com |
|---|---|
| State | New |
| Headers | show |
| Series | drm/mediatek: add support for mediatek SOC MT8192 | expand |
Hi, Yongqiang: Yongqiang Niu <yongqiang.niu@mediatek.com> 於 2020年12月12日 週六 下午12:22寫道： > > fix aal size config > > Fixes: 0664d1392c26 (drm/mediatek: Add AAL engine basic function) > Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com> > --- > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 11 ++++++++++- > 1 file changed, 10 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > index be61d11..e7d481e0 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > @@ -33,8 +33,13 @@ > #define DISP_REG_UFO_START 0x0000 > > #define DISP_AAL_EN 0x0000 > +#define DISP_AAL_CFG 0x0020 > +#define AAL_RELAY_MODE BIT(0) > +#define AAL_ENGINE_EN BIT(1) > #define DISP_AAL_SIZE 0x0030 > > +#define DISP_AAL_OUTPUT_SIZE 0x04d8 > + > #define DISP_CCORR_EN 0x0000 > #define CCORR_EN BIT(0) > #define DISP_CCORR_CFG 0x0020 > @@ -184,7 +189,11 @@ static void mtk_aal_config(struct mtk_ddp_comp *comp, unsigned int w, > unsigned int h, unsigned int vrefresh, > unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > { > - mtk_ddp_write(cmdq_pkt, h << 16 | w, comp, DISP_AAL_SIZE); > + mtk_ddp_write(cmdq_pkt, w << 16 | h, comp, DISP_AAL_SIZE); > + mtk_ddp_write(cmdq_pkt, w << 16 | h, comp, DISP_AAL_OUTPUT_SIZE); > + > + mtk_ddp_write_mask(NULL, AAL_RELAY_MODE, comp, DISP_AAL_CFG, cmdq_pkt > + AAL_RELAY_MODE | AAL_ENGINE_EN); This patch is to fix size config, so move this statement to another patch. Regards, Chun-Kuang. > } > > static void mtk_aal_start(struct mtk_ddp_comp *comp) > -- > 1.8.1.1.dirty > _______________________________________________ > Linux-mediatek mailing list > Linux-mediatek@lists.infradead.org > http://lists.infradead.org/mailman/listinfo/linux-mediatek
On Wed, 2020-12-16 at 23:10 +0800, Chun-Kuang Hu wrote: > Hi, Yongqiang: > > Yongqiang Niu <yongqiang.niu@mediatek.com> 於 2020年12月12日 週六 下午12:22寫道： > > > > fix aal size config > > > > Fixes: 0664d1392c26 (drm/mediatek: Add AAL engine basic function) > > Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com> > > --- > > drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 11 ++++++++++- > > 1 file changed, 10 insertions(+), 1 deletion(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > > index be61d11..e7d481e0 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > > +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c > > @@ -33,8 +33,13 @@ > > #define DISP_REG_UFO_START 0x0000 > > > > #define DISP_AAL_EN 0x0000 > > +#define DISP_AAL_CFG 0x0020 > > +#define AAL_RELAY_MODE BIT(0) > > +#define AAL_ENGINE_EN BIT(1) > > #define DISP_AAL_SIZE 0x0030 > > > > +#define DISP_AAL_OUTPUT_SIZE 0x04d8 > > + > > #define DISP_CCORR_EN 0x0000 > > #define CCORR_EN BIT(0) > > #define DISP_CCORR_CFG 0x0020 > > @@ -184,7 +189,11 @@ static void mtk_aal_config(struct mtk_ddp_comp *comp, unsigned int w, > > unsigned int h, unsigned int vrefresh, > > unsigned int bpc, struct cmdq_pkt *cmdq_pkt) > > { > > - mtk_ddp_write(cmdq_pkt, h << 16 | w, comp, DISP_AAL_SIZE); > > + mtk_ddp_write(cmdq_pkt, w << 16 | h, comp, DISP_AAL_SIZE); > > + mtk_ddp_write(cmdq_pkt, w << 16 | h, comp, DISP_AAL_OUTPUT_SIZE); > > + > > + mtk_ddp_write_mask(NULL, AAL_RELAY_MODE, comp, DISP_AAL_CFG, > > cmdq_pkt > > > + AAL_RELAY_MODE | AAL_ENGINE_EN); > > This patch is to fix size config, so move this statement to another patch. > > Regards, > Chun-Kuang. > will be fixed in next version > > } > > > > static void mtk_aal_start(struct mtk_ddp_comp *comp) > > -- > > 1.8.1.1.dirty > > _______________________________________________ > > Linux-mediatek mailing list > > Linux-mediatek@lists.infradead.org > > http://lists.infradead.org/mailman/listinfo/linux-mediatek
diff --git a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c index be61d11..e7d481e0 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c @@ -33,8 +33,13 @@ #define DISP_REG_UFO_START 0x0000 #define DISP_AAL_EN 0x0000 +#define DISP_AAL_CFG 0x0020 +#define AAL_RELAY_MODE BIT(0) +#define AAL_ENGINE_EN BIT(1) #define DISP_AAL_SIZE 0x0030 +#define DISP_AAL_OUTPUT_SIZE 0x04d8 + #define DISP_CCORR_EN 0x0000 #define CCORR_EN BIT(0) #define DISP_CCORR_CFG 0x0020 @@ -184,7 +189,11 @@ static void mtk_aal_config(struct mtk_ddp_comp *comp, unsigned int w, unsigned int h, unsigned int vrefresh, unsigned int bpc, struct cmdq_pkt *cmdq_pkt) { - mtk_ddp_write(cmdq_pkt, h << 16 | w, comp, DISP_AAL_SIZE); + mtk_ddp_write(cmdq_pkt, w << 16 | h, comp, DISP_AAL_SIZE); + mtk_ddp_write(cmdq_pkt, w << 16 | h, comp, DISP_AAL_OUTPUT_SIZE); + + mtk_ddp_write_mask(NULL, AAL_RELAY_MODE, comp, DISP_AAL_CFG, + AAL_RELAY_MODE | AAL_ENGINE_EN); } static void mtk_aal_start(struct mtk_ddp_comp *comp)
fix aal size config Fixes: 0664d1392c26 (drm/mediatek: Add AAL engine basic function) Signed-off-by: Yongqiang Niu <yongqiang.niu@mediatek.com> --- drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)