* [PATCH v4 1/4] drm/bochs: pass framebuffer to bochs_hw_setbase
[not found] <20190822065041.11941-1-kraxel@redhat.com>
@ 2019-08-22 6:50 ` Gerd Hoffmann
2019-08-22 6:50 ` [PATCH v4 2/4] drm/bochs: drop yres_virtual from struct bochs_device Gerd Hoffmann
` (2 subsequent siblings)
3 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2019-08-22 6:50 UTC (permalink / raw)
To: dri-devel
Cc: tzimmermann, Gerd Hoffmann, David Airlie, Daniel Vetter,
open list:DRM DRIVER FOR BOCHS VIRTUAL GPU, open list
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(-)
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index 68483a2fc12c..ed16840411f1 100644
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -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 */
diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c
index e567bdfa2ab8..949930d8a92f 100644
--- a/drivers/gpu/drm/bochs/bochs_hw.c
+++ b/drivers/gpu/drm/bochs/bochs_hw.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);
diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index 02a9c1ed165b..f5d663259753 100644
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -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);
}
--
2.18.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v4 2/4] drm/bochs: drop yres_virtual from struct bochs_device
[not found] <20190822065041.11941-1-kraxel@redhat.com>
2019-08-22 6:50 ` [PATCH v4 1/4] drm/bochs: pass framebuffer to bochs_hw_setbase Gerd Hoffmann
@ 2019-08-22 6:50 ` Gerd Hoffmann
2019-08-22 6:50 ` [PATCH v4 3/4] drm/bochs: drop stride and bpp " Gerd Hoffmann
2019-08-22 6:50 ` [PATCH v4 4/4] drm/bochs: move bochs_hw_setformat() call Gerd Hoffmann
3 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2019-08-22 6:50 UTC (permalink / raw)
To: dri-devel
Cc: tzimmermann, Gerd Hoffmann, David Airlie, Daniel Vetter,
open list:DRM DRIVER FOR BOCHS VIRTUAL GPU, open list
Not needed, writing to VBE_DISPI_INDEX_VIRT_HEIGHT has no effect anyway.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/bochs/bochs.h | 1 -
drivers/gpu/drm/bochs/bochs_hw.c | 8 ++------
2 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index ed16840411f1..6aae494ffbe8 100644
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -62,7 +62,6 @@ struct bochs_device {
/* mode */
u16 xres;
u16 yres;
- u16 yres_virtual;
u32 stride;
u32 bpp;
struct edid *edid;
diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c
index 949930d8a92f..2657b2e6e4d8 100644
--- a/drivers/gpu/drm/bochs/bochs_hw.c
+++ b/drivers/gpu/drm/bochs/bochs_hw.c
@@ -211,11 +211,9 @@ void bochs_hw_setmode(struct bochs_device *bochs,
bochs->yres = mode->vdisplay;
bochs->bpp = 32;
bochs->stride = mode->hdisplay * (bochs->bpp / 8);
- bochs->yres_virtual = bochs->fb_size / bochs->stride;
- DRM_DEBUG_DRIVER("%dx%d @ %d bpp, vy %d\n",
- bochs->xres, bochs->yres, bochs->bpp,
- bochs->yres_virtual);
+ DRM_DEBUG_DRIVER("%dx%d @ %d bpp\n",
+ bochs->xres, bochs->yres, bochs->bpp);
bochs_vga_writeb(bochs, 0x3c0, 0x20); /* unblank */
@@ -225,8 +223,6 @@ void bochs_hw_setmode(struct bochs_device *bochs,
bochs_dispi_write(bochs, VBE_DISPI_INDEX_YRES, bochs->yres);
bochs_dispi_write(bochs, VBE_DISPI_INDEX_BANK, 0);
bochs_dispi_write(bochs, VBE_DISPI_INDEX_VIRT_WIDTH, bochs->xres);
- bochs_dispi_write(bochs, VBE_DISPI_INDEX_VIRT_HEIGHT,
- bochs->yres_virtual);
bochs_dispi_write(bochs, VBE_DISPI_INDEX_X_OFFSET, 0);
bochs_dispi_write(bochs, VBE_DISPI_INDEX_Y_OFFSET, 0);
--
2.18.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v4 3/4] drm/bochs: drop stride and bpp from struct bochs_device
[not found] <20190822065041.11941-1-kraxel@redhat.com>
2019-08-22 6:50 ` [PATCH v4 1/4] drm/bochs: pass framebuffer to bochs_hw_setbase Gerd Hoffmann
2019-08-22 6:50 ` [PATCH v4 2/4] drm/bochs: drop yres_virtual from struct bochs_device Gerd Hoffmann
@ 2019-08-22 6:50 ` Gerd Hoffmann
2019-08-22 6:50 ` [PATCH v4 4/4] drm/bochs: move bochs_hw_setformat() call Gerd Hoffmann
3 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2019-08-22 6:50 UTC (permalink / raw)
To: dri-devel
Cc: tzimmermann, Gerd Hoffmann, David Airlie, Daniel Vetter,
open list:DRM DRIVER FOR BOCHS VIRTUAL GPU, open list
No need to store these values. bpp is fixed (32) anyway.
We lookup the stride from struct drm_framebuffer if needed.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/bochs/bochs.h | 2 --
drivers/gpu/drm/bochs/bochs_hw.c | 8 +++-----
drivers/gpu/drm/bochs/bochs_kms.c | 2 +-
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index 6aae494ffbe8..fa36a358a5dc 100644
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -62,8 +62,6 @@ struct bochs_device {
/* mode */
u16 xres;
u16 yres;
- u32 stride;
- u32 bpp;
struct edid *edid;
/* drm */
diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c
index 2657b2e6e4d8..0749e9de1a4d 100644
--- a/drivers/gpu/drm/bochs/bochs_hw.c
+++ b/drivers/gpu/drm/bochs/bochs_hw.c
@@ -209,16 +209,14 @@ void bochs_hw_setmode(struct bochs_device *bochs,
{
bochs->xres = mode->hdisplay;
bochs->yres = mode->vdisplay;
- bochs->bpp = 32;
- bochs->stride = mode->hdisplay * (bochs->bpp / 8);
- DRM_DEBUG_DRIVER("%dx%d @ %d bpp\n",
- bochs->xres, bochs->yres, bochs->bpp);
+ DRM_DEBUG_DRIVER("%dx%d\n",
+ bochs->xres, bochs->yres);
bochs_vga_writeb(bochs, 0x3c0, 0x20); /* unblank */
bochs_dispi_write(bochs, VBE_DISPI_INDEX_ENABLE, 0);
- bochs_dispi_write(bochs, VBE_DISPI_INDEX_BPP, bochs->bpp);
+ bochs_dispi_write(bochs, VBE_DISPI_INDEX_BPP, 32);
bochs_dispi_write(bochs, VBE_DISPI_INDEX_XRES, bochs->xres);
bochs_dispi_write(bochs, VBE_DISPI_INDEX_YRES, bochs->yres);
bochs_dispi_write(bochs, VBE_DISPI_INDEX_BANK, 0);
diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index f5d663259753..334e458cbc31 100644
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -29,7 +29,7 @@ static const uint32_t bochs_formats[] = {
static void bochs_plane_update(struct bochs_device *bochs,
struct drm_plane_state *state)
{
- if (!state->fb || !bochs->stride)
+ if (!state->fb)
return;
bochs_hw_setfb(bochs, state->fb,
--
2.18.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* [PATCH v4 4/4] drm/bochs: move bochs_hw_setformat() call
[not found] <20190822065041.11941-1-kraxel@redhat.com>
` (2 preceding siblings ...)
2019-08-22 6:50 ` [PATCH v4 3/4] drm/bochs: drop stride and bpp " Gerd Hoffmann
@ 2019-08-22 6:50 ` Gerd Hoffmann
3 siblings, 0 replies; 4+ messages in thread
From: Gerd Hoffmann @ 2019-08-22 6:50 UTC (permalink / raw)
To: dri-devel
Cc: tzimmermann, Gerd Hoffmann, David Airlie, Daniel Vetter,
open list:DRM DRIVER FOR BOCHS VIRTUAL GPU, open list
Call it from bochs_hw_setfb().
This also allows to make bochs_hw_setformat static.
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
---
drivers/gpu/drm/bochs/bochs.h | 2 --
drivers/gpu/drm/bochs/bochs_hw.c | 5 +++--
drivers/gpu/drm/bochs/bochs_kms.c | 1 -
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/bochs/bochs.h b/drivers/gpu/drm/bochs/bochs.h
index fa36a358a5dc..50fda96444e1 100644
--- a/drivers/gpu/drm/bochs/bochs.h
+++ b/drivers/gpu/drm/bochs/bochs.h
@@ -78,8 +78,6 @@ void bochs_hw_fini(struct drm_device *dev);
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_setfb(struct bochs_device *bochs,
struct drm_framebuffer *fb,
int x, int y);
diff --git a/drivers/gpu/drm/bochs/bochs_hw.c b/drivers/gpu/drm/bochs/bochs_hw.c
index 0749e9de1a4d..da68072be6ae 100644
--- a/drivers/gpu/drm/bochs/bochs_hw.c
+++ b/drivers/gpu/drm/bochs/bochs_hw.c
@@ -228,8 +228,8 @@ void bochs_hw_setmode(struct bochs_device *bochs,
VBE_DISPI_ENABLED | VBE_DISPI_LFB_ENABLED);
}
-void bochs_hw_setformat(struct bochs_device *bochs,
- const struct drm_format_info *format)
+static void bochs_hw_setformat(struct bochs_device *bochs,
+ const struct drm_format_info *format)
{
DRM_DEBUG_DRIVER("format %c%c%c%c\n",
(format->format >> 0) & 0xff,
@@ -269,4 +269,5 @@ void bochs_hw_setfb(struct bochs_device *bochs,
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);
+ bochs_hw_setformat(bochs, fb->format);
}
diff --git a/drivers/gpu/drm/bochs/bochs_kms.c b/drivers/gpu/drm/bochs/bochs_kms.c
index 334e458cbc31..d02104fddf82 100644
--- a/drivers/gpu/drm/bochs/bochs_kms.c
+++ b/drivers/gpu/drm/bochs/bochs_kms.c
@@ -35,7 +35,6 @@ static void bochs_plane_update(struct bochs_device *bochs,
bochs_hw_setfb(bochs, state->fb,
state->crtc_x,
state->crtc_y);
- bochs_hw_setformat(bochs, state->fb->format);
}
static void bochs_pipe_enable(struct drm_simple_display_pipe *pipe,
--
2.18.1
^ permalink raw reply related [flat|nested] 4+ messages in thread