[PATCH v9 07/16] drm/mediatek: aal: Use bitfield macros

[AngeloGioacchino Del Regno]

Make the code more robust and improve readability by using bitfield
macros instead of open coding bit operations.

Signed-off-by: AngeloGioacchino Del Regno 
<angelogioacchino.delre...@collabora.com>
---
 drivers/gpu/drm/mediatek/mtk_disp_aal.c | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_disp_aal.c 
b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
index e2e4155faf01..05790b444e17 100644
--- a/drivers/gpu/drm/mediatek/mtk_disp_aal.c
+++ b/drivers/gpu/drm/mediatek/mtk_disp_aal.c
@@ -18,6 +18,8 @@
 #define DISP_AAL_EN                            0x0000
 #define AAL_EN                                         BIT(0)
 #define DISP_AAL_SIZE                          0x0030
+#define DISP_AAL_SIZE_HSIZE                            GENMASK(28, 16)
+#define DISP_AAL_SIZE_VSIZE                            GENMASK(12, 0)
 #define DISP_AAL_OUTPUT_SIZE                   0x04d8
 #define DISP_AAL_LUT_SIZE                      512
 
@@ -56,9 +58,13 @@ void mtk_aal_config(struct device *dev, unsigned int w,
                           unsigned int bpc, struct cmdq_pkt *cmdq_pkt)
 {
        struct mtk_disp_aal *aal = dev_get_drvdata(dev);
+       u32 sz;
 
-       mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, 
DISP_AAL_SIZE);
-       mtk_ddp_write(cmdq_pkt, w << 16 | h, &aal->cmdq_reg, aal->regs, 
DISP_AAL_OUTPUT_SIZE);
+       sz = FIELD_PREP(DISP_GAMMA_SIZE_HSIZE, w);
+       sz |= FIELD_PREP(DISP_GAMMA_SIZE_VSIZE, h);
+
+       mtk_ddp_write(cmdq_pkt, sz, &aal->cmdq_reg, aal->regs, DISP_AAL_SIZE);
+       mtk_ddp_write(cmdq_pkt, sz, &aal->cmdq_reg, aal->regs, 
DISP_AAL_OUTPUT_SIZE);
 }
 
 /**
-- 
2.41.0