drm/bochs: fix framebuffer setup.

The driver doesn't consider framebuffer pitch and offset, leading to a
wrong display in case offset != 0 or pitch != width * bpp.  Fix it.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: Thomas Zimmermann <tzimmermann@suse.de>
Link: http://patchwork.freedesktop.org/patch/msgid/20190627081206.23135-1-kraxel@redhat.com

diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index cc35d492142ce4ab1aecb4729d9e1fc56c447e33..2a65434500eea60de3707ba57ea2fea40f617ea0 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -86,7 +86,7 @@ void bochs_hw_setmode(struct bochs_device *bochs,
 void bochs_hw_setformat(struct bochs_device *bochs,
                        const struct drm_format_info *format);
 void bochs_hw_setbase(struct bochs_device *bochs,
-                     int x, int y, u64 addr);
+                     int x, int y, int stride, u64 addr);
 int bochs_hw_load_edid(struct bochs_device *bochs);
 
 /* bochs_mm.c */

diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c
index 791ab2f79947fdfb6a87a3f1d3f4da08ff69c6b2..ebfea8744fe6f2b4d48bdfd4ff38dcc560d096e0 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs_hw.c
+++ b/drivers/gpu/drm/bochs/bochs_hw.c
@@ -255,16 +255,22 @@ void bochs_hw_setformat(struct bochs_device *bochs,
 }
 
 void bochs_hw_setbase(struct bochs_device *bochs,
-                     int x, int y, u64 addr)
+                     int x, int y, int stride, u64 addr)
 {
-       unsigned long offset = (unsigned long)addr +
+       unsigned long offset;
+       unsigned int vx, vy, vwidth;
+
+       bochs->stride = stride;
+       offset = (unsigned long)addr +
                y * bochs->stride +
                x * (bochs->bpp / 8);
-       int vy = offset / bochs->stride;
-       int vx = (offset % bochs->stride) * 8 / bochs->bpp;
+       vy = offset / bochs->stride;
+       vx = (offset % bochs->stride) * 8 / bochs->bpp;
+       vwidth = stride * 8 / bochs->bpp;
 
        DRM_DEBUG_DRIVER("x %d, y %d, addr %llx -> offset %lx, vx %d, vy %d\n",
                         x, y, addr, offset, vx, vy);
+       bochs_dispi_write(bochs, VBE_DISPI_INDEX_VIRT_WIDTH, vwidth);
        bochs_dispi_write(bochs, VBE_DISPI_INDEX_X_OFFSET, vx);
        bochs_dispi_write(bochs, VBE_DISPI_INDEX_Y_OFFSET, vy);
 }

diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index 5904eddc83a51824f2b30a1216a8e3aafa8f3e39..bc19dbd531efc237b1407bcee204e28c52474d72 100644 (file)
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -36,7 +36,8 @@ static void bochs_plane_update(struct bochs_device *bochs,
        bochs_hw_setbase(bochs,
                         state->crtc_x,
                         state->crtc_y,
-                        gbo->bo.offset);
+                        state->fb->pitches[0],
+                        state->fb->offsets[0] + gbo->bo.offset);
        bochs_hw_setformat(bochs, state->fb->format);
 }