diff mbox series

[17/36] drm/zte: use bpp instead of cpp for drm_format_info

Message ID	1569242968-183093-2-git-send-email-hjc@rock-chips.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <SRS0=2CUb=XS=lists.freedesktop.org=dri-devel-bounces@kernel.org> DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7DD5B20820 From: Sandy Huang <hjc@rock-chips.com> To: dri-devel@lists.freedesktop.org, Shawn Guo <shawnguo@kernel.org>, David Airlie <airlied@linux.ie>, Daniel Vetter <daniel@ffwll.ch> Subject: [PATCH 17/36] drm/zte: use bpp instead of cpp for drm_format_info Date: Mon, 23 Sep 2019 20:49:09 +0800 Message-Id: <1569242968-183093-2-git-send-email-hjc@rock-chips.com> In-Reply-To: <1569242968-183093-1-git-send-email-hjc@rock-chips.com> References: <1569242968-183093-1-git-send-email-hjc@rock-chips.com> Precedence: list Cc: linux-kernel@vger.kernel.org MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Series	[01/36] drm/fourcc: Add 2 plane YCbCr 10bit format support \| expand [01/36] drm/fourcc: Add 2 plane YCbCr 10bit format support [02/36] drm/rockchip: use bpp instead of cpp for drm_format_info [03/36] drm/i915: use bpp instead of cpp for drm_format_info [04/36] drm: exynos: use bpp instead of cpp for drm_format_info [06/36] drm/amd: use bpp instead of cpp for drm_format_info [08/36] drm/msm: use bpp instead of cpp for drm_format_info [09/36] dm/vmwgfx: use bpp instead of cpp for drm_format_info [05/36] drm/sun4i: use bpp instead of cpp for drm_format_info [10/36] drm/arm: use bpp instead of cpp for drm_format_info [16/36] drm/tilcdc: use bpp instead of cpp for drm_format_info [17/36] drm/zte: use bpp instead of cpp for drm_format_info [18/36] drm/xen: use bpp instead of cpp for drm_format_info [19/36] drm/vkms: use bpp instead of cpp for drm_format_info [20/36] drm/ast: use bpp instead of cpp for drm_format_info [21/36] drm/vc4: use bpp instead of cpp for drm_format_info [22/36] drm/atmel-hlcdc: use bpp instead of cpp for drm_format_info [23/36] drm/cirrus: use bpp instead of cpp for drm_format_info [24/36] drm/hisilicon: use bpp instead of cpp for drm_format_info [25/36] drm/imx: use bpp instead of cpp for drm_format_info [26/36] drm/vboxvideo: use bpp instead of cpp for drm_format_info [27/36] drm/pl111: use bpp instead of cpp for drm_format_info [28/36] drm/qxl: use bpp instead of cpp for drm_format_info [29/36] drm/ingenic: use bpp instead of cpp for drm_format_info [30/36] drm/sti: use bpp instead of cpp for drm_format_info [31/36] drm/stm: use bpp instead of cpp for drm_format_info [32/36] drm/mcde: use bpp instead of cpp for drm_format_info [33/36] drm/mgag200: use bpp instead of cpp for drm_format_info [34/36] drm/tve200: use bpp instead of cpp for drm_format_info [35/36] drm/udl: use bpp instead of cpp for drm_format_info [36/36] drm/omapdrm: use bpp instead of cpp for drm_format_info

Commit Message

黄家钗 Sept. 23, 2019, 12:49 p.m. UTC

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/zte/zx_plane.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff mbox series

Patch

diff --git a/drivers/gpu/drm/zte/zx_plane.c b/drivers/gpu/drm/zte/zx_plane.c
index 086c50f..c265dd3 100644
--- a/drivers/gpu/drm/zte/zx_plane.c
+++ b/drivers/gpu/drm/zte/zx_plane.c
@@ -218,7 +218,7 @@  static void zx_vl_plane_atomic_update(struct drm_plane *plane,
 		cma_obj = drm_fb_cma_get_gem_obj(fb, i);
 		paddr = cma_obj->paddr + fb->offsets[i];
 		paddr += src_y * fb->pitches[i];
-		paddr += src_x * fb->format->cpp[i];
+		paddr += src_x * fb->format->bpp[i] / 8;
 		zx_writel(paddr_reg, paddr);
 		paddr_reg += 4;
 	}
@@ -379,7 +379,7 @@  static void zx_gl_plane_atomic_update(struct drm_plane *plane,
 	dst_w = plane->state->crtc_w;
 	dst_h = plane->state->crtc_h;
 
-	bpp = fb->format->cpp[0];
+	bpp = fb->format->bpp[0] / 8;
 
 	cma_obj = drm_fb_cma_get_gem_obj(fb, 0);
 	paddr = cma_obj->paddr + fb->offsets[0];