Skip to content

Commit 1c5a880

Browse files
Jason-JH.LinChun-Kuang Hu
authored andcommitted
drm/mediatek: gamma: Adjust mtk_drm_gamma_set_common parameters
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 Signed-off-by: Jason-JH.Lin <jason-jh.lin@mediatek.com> Reviewed-by: Alexandre Mergnat <amergnat@baylibre.com> Reviewed-by: CK Hu <ck.hu@mediatek.com> Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com> Link: https://patchwork.kernel.org/project/dri-devel/patch/20231012095736.100784-2-angelogioacchino.delregno@collabora.com/ Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
1 parent 53412dc commit 1c5a880

3 files changed

Lines changed: 14 additions & 8 deletions

File tree

drivers/gpu/drm/mediatek/mtk_disp_aal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void mtk_aal_gamma_set(struct device *dev, struct drm_crtc_state *state)
6161
struct mtk_disp_aal *aal = dev_get_drvdata(dev);
6262

6363
if (aal->data && aal->data->has_gamma)
64-
mtk_gamma_set_common(aal->regs, state, false);
64+
mtk_gamma_set_common(NULL, aal->regs, state);
6565
}
6666

6767
void mtk_aal_start(struct device *dev)

drivers/gpu/drm/mediatek/mtk_disp_drv.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ void mtk_gamma_config(struct device *dev, unsigned int w,
5656
unsigned int h, unsigned int vrefresh,
5757
unsigned int bpc, struct cmdq_pkt *cmdq_pkt);
5858
void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state);
59-
void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state, bool lut_diff);
59+
void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state);
6060
void mtk_gamma_start(struct device *dev);
6161
void mtk_gamma_stop(struct device *dev);
6262

drivers/gpu/drm/mediatek/mtk_disp_gamma.c

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,14 +54,24 @@ void mtk_gamma_clk_disable(struct device *dev)
5454
clk_disable_unprepare(gamma->clk);
5555
}
5656

57-
void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state, bool lut_diff)
57+
void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state)
5858
{
59+
struct mtk_disp_gamma *gamma;
5960
unsigned int i, reg;
6061
struct drm_color_lut *lut;
6162
void __iomem *lut_base;
63+
bool lut_diff;
6264
u32 word;
6365
u32 diff[3] = {0};
6466

67+
/* If we're called from AAL, dev is NULL */
68+
gamma = dev ? dev_get_drvdata(dev) : NULL;
69+
70+
if (gamma && gamma->data)
71+
lut_diff = gamma->data->lut_diff;
72+
else
73+
lut_diff = false;
74+
6575
if (state->gamma_lut) {
6676
reg = readl(regs + DISP_GAMMA_CFG);
6777
reg = reg | GAMMA_LUT_EN;
@@ -91,12 +101,8 @@ void mtk_gamma_set_common(void __iomem *regs, struct drm_crtc_state *state, bool
91101
void mtk_gamma_set(struct device *dev, struct drm_crtc_state *state)
92102
{
93103
struct mtk_disp_gamma *gamma = dev_get_drvdata(dev);
94-
bool lut_diff = false;
95-
96-
if (gamma->data)
97-
lut_diff = gamma->data->lut_diff;
98104

99-
mtk_gamma_set_common(gamma->regs, state, lut_diff);
105+
mtk_gamma_set_common(dev, gamma->regs, state);
100106
}
101107

102108
void mtk_gamma_config(struct device *dev, unsigned int w,

0 commit comments

Comments
 (0)