Message ID | 20230502081650.25947-7-angelogioacchino.delregno@collabora.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | MediaTek DDP GAMMA - 12-bit LUT support | expand |
Hi AngeloGioacchino, kernel test robot noticed the following build errors: [auto build test ERROR on drm-misc/drm-misc-next] [also build test ERROR on drm/drm-next drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip linus/master v6.3 next-20230428] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/AngeloGioacchino-Del-Regno/drm-mediatek-gamma-Adjust-mtk_drm_gamma_set_common-parameters/20230502-161758 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/20230502081650.25947-7-angelogioacchino.delregno%40collabora.com patch subject: [PATCH 06/11] drm/mediatek: gamma: Use bitfield macros config: arm-randconfig-r006-20230501 (https://download.01.org/0day-ci/archive/20230502/202305022108.9tmu3iyy-lkp@intel.com/config) compiler: clang version 17.0.0 (https://github.com/llvm/llvm-project b1465cd49efcbc114a75220b153f5a055ce7911f) reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # install arm cross compiling tool for clang build # apt-get install binutils-arm-linux-gnueabi # https://github.com/intel-lab-lkp/linux/commit/171ab0605a0c2b44167dc1339b29dc80c2ac7d4d git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review AngeloGioacchino-Del-Regno/drm-mediatek-gamma-Adjust-mtk_drm_gamma_set_common-parameters/20230502-161758 git checkout 171ab0605a0c2b44167dc1339b29dc80c2ac7d4d # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=clang make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/gpu/drm/mediatek/ If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <lkp@intel.com> | Link: https://lore.kernel.org/oe-kbuild-all/202305022108.9tmu3iyy-lkp@intel.com/ All errors (new ones prefixed by >>): >> drivers/gpu/drm/mediatek/mtk_disp_gamma.c:111:11: error: call to undeclared function 'FIELD_PREP'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, hwlut.red); ^ drivers/gpu/drm/mediatek/mtk_disp_gamma.c:124:11: error: call to undeclared function 'FIELD_PREP'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, diff.red); ^ drivers/gpu/drm/mediatek/mtk_disp_gamma.c:132:13: error: call to undeclared function 'FIELD_PREP'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] cfg_val |= FIELD_PREP(GAMMA_LUT_EN, 1); ^ drivers/gpu/drm/mediatek/mtk_disp_gamma.c:151:7: error: call to undeclared function 'FIELD_PREP'; ISO C99 and later do not support implicit function declarations [-Wimplicit-function-declaration] sz = FIELD_PREP(DISP_GAMMA_SIZE_HSIZE, w); ^ 4 errors generated. vim +/FIELD_PREP +111 drivers/gpu/drm/mediatek/mtk_disp_gamma.c 77 78 void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state) 79 { 80 struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); 81 unsigned int i; 82 struct drm_color_lut *lut; 83 void __iomem *lut_base; 84 bool lut_diff; 85 u16 lut_size; 86 u32 cfg_val, word; 87 88 /* If there's no gamma lut there's nothing to do here. */ 89 if (!state->gamma_lut) 90 return; 91 92 if (gamma && gamma->data) { 93 lut_diff = gamma->data->lut_diff; 94 lut_size = gamma->data->lut_size; 95 } else { 96 lut_diff = false; 97 lut_size = LUT_SIZE_DEFAULT; 98 } 99 100 cfg_val = readl(regs + DISP_GAMMA_CFG); 101 lut_base = regs + DISP_GAMMA_LUT; 102 lut = (struct drm_color_lut *)state->gamma_lut->data; 103 for (i = 0; i < lut_size; i++) { 104 struct drm_color_lut diff, hwlut; 105 106 hwlut.red = drm_color_lut_extract(lut[i].red, LUT_BITS_DEFAULT); 107 hwlut.green = drm_color_lut_extract(lut[i].green, LUT_BITS_DEFAULT); 108 hwlut.red = drm_color_lut_extract(lut[i].blue, LUT_BITS_DEFAULT); 109 110 if (!lut_diff || (i % 2 == 0)) { > 111 word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, hwlut.red); 112 word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, hwlut.green); 113 word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, hwlut.blue); 114 } else { 115 diff.red = lut[i].red - lut[i - 1].red; 116 diff.red = drm_color_lut_extract(diff.red, LUT_BITS_DEFAULT); 117 118 diff.green = lut[i].green - lut[i - 1].green; 119 diff.green = drm_color_lut_extract(diff.green, LUT_BITS_DEFAULT); 120 121 diff.blue = lut[i].blue - lut[i - 1].blue; 122 diff.blue = drm_color_lut_extract(diff.blue, LUT_BITS_DEFAULT); 123 124 word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, diff.red); 125 word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, diff.green); 126 word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, diff.blue); 127 } 128 writel(word, (lut_base + i * 4)); 129 } 130 131 /* Enable the gamma table */ 132 cfg_val |= FIELD_PREP(GAMMA_LUT_EN, 1); 133 134 writel(cfg_val, regs + DISP_GAMMA_CFG); 135 } 136
Hi AngeloGioacchino, kernel test robot noticed the following build errors: [auto build test ERROR on drm-misc/drm-misc-next] [also build test ERROR on drm/drm-next drm-exynos/exynos-drm-next drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip linus/master v6.3 next-20230428] [If your patch is applied to the wrong git tree, kindly drop us a note. And when submitting patch, we suggest to use '--base' as documented in https://git-scm.com/docs/git-format-patch#_base_tree_information] url: https://github.com/intel-lab-lkp/linux/commits/AngeloGioacchino-Del-Regno/drm-mediatek-gamma-Adjust-mtk_drm_gamma_set_common-parameters/20230502-161758 base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next patch link: https://lore.kernel.org/r/20230502081650.25947-7-angelogioacchino.delregno%40collabora.com patch subject: [PATCH 06/11] drm/mediatek: gamma: Use bitfield macros config: arm-allyesconfig (https://download.01.org/0day-ci/archive/20230503/202305030043.iaNtiOtW-lkp@intel.com/config) compiler: arm-linux-gnueabi-gcc (GCC) 12.1.0 reproduce (this is a W=1 build): wget https://raw.githubusercontent.com/intel/lkp-tests/master/sbin/make.cross -O ~/bin/make.cross chmod +x ~/bin/make.cross # https://github.com/intel-lab-lkp/linux/commit/171ab0605a0c2b44167dc1339b29dc80c2ac7d4d git remote add linux-review https://github.com/intel-lab-lkp/linux git fetch --no-tags linux-review AngeloGioacchino-Del-Regno/drm-mediatek-gamma-Adjust-mtk_drm_gamma_set_common-parameters/20230502-161758 git checkout 171ab0605a0c2b44167dc1339b29dc80c2ac7d4d # save the config file mkdir build_dir && cp config build_dir/.config COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arm olddefconfig COMPILER_INSTALL_PATH=$HOME/0day COMPILER=gcc-12.1.0 make.cross W=1 O=build_dir ARCH=arm SHELL=/bin/bash drivers/gpu/ If you fix the issue, kindly add following tag where applicable | Reported-by: kernel test robot <lkp@intel.com> | Link: https://lore.kernel.org/oe-kbuild-all/202305030043.iaNtiOtW-lkp@intel.com/ All errors (new ones prefixed by >>): drivers/gpu/drm/mediatek/mtk_disp_gamma.c: In function 'mtk_gamma_set_common': >> drivers/gpu/drm/mediatek/mtk_disp_gamma.c:111:32: error: implicit declaration of function 'FIELD_PREP' [-Werror=implicit-function-declaration] 111 | word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, hwlut.red); | ^~~~~~~~~~ cc1: some warnings being treated as errors vim +/FIELD_PREP +111 drivers/gpu/drm/mediatek/mtk_disp_gamma.c 77 78 void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crtc_state *state) 79 { 80 struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); 81 unsigned int i; 82 struct drm_color_lut *lut; 83 void __iomem *lut_base; 84 bool lut_diff; 85 u16 lut_size; 86 u32 cfg_val, word; 87 88 /* If there's no gamma lut there's nothing to do here. */ 89 if (!state->gamma_lut) 90 return; 91 92 if (gamma && gamma->data) { 93 lut_diff = gamma->data->lut_diff; 94 lut_size = gamma->data->lut_size; 95 } else { 96 lut_diff = false; 97 lut_size = LUT_SIZE_DEFAULT; 98 } 99 100 cfg_val = readl(regs + DISP_GAMMA_CFG); 101 lut_base = regs + DISP_GAMMA_LUT; 102 lut = (struct drm_color_lut *)state->gamma_lut->data; 103 for (i = 0; i < lut_size; i++) { 104 struct drm_color_lut diff, hwlut; 105 106 hwlut.red = drm_color_lut_extract(lut[i].red, LUT_BITS_DEFAULT); 107 hwlut.green = drm_color_lut_extract(lut[i].green, LUT_BITS_DEFAULT); 108 hwlut.red = drm_color_lut_extract(lut[i].blue, LUT_BITS_DEFAULT); 109 110 if (!lut_diff || (i % 2 == 0)) { > 111 word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, hwlut.red); 112 word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, hwlut.green); 113 word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, hwlut.blue); 114 } else { 115 diff.red = lut[i].red - lut[i - 1].red; 116 diff.red = drm_color_lut_extract(diff.red, LUT_BITS_DEFAULT); 117 118 diff.green = lut[i].green - lut[i - 1].green; 119 diff.green = drm_color_lut_extract(diff.green, LUT_BITS_DEFAULT); 120 121 diff.blue = lut[i].blue - lut[i - 1].blue; 122 diff.blue = drm_color_lut_extract(diff.blue, LUT_BITS_DEFAULT); 123 124 word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, diff.red); 125 word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, diff.green); 126 word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, diff.blue); 127 } 128 writel(word, (lut_base + i * 4)); 129 } 130 131 /* Enable the gamma table */ 132 cfg_val |= FIELD_PREP(GAMMA_LUT_EN, 1); 133 134 writel(cfg_val, regs + DISP_GAMMA_CFG); 135 } 136
diff --git a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c index 97b34963ef73..ef0243034663 100644 --- a/drivers/gpu/drm/mediatek/mtk_disp_gamma.c +++ b/drivers/gpu/drm/mediatek/mtk_disp_gamma.c @@ -22,9 +22,16 @@ #define GAMMA_LUT_EN BIT(1) #define GAMMA_DITHERING BIT(2) #define DISP_GAMMA_SIZE 0x0030 +#define DISP_GAMMA_SIZE_HSIZE GENMASK(28, 16) +#define DISP_GAMMA_SIZE_VSIZE GENMASK(12, 0) #define DISP_GAMMA_LUT 0x0700 +#define DISP_GAMMA_LUT_10BIT_R GENMASK(29, 20) +#define DISP_GAMMA_LUT_10BIT_G GENMASK(19, 10) +#define DISP_GAMMA_LUT_10BIT_B GENMASK(9, 0) + #define LUT_10BIT_MASK 0x03ff +#define LUT_BITS_DEFAULT 10 #define LUT_SIZE_DEFAULT 512 /* for setting gamma lut from AAL */ struct mtk_disp_gamma_data { @@ -96,33 +103,33 @@ void mtk_gamma_set_common(struct device *dev, void __iomem *regs, struct drm_crt for (i = 0; i < lut_size; i++) { struct drm_color_lut diff, hwlut; - hwlut.red = drm_color_lut_extract(lut[i].red, 10); - hwlut.green = drm_color_lut_extract(lut[i].green, 10); - hwlut.red = drm_color_lut_extract(lut[i].blue, 10); + hwlut.red = drm_color_lut_extract(lut[i].red, LUT_BITS_DEFAULT); + hwlut.green = drm_color_lut_extract(lut[i].green, LUT_BITS_DEFAULT); + hwlut.red = drm_color_lut_extract(lut[i].blue, LUT_BITS_DEFAULT); if (!lut_diff || (i % 2 == 0)) { - word = hwlut.red << 20 + - hwlut.green << 10 + - hwlut.red; + word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, hwlut.red); + word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, hwlut.green); + word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, hwlut.blue); } else { diff.red = lut[i].red - lut[i - 1].red; - diff.red = drm_color_lut_extract(diff.red, 10); + diff.red = drm_color_lut_extract(diff.red, LUT_BITS_DEFAULT); diff.green = lut[i].green - lut[i - 1].green; - diff.green = drm_color_lut_extract(diff.green, 10); + diff.green = drm_color_lut_extract(diff.green, LUT_BITS_DEFAULT); diff.blue = lut[i].blue - lut[i - 1].blue; - diff.blue = drm_color_lut_extract(diff.blue, 10); + diff.blue = drm_color_lut_extract(diff.blue, LUT_BITS_DEFAULT); - word = diff.blue << 20 + - diff.green << 10 + - diff.red; + word = FIELD_PREP(DISP_GAMMA_LUT_10BIT_R, diff.red); + word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_G, diff.green); + word |= FIELD_PREP(DISP_GAMMA_LUT_10BIT_B, diff.blue); } writel(word, (lut_base + i * 4)); } /* Enable the gamma table */ - cfg_val = cfg_val | GAMMA_LUT_EN; + cfg_val |= FIELD_PREP(GAMMA_LUT_EN, 1); writel(cfg_val, regs + DISP_GAMMA_CFG); } @@ -139,9 +146,12 @@ void mtk_gamma_config(struct device *dev, unsigned int w, unsigned int bpc, struct cmdq_pkt *cmdq_pkt) { struct mtk_disp_gamma *gamma = dev_get_drvdata(dev); + u32 sz; + + sz = FIELD_PREP(DISP_GAMMA_SIZE_HSIZE, w); + sz |= FIELD_PREP(DISP_GAMMA_SIZE_VSIZE, h); - mtk_ddp_write(cmdq_pkt, h << 16 | w, &gamma->cmdq_reg, gamma->regs, - DISP_GAMMA_SIZE); + mtk_ddp_write(cmdq_pkt, sz, &gamma->cmdq_reg, gamma->regs, DISP_GAMMA_SIZE); if (gamma->data && gamma->data->has_dither) mtk_dither_set_common(gamma->regs, &gamma->cmdq_reg, bpc, DISP_GAMMA_CFG, GAMMA_DITHERING, cmdq_pkt);
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.delregno@collabora.com> --- drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 40 ++++++++++++++--------- 1 file changed, 25 insertions(+), 15 deletions(-)