Use bpp conversion helpers for consistency and to reduce the reliance on the specially crafted VIDEO_BPP* enum values. No functional change is made.
Signed-off-by: Reza Kurniawan <[email protected]> --- cmd/bdinfo.c | 2 +- drivers/video/atmel_hlcdfb.c | 2 +- drivers/video/imx/mxc_ipuv3_fb.c | 2 +- drivers/video/meson/meson_vpu.c | 4 ++-- drivers/video/mvebu_lcd.c | 2 +- drivers/video/sunxi/sunxi_de2.c | 2 +- drivers/video/tegra/dc.c | 4 ++-- drivers/video/tegra/tegra124/display.c | 2 +- drivers/video/ti/tilcdc.c | 4 ++-- drivers/video/tidss/tidss_drv.c | 4 ++-- test/cmd/bdinfo.c | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/cmd/bdinfo.c b/cmd/bdinfo.c index bf1eca759..37981764b 100644 --- a/cmd/bdinfo.c +++ b/cmd/bdinfo.c @@ -114,7 +114,7 @@ static void show_video_info(void) plat->copy_size); } printf("%-12s= %dx%dx%d\n", "FB size", upriv->xsize, - upriv->ysize, 1 << upriv->bpix); + upriv->ysize, VNBITS(upriv->bpix)); } } } diff --git a/drivers/video/atmel_hlcdfb.c b/drivers/video/atmel_hlcdfb.c index 89bc0eeb6..8a0096cec 100644 --- a/drivers/video/atmel_hlcdfb.c +++ b/drivers/video/atmel_hlcdfb.c @@ -315,7 +315,7 @@ static int atmel_hlcdc_bind(struct udevice *dev) struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * - (1 << LCD_MAX_LOG2_BPP) / 8; + VNBYTES(LCD_MAX_LOG2_BPP); debug("%s: Frame buffer size %x\n", __func__, uc_plat->size); diff --git a/drivers/video/imx/mxc_ipuv3_fb.c b/drivers/video/imx/mxc_ipuv3_fb.c index 3a327b9e9..447644f5b 100644 --- a/drivers/video/imx/mxc_ipuv3_fb.c +++ b/drivers/video/imx/mxc_ipuv3_fb.c @@ -654,7 +654,7 @@ static int ipuv3_video_bind(struct udevice *dev) { struct video_uc_plat *plat = dev_get_uclass_plat(dev); - plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * (1 << VIDEO_BPP32) / 8; + plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * VNBYTES(VIDEO_BPP32); return 0; } diff --git a/drivers/video/meson/meson_vpu.c b/drivers/video/meson/meson_vpu.c index a686faf9f..21ac60749 100644 --- a/drivers/video/meson/meson_vpu.c +++ b/drivers/video/meson/meson_vpu.c @@ -79,7 +79,7 @@ cvbs: /* Move the framebuffer to the end of addressable ram */ meson_fb.fb_size = ALIGN(meson_fb.xsize * meson_fb.ysize * - ((1 << VPU_MAX_LOG2_BPP) / 8) + + VNBYTES(VPU_MAX_LOG2_BPP) + MESON_VPU_OVERSCAN, EFI_PAGE_SIZE); meson_fb.base = gd->dram[0].start + gd->dram[0].size - meson_fb.fb_size; @@ -141,7 +141,7 @@ static int meson_vpu_bind(struct udevice *dev) struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = VPU_MAX_WIDTH * VPU_MAX_HEIGHT * - (1 << VPU_MAX_LOG2_BPP) / 8; + VNBYTES(VPU_MAX_LOG2_BPP); return 0; } diff --git a/drivers/video/mvebu_lcd.c b/drivers/video/mvebu_lcd.c index 9f1ea9c35..234b27c90 100644 --- a/drivers/video/mvebu_lcd.c +++ b/drivers/video/mvebu_lcd.c @@ -576,7 +576,7 @@ static int mvebu_video_bind(struct udevice *dev) struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * - (1 << LCD_MAX_LOG2_BPP) / 8; + VNBYTES(LCD_MAX_LOG2_BPP); return 0; } diff --git a/drivers/video/sunxi/sunxi_de2.c b/drivers/video/sunxi/sunxi_de2.c index ab36ee159..9039fb2e6 100644 --- a/drivers/video/sunxi/sunxi_de2.c +++ b/drivers/video/sunxi/sunxi_de2.c @@ -279,7 +279,7 @@ static int sunxi_de2_bind(struct udevice *dev) struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * - (1 << LCD_MAX_LOG2_BPP) / 8; + VNBYTES(LCD_MAX_LOG2_BPP); return 0; } diff --git a/drivers/video/tegra/dc.c b/drivers/video/tegra/dc.c index ced497188..6aca106f1 100644 --- a/drivers/video/tegra/dc.c +++ b/drivers/video/tegra/dc.c @@ -278,7 +278,7 @@ static int setup_window(struct tegra_lcd_priv *priv, win->out_w = priv->width; win->out_h = priv->height; win->phys_addr = priv->frame_buffer; - win->stride = priv->width * (1 << priv->log2_bpp) / 8; + win->stride = priv->width * VNBYTES(priv->log2_bpp); log_debug("%s: depth = %d\n", __func__, priv->log2_bpp); @@ -646,7 +646,7 @@ static int tegra_lcd_bind(struct udevice *dev) struct video_uc_plat *plat = dev_get_uclass_plat(dev); plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * - (1 << LCD_MAX_LOG2_BPP) / 8; + VNBYTES(LCD_MAX_LOG2_BPP); return dm_scan_fdt_dev(dev); } diff --git a/drivers/video/tegra/tegra124/display.c b/drivers/video/tegra/tegra124/display.c index abe31e27d..fd2b92c5e 100644 --- a/drivers/video/tegra/tegra124/display.c +++ b/drivers/video/tegra/tegra124/display.c @@ -484,7 +484,7 @@ static int tegra124_lcd_bind(struct udevice *dev) struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * - (1 << VIDEO_BPP16) / 8; + VNBYTES(VIDEO_BPP16); debug("%s: Frame buffer size %x\n", __func__, uc_plat->size); return 0; diff --git a/drivers/video/ti/tilcdc.c b/drivers/video/ti/tilcdc.c index b498e8186..6b2e591ce 100644 --- a/drivers/video/ti/tilcdc.c +++ b/drivers/video/ti/tilcdc.c @@ -430,8 +430,8 @@ static int tilcdc_bind(struct udevice *dev) { struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); - uc_plat->size = ((LCDC_MAX_WIDTH * LCDC_MAX_HEIGHT * - (1 << LCDC_MAX_LOG2_BPP)) >> 3) + 0x20; + uc_plat->size = LCDC_MAX_WIDTH * LCDC_MAX_HEIGHT * + VNBYTES(LCDC_MAX_LOG2_BPP) + 0x20; dev_dbg(dev, "frame buffer size 0x%x\n", uc_plat->size); return 0; diff --git a/drivers/video/tidss/tidss_drv.c b/drivers/video/tidss/tidss_drv.c index c231fd034..7c8bfe418 100644 --- a/drivers/video/tidss/tidss_drv.c +++ b/drivers/video/tidss/tidss_drv.c @@ -986,8 +986,8 @@ static int tidss_drv_bind(struct udevice *dev) { struct video_uc_plat *uc_plat = dev_get_uclass_plat(dev); - uc_plat->size = ((LCD_MAX_WIDTH * LCD_MAX_HEIGHT * - (1 << LCD_MAX_LOG2_BPP)) >> 3) + 0x20; + uc_plat->size = LCD_MAX_WIDTH * LCD_MAX_HEIGHT * + VNBYTES(LCD_MAX_LOG2_BPP) + 0x20; return 0; } diff --git a/test/cmd/bdinfo.c b/test/cmd/bdinfo.c index 7b7fb0894..f53665446 100644 --- a/test/cmd/bdinfo.c +++ b/test/cmd/bdinfo.c @@ -91,7 +91,7 @@ static int test_video_info(struct unit_test_state *uts) } ut_assert_nextline("%-12s= %dx%dx%d", "FB size", upriv->xsize, upriv->ysize, - 1 << upriv->bpix); + VNBITS(upriv->bpix)); } } --- base-commit: ed869863c7e2aca50d57a05d843830dd843138c4 change-id: 20261006-bpp-helpers-d8d63b120d8a Best regards, -- Reza Kurniawan <[email protected]>
