xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/bochs: fix framebuffer setup.

Browse Source 
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
This commit is contained in:
Gerd Hoffmann
2019-06-27 10:12:06 +02:00
parent daed277e4d
commit dd2b595978
3 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/drm/bochs/bochs.h
View File

@@ -86,7 +86,7 @@ void bochs_hw_setmode(struct bochs_device *bochs,
void bochs_hw_setformat(struct bochs_device *bochs, void bochs_hw_setformat(struct bochs_device *bochs,
const struct drm_format_info *format); const struct drm_format_info *format);
void bochs_hw_setbase(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);
int bochs_hw_load_edid(struct bochs_device *bochs); int bochs_hw_load_edid(struct bochs_device *bochs);
/* bochs_mm.c */ /* bochs_mm.c */

14
drivers/gpu/drm/bochs/bochs_hw.c
View File

@@ -255,16 +255,22 @@ void bochs_hw_setformat(struct bochs_device *bochs,
} }
void bochs_hw_setbase(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 + y * bochs->stride +
x * (bochs->bpp / 8); x * (bochs->bpp / 8);
int vy = offset / bochs->stride; vy = offset / bochs->stride;
int vx = (offset % bochs->stride) * 8 / bochs->bpp; 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", DRM_DEBUG_DRIVER("x %d, y %d, addr %llx -> offset %lx, vx %d, vy %d\n",
x, y, addr, offset, vx, vy); 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_X_OFFSET, vx);
bochs_dispi_write(bochs, VBE_DISPI_INDEX_Y_OFFSET, vy); bochs_dispi_write(bochs, VBE_DISPI_INDEX_Y_OFFSET, vy);
} }

3
drivers/gpu/drm/bochs/bochs_kms.c
View File

@@ -36,7 +36,8 @@ static void bochs_plane_update(struct bochs_device *bochs,
bochs_hw_setbase(bochs, bochs_hw_setbase(bochs,
state->crtc_x, state->crtc_x,
state->crtc_y, state->crtc_y,
gbo->bo.offset); state->fb->pitches[0],
state->fb->offsets[0] + gbo->bo.offset);
bochs_hw_setformat(bochs, state->fb->format); bochs_hw_setformat(bochs, state->fb->format);
} }