@@ -83,8 +83,9 @@ void bochs_hw_setmode(struct bochs_device *bochs,
struct drm_display_mode *mode);
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, int stride, u64 addr);
+void bochs_hw_setfb(struct bochs_device *bochs,
+ struct drm_framebuffer *fb,
+ int x, int y);
int bochs_hw_load_edid(struct bochs_device *bochs);
/* bochs_mm.c */
@@ -258,22 +258,20 @@ void bochs_hw_setformat(struct bochs_device *bochs,
};
}
-void bochs_hw_setbase(struct bochs_device *bochs,
- int x, int y, int stride, u64 addr)
+void bochs_hw_setfb(struct bochs_device *bochs,
+ struct drm_framebuffer *fb,
+ int x, int y)
{
- unsigned long offset;
- unsigned int vx, vy, vwidth;
-
- bochs->stride = stride;
- offset = (unsigned long)addr +
- y * bochs->stride +
- x * (bochs->bpp / 8);
- vy = offset / bochs->stride;
- vx = (offset % bochs->stride) * 8 / bochs->bpp;
- vwidth = stride * 8 / bochs->bpp;
+ struct drm_gem_vram_object *bo = drm_gem_vram_of_gem(fb->obj[0]);
+ unsigned long offset = bo->bo.offset +
+ y * fb->pitches[0] +
+ x * fb->format->cpp[0];
+ int vy = offset / fb->pitches[0];
+ int vx = (offset % fb->pitches[0]) / fb->format->cpp[0];
+ int vwidth = fb->pitches[0] / fb->format->cpp[0];
DRM_DEBUG_DRIVER("x %d, y %d, addr %llx -> offset %lx, vx %d, vy %d\n",
- x, y, addr, offset, vx, vy);
+ x, y, bo->bo.offset, 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);
@@ -29,17 +29,12 @@ static const uint32_t bochs_formats[] = {
static void bochs_plane_update(struct bochs_device *bochs,
struct drm_plane_state *state)
{
- struct drm_gem_vram_object *gbo;
-
if (!state->fb || !bochs->stride)
return;
- gbo = drm_gem_vram_of_gem(state->fb->obj[0]);
- bochs_hw_setbase(bochs,
- state->crtc_x,
- state->crtc_y,
- state->fb->pitches[0],
- state->fb->offsets[0] + gbo->bo.offset);
+ bochs_hw_setfb(bochs, state->fb,
+ state->crtc_x,
+ state->crtc_y);
bochs_hw_setformat(bochs, state->fb->format);
}
Also rename bochs_hw_setbase to bochs_hw_setfb, we have to set more than just the base address. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> --- drivers/gpu/drm/bochs/bochs.h | 5 +++-- drivers/gpu/drm/bochs/bochs_hw.c | 24 +++++++++++------------- drivers/gpu/drm/bochs/bochs_kms.c | 11 +++-------- 3 files changed, 17 insertions(+), 23 deletions(-)