Module Name: src
Committed By: jakllsch
Date: Tue Dec 17 18:30:51 UTC 2019
Modified Files:
src/sys/arch/arm/rockchip: rk_vop.c
Log Message:
rkvop: set stride using virtual framebuffer width instead of display mode
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/arm/rockchip/rk_vop.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/arm/rockchip/rk_vop.c
diff -u src/sys/arch/arm/rockchip/rk_vop.c:1.4 src/sys/arch/arm/rockchip/rk_vop.c:1.5
--- src/sys/arch/arm/rockchip/rk_vop.c:1.4 Tue Dec 17 18:26:36 2019
+++ src/sys/arch/arm/rockchip/rk_vop.c Tue Dec 17 18:30:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: rk_vop.c,v 1.4 2019/12/17 18:26:36 jakllsch Exp $ */
+/* $NetBSD: rk_vop.c,v 1.5 2019/12/17 18:30:51 jakllsch Exp $ */
/*-
* Copyright (c) 2019 Jared D. McNeill <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.4 2019/12/17 18:26:36 jakllsch Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rk_vop.c,v 1.5 2019/12/17 18:30:51 jakllsch Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -236,8 +236,15 @@ rk_vop_mode_do_set_base(struct drm_crtc
uint64_t paddr = (uint64_t)sfb->obj->dmamap->dm_segs[0].ds_addr;
+ paddr += y * sfb->base.pitches[0];
+ paddr += x * drm_format_plane_cpp(sfb->base.pixel_format, 0);
+
KASSERT((paddr & ~0xffffffff) == 0);
+ const uint32_t vir = __SHIFTIN(sfb->base.pitches[0] / 4,
+ WIN0_VIR_STRIDE);
+ WR4(sc, VOP_WIN0_VIR, vir);
+
/* Framebuffer start address */
WR4(sc, VOP_WIN0_YRGB_MST, (uint32_t)paddr);
@@ -309,9 +316,6 @@ rk_vop_mode_set(struct drm_crtc *crtc, s
WR4(sc, VOP_WIN0_COLOR_KEY, 0);
- val = __SHIFTIN(hactive, WIN0_VIR_STRIDE);
- WR4(sc, VOP_WIN0_VIR, val);
-
if (adjusted_mode->hdisplay > 2560)
lb_mode = WIN0_LB_MODE_RGB_3840X2;
else if (adjusted_mode->hdisplay > 1920)
