drm/bochs: some cleanups.
Subsystems (3)
v4 cover drm/bochs: some cleanups.
Gerd Hoffmann (4):
drm/bochs: pass framebuffer to bochs_hw_setbase drm/bochs: drop yres_virtual from struct bochs_device drm/bochs: drop stride and bpp from struct bochs_device drm/bochs: move bochs_hw_setformat() call
drivers/gpu/drm/bochs/bochs.h | 10 +++----- drivers/gpu/drm/bochs/bochs_hw.c | 41 +++++++++++++------------------ drivers/gpu/drm/bochs/bochs_kms.c | 14 +++-------- 3 files changed, 24 insertions(+), 41 deletions(-)
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v4 1/4 drm/bochs: pass framebuffer to bochs_hw_setbase
Also rename bochs_hw_setbase to bochs_hw_setfb,
we have to set more than just the base address.
--- 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(-)
drivers/gpu/drm/bochs/bochs.h +3 -2
@@ -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 */
drivers/gpu/drm/bochs/bochs_hw.c +11 -13
@@ -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);
drivers/gpu/drm/bochs/bochs_kms.c +3 -8
@@ -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); }
Signature · 1 line
2.18.1
PATCH v4 1/4 drm/bochs: pass framebuffer to bochs_hw_setbase
In reply to Gerd HoffmannAlso rename bochs_hw_setbase to bochs_hw_setfb,
we have to set more than just the base address.
--- 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(-)
drivers/gpu/drm/bochs/bochs.h +3 -2
@@ -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 */
drivers/gpu/drm/bochs/bochs_hw.c +11 -13
@@ -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);
drivers/gpu/drm/bochs/bochs_kms.c +3 -8
@@ -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); }
Signature · 1 line
2.18.1
PATCH v4 2/4 drm/bochs: drop yres_virtual from struct bochs_device
In reply to Gerd HoffmannNot needed, writing to VBE_DISPI_INDEX_VIRT_HEIGHT has no effect anyway.
--- drivers/gpu/drm/bochs/bochs.h | 1 - drivers/gpu/drm/bochs/bochs_hw.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/bochs/bochs.h +0 -1
@@ -62,7 +62,6 @@ struct bochs_device {/* mode */ u16 xres;u16 yres; -u16 yres_virtual;u32 stride;u32 bpp;struct edid *edid;
drivers/gpu/drm/bochs/bochs_hw.c +2 -6
@@ -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 );
Signature · 1 line
2.18.1
PATCH v4 2/4 drm/bochs: drop yres_virtual from struct bochs_device
In reply to Gerd HoffmannNot needed, writing to VBE_DISPI_INDEX_VIRT_HEIGHT has no effect anyway.
--- drivers/gpu/drm/bochs/bochs.h | 1 - drivers/gpu/drm/bochs/bochs_hw.c | 8 ++------ 2 files changed, 2 insertions(+), 7 deletions(-)
drivers/gpu/drm/bochs/bochs.h +0 -1
@@ -62,7 +62,6 @@ struct bochs_device {/* mode */ u16 xres;u16 yres; -u16 yres_virtual;u32 stride;u32 bpp;struct edid *edid;
drivers/gpu/drm/bochs/bochs_hw.c +2 -6
@@ -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 );
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v4 3/4 drm/bochs: drop stride and bpp from struct bochs_device
In reply to Gerd HoffmannNo need to store these values. bpp is fixed (32) anyway. We lookup the stride from struct drm_framebuffer if needed.
--- 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(-)
drivers/gpu/drm/bochs/bochs.h +0 -2
@@ -62,8 +62,6 @@ struct bochs_device {/* mode */ u16 xres;u16 yres; -u32 stride; -u32 bpp;struct edid *edid;/* drm */
drivers/gpu/drm/bochs/bochs_hw.c +3 -5
@@ -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 );
drivers/gpu/drm/bochs/bochs_kms.c +1 -1
@@ -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,
Signature · 1 line
2.18.1
PATCH v4 3/4 drm/bochs: drop stride and bpp from struct bochs_device
In reply to Gerd HoffmannNo need to store these values. bpp is fixed (32) anyway. We lookup the stride from struct drm_framebuffer if needed.
--- 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(-)
drivers/gpu/drm/bochs/bochs.h +0 -2
@@ -62,8 +62,6 @@ struct bochs_device {/* mode */ u16 xres;u16 yres; -u32 stride; -u32 bpp;struct edid *edid;/* drm */
drivers/gpu/drm/bochs/bochs_hw.c +3 -5
@@ -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 );
drivers/gpu/drm/bochs/bochs_kms.c +1 -1
@@ -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,
Signature · 6 lines
2.18.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v4 4/4 drm/bochs: move bochs_hw_setformat() call
In reply to Gerd HoffmannCall it from bochs_hw_setfb().
This also allows to make bochs_hw_setformat static.
--- 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(-)
drivers/gpu/drm/bochs/bochs.h +0 -2
@@ -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);
drivers/gpu/drm/bochs/bochs_hw.c +3 -2
@@ -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); }
drivers/gpu/drm/bochs/bochs_kms.c +0 -1
@@ -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,
Signature · 1 line
2.18.1
PATCH v4 4/4 drm/bochs: move bochs_hw_setformat() call
In reply to Gerd HoffmannCall it from bochs_hw_setfb().
This also allows to make bochs_hw_setformat static.
--- 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(-)
drivers/gpu/drm/bochs/bochs.h +0 -2
@@ -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);
drivers/gpu/drm/bochs/bochs_hw.c +3 -2
@@ -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); }
drivers/gpu/drm/bochs/bochs_kms.c +0 -1
@@ -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,
Signature · 1 line
2.18.1