| Message ID | 20220912013006.27541-4-jason-jh.lin@mediatek.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Add gamma lut support for mt8195 | expand |
Hi, Jason: On Mon, 2022-09-12 at 09:30 +0800, Jason-JH.Lin wrote: > Adjust the parameters in mtk_drm_gamma_set_common() > - add (struct device *dev) to get lut_diff from gamma's driver data > - remove (bool lut_diff) and use false as default value in the > function > > Fixes: 051524cbe62d ("FROMGIT: drm/mediatek: Add lut diff flag for > new gamma hardware support") > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> > --- > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 2 +- > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +- > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 13 +++++++------ > 3 files changed, 9 insertions(+), 8 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > index 0f9d7efb61d7..6517e0a5a7d8 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > @@ -66,7 +66,7 @@ void mtk_aal_gamma_set(struct device *dev, struct > drm_crtc_state *state) > struct mtk_disp_aal *aal = dev_get_drvdata(dev); > > if (aal->data && aal->data->has_gamma) > - mtk_gamma_set_common(aal->regs, state, false); > + mtk_gamma_set_common(NULL, aal->regs, state); > } > > void mtk_aal_start(struct device *dev) > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > index 33e61a136bbc..a83e5fbc8724 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > @@ -52,7 +52,7 @@ void mtk_gamma_config(struct device *dev, unsigned > int w, > unsigned int h, unsigned int vrefresh, > unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > void mtk_gamma_set(struct device *dev, struct drm_crtc_state > *state); > -void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state > *state, bool lut_diff); > +void mtk_gamma_set_common(struct device *dev, void __iomem *regs, > struct drm_crtc_state *state); This function is called by both aal and gamma driver, so I would like to pass struct device dev because priv data of aal and gamma are different. Make this function command for both aal and gamma driver. Regards, CK > void mtk_gamma_start(struct device *dev); > void mtk_gamma_stop(struct device *dev); > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > index bbd558a036ec..f54a6a618348 100644 > --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > @@ -54,14 +54,19 @@ void mtk_gamma_clk_disable(struct device *dev) > clk_disable_unprepare(gamma->clk); > } > > -void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state > *state, bool lut_diff) > +void mtk_gamma_set_common(struct device *dev, void __iomem *regs, > struct drm_crtc_state *state) > { > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > + bool lut_diff = false; > unsigned int i, reg; > struct drm_color_lut *lut; > void __iomem *lut_base; > u32 word; > u32 diff[3] = {0}; > > + if (gamma && gamma->data) > + lut_diff = gamma->data->lut_diff; > + > if (state->gamma_lut) { > reg = readl(regs + DISP_GAMMA_CFG); > reg = reg | GAMMA_LUT_EN; > @@ -91,12 +96,8 @@ void mtk_gamma_set_common(void __iomem *regs, > struct drm_crtc_state *state, bool > void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state) > { > struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > - bool lut_diff = false; > - > - if (gamma->data) > - lut_diff = gamma->data->lut_diff; > > - mtk_gamma_set_common(gamma->regs, state, lut_diff); > + mtk_gamma_set_common(dev, gamma->regs, state); > } > > void mtk_gamma_config(struct device *dev, unsigned int w,
Hi CK, Thanks for the reviews. On Mon, 2022-09-12 at 10:48 +0800, CK Hu wrote: > Hi, Jason: > > On Mon, 2022-09-12 at 09:30 +0800, Jason-JH.Lin wrote: > > Adjust the parameters in mtk_drm_gamma_set_common() > > - add (struct device *dev) to get lut_diff from gamma's driver > > data > > - remove (bool lut_diff) and use false as default value in the > > function > > > > Fixes: 051524cbe62d ("FROMGIT: drm/mediatek: Add lut diff flag for > > new gamma hardware support") > > Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> > > --- > > drivers/gpu/drm/mediatek/mtk_disp_aal.c | 2 +- > > drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +- > > drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 13 +++++++------ > > 3 files changed, 9 insertions(+), 8 deletions(-) > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > index 0f9d7efb61d7..6517e0a5a7d8 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c > > @@ -66,7 +66,7 @@ void mtk_aal_gamma_set(struct device *dev, struct > > drm_crtc_state *state) > > struct mtk_disp_aal *aal = dev_get_drvdata(dev); > > > > if (aal->data && aal->data->has_gamma) > > - mtk_gamma_set_common(aal->regs, state, false); > > + mtk_gamma_set_common(NULL, aal->regs, state); > > } > > > > void mtk_aal_start(struct device *dev) > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > index 33e61a136bbc..a83e5fbc8724 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h > > @@ -52,7 +52,7 @@ void mtk_gamma_config(struct device *dev, > > unsigned > > int w, > > unsigned int h, unsigned int vrefresh, > > unsigned int bpc, struct cmdq_pkt *cmdq_pkt); > > void mtk_gamma_set(struct device *dev, struct drm_crtc_state > > *state); > > -void mtk_gamma_set_common(void __iomem *regs, struct > > drm_crtc_state > > *state, bool lut_diff); > > +void mtk_gamma_set_common(struct device *dev, void __iomem *regs, > > struct drm_crtc_state *state); > > This function is called by both aal and gamma driver, so I would like > to pass struct device dev because priv data of aal and gamma are > different. Make this function command for both aal and gamma driver. > > Regards, > CK > I think handle the priv data of AAL in the gamma_set_common function will make this function coupling with AAL. So I'll drop this patch and move the gamma priv data to gamma_set and just pass the necessary parameters for gamma_set_common. Regards, Jason-JH.Lin > > void mtk_gamma_start(struct device *dev); > > void mtk_gamma_stop(struct device *dev); > > > > diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > index bbd558a036ec..f54a6a618348 100644 > > --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c > > @@ -54,14 +54,19 @@ void mtk_gamma_clk_disable(struct device *dev) > > clk_disable_unprepare(gamma->clk); > > } > > > > -void mtk_gamma_set_common(void __iomem *regs, struct > > drm_crtc_state > > *state, bool lut_diff) > > +void mtk_gamma_set_common(struct device *dev, void __iomem *regs, > > struct drm_crtc_state *state) > > { > > + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > > + bool lut_diff = false; > > unsigned int i, reg; > > struct drm_color_lut *lut; > > void __iomem *lut_base; > > u32 word; > > u32 diff[3] = {0}; > > > > + if (gamma && gamma->data) > > + lut_diff = gamma->data->lut_diff; > > + > > if (state->gamma_lut) { > > reg = readl(regs + DISP_GAMMA_CFG); > > reg = reg | GAMMA_LUT_EN; > > @@ -91,12 +96,8 @@ void mtk_gamma_set_common(void __iomem *regs, > > struct drm_crtc_state *state, bool > > void mtk_gamma_set(struct device *dev, struct drm_crtc_state > > *state) > > { > > struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); > > - bool lut_diff = false; > > - > > - if (gamma->data) > > - lut_diff = gamma->data->lut_diff; > > > > - mtk_gamma_set_common(gamma->regs, state, lut_diff); > > + mtk_gamma_set_common(dev, gamma->regs, state); > > } > > > > void mtk_gamma_config(struct device *dev, unsigned int w, > >
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c b/drivers/gpu/drm/mediatek/mtk_disp_aal.c index 0f9d7efb61d7..6517e0a5a7d8 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c @@ -66,7 +66,7 @@ void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state) struct mtk_disp_aal *aal = dev_get_drvdata(dev); if (aal->data && aal->data->has_gamma) - mtk_gamma_set_common(aal->regs, state, false); + mtk_gamma_set_common(NULL, aal->regs, state); } void mtk_aal_start(struct device *dev) diff --git a/drivers/gpu/drm/mediatek/mtk_disp_drv.h b/drivers/gpu/drm/mediatek/mtk_disp_drv.h index 33e61a136bbc..a83e5fbc8724 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_drv.h +++ b/drivers/gpu/drm/mediatek/mtk_disp_drv.h @@ -52,7 +52,7 @@ void mtk_gamma_config(struct device *dev, unsigned int w, unsigned int h, unsigned int vrefresh, unsigned int bpc, struct cmdq_pkt *cmdq_pkt); void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state); -void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state, bool lut_diff); +void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state); void mtk_gamma_start(struct device *dev); void mtk_gamma_stop(struct device *dev); diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c index bbd558a036ec..f54a6a618348 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c @@ -54,14 +54,19 @@ void mtk_gamma_clk_disable(struct device *dev) clk_disable_unprepare(gamma->clk); } -void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state, bool lut_diff) +void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state) { + struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); + bool lut_diff = false; unsigned int i, reg; struct drm_color_lut *lut; void __iomem *lut_base; u32 word; u32 diff[3] = {0}; + if (gamma && gamma->data) + lut_diff = gamma->data->lut_diff; + if (state->gamma_lut) { reg = readl(regs + DISP_GAMMA_CFG); reg = reg | GAMMA_LUT_EN; @@ -91,12 +96,8 @@ void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state, bool void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state) { struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); - bool lut_diff = false; - - if (gamma->data) - lut_diff = gamma->data->lut_diff; - mtk_gamma_set_common(gamma->regs, state, lut_diff); + mtk_gamma_set_common(dev, gamma->regs, state); } void mtk_gamma_config(struct device *dev, unsigned int w,
Adjust the parameters in mtk_drm_gamma_set_common() - add (struct device *dev) to get lut_diff from gamma's driver data - remove (bool lut_diff) and use false as default value in the function Fixes: 051524cbe62d ("FROMGIT: drm/mediatek: Add lut diff flag for new gamma hardware support") Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> --- drivers/gpu/drm/mediatek/mtk_disp_aal.c | 2 +- drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +- drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 13 +++++++------ 3 files changed, 9 insertions(+), 8 deletions(-)