Messages in this thread Patch in this message | | | From | Sandy Huang <> | Subject | [PATCH 24/36] drm/hisilicon: use bpp instead of cpp for drm_format_info | Date | Mon, 23 Sep 2019 20:51:47 +0800 |
| |
cpp[BytePerPlane] can't describe the 10bit data format correctly, So we use bpp[BitPerPlane] to instead cpp.
Signed-off-by: Sandy Huang <hjc@rock-chips.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c index cc4c417..6bfb327 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c @@ -122,11 +122,11 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane, writel(gpu_addr, priv->mmio + HIBMC_CRT_FB_ADDRESS); - reg = state->fb->width * (state->fb->format->cpp[0]); + reg = state->fb->width * (state->fb->format->bpp[0] / 8); /* now line_pad is 16 */ reg = PADDING(16, reg); - line_l = state->fb->width * state->fb->format->cpp[0]; + line_l = state->fb->width * state->fb->format->bpp[0] / 8; line_l = PADDING(16, line_l); writel(HIBMC_FIELD(HIBMC_CRT_FB_WIDTH_WIDTH, reg) | HIBMC_FIELD(HIBMC_CRT_FB_WIDTH_OFFS, line_l), @@ -136,7 +136,7 @@ static void hibmc_plane_atomic_update(struct drm_plane *plane, reg = readl(priv->mmio + HIBMC_CRT_DISP_CTL); reg &= ~HIBMC_CRT_DISP_CTL_FORMAT_MASK; reg |= HIBMC_FIELD(HIBMC_CRT_DISP_CTL_FORMAT, - state->fb->format->cpp[0] * 8 / 16); + state->fb->format->bpp[0] / 16); writel(reg, priv->mmio + HIBMC_CRT_DISP_CTL); } -- 2.7.4
| |