drm/bochs: cleanups, atomic modesetting, generic fbdev.
Subsystems (3)
v3 cover drm/bochs: cleanups, atomic modesetting, generic fbdev.
This series adds support for atomic modesetting to the bochs driver. It also switches over to the generic fbdev implementation and does some cleanups.
v3:
- adjust pin/unpin fix & reorder patches a bit,
to keep the series bisectable (Daniel).
- drop dmabuf import/export callbacks.
v2:
- some updates according to Oleksandr's review.
- fix ttm bo pin/unpin (new patch #15).
Gerd Hoffmann (15):
drm/bochs: encoder cleanup
drm/bochs: split bochs_hw_setmode
drm/bochs: atomic: add atomic_flush+atomic_enable callbacks. drm/bochs: atomic: add mode_set_nofb callback. drm/bochs: atomic: switch planes to atomic, wire up helpers. drm/bochs: atomic: use atomic set_config helper drm/bochs: atomic: use atomic page_flip helper drm/bochs: atomic: set DRIVER_ATOMIC
drm/bochs: remove old bochs_crtc_* functions
drm/bochs: drop unused gpu_addr arg from bochs_bo_pin() drm/bochs: move ttm_bo_(un)reserve calls into bochs_bo_{pin,unpin} drm/bochs: add basic prime support
drm/bochs: switch to generic drm fbdev emulation drm/bochs: drop old fbdev emulation code
drm/bochs: move remaining fb bits to kms
drivers/gpu/drm/bochs/bochs.h | 23 ++-- drivers/gpu/drm/bochs/bochs_drv.c | 26 ++--- drivers/gpu/drm/bochs/bochs_fbdev.c | 163 --------------------------- drivers/gpu/drm/bochs/bochs_hw.c | 19 ++-- drivers/gpu/drm/bochs/bochs_kms.c | 218 +++++++++++++++++------------------- drivers/gpu/drm/bochs/bochs_mm.c | 68 +++++++++-- drivers/gpu/drm/bochs/Makefile | 2 +- 7 files changed, 196 insertions(+), 323 deletions(-) delete mode 100644 drivers/gpu/drm/bochs/bochs_fbdev.c
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 1/15 drm/bochs: encoder cleanup
Most unused callbacks can be NULL pointers these days. Drop a bunch of empty encoder callbacks.
--- drivers/gpu/drm/bochs/bochs_kms.c | 26 -------------------------- 1 file changed, 26 deletions(-)
drivers/gpu/drm/bochs/bochs_kms.c +0 -26
@@ -170,31 +170,6 @@ static void bochs_crtc_init(struct drm_device *dev)drm_crtc_helper_add (crtc, &bochs_helper_funcs); } -static void bochs_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) -{ -} - -static void bochs_encoder_dpms (struct drm_encoder *encoder,int state) -{ -} - -static void bochs_encoder_prepare (struct drm_encoder *encoder) -{ -} - -static void bochs_encoder_commit (struct drm_encoder *encoder) -{ -} - -static const struct drm_encoder_helper_funcs bochs_encoder_helper_funcs = { - .dpms = bochs_encoder_dpms, - .mode_set = bochs_encoder_mode_set, - .prepare = bochs_encoder_prepare, - .commit = bochs_encoder_commit, -}; -static const struct drm_encoder_funcs bochs_encoder_encoder_funcs = { .destroy = drm_encoder_cleanup, };
@@ -207,7 +182,6 @@ static void bochs_encoder_init(struct drm_device *dev) encoder->possible_crtcs =0x1 ;drm_encoder_init (dev, encoder, &bochs_encoder_encoder_funcs,DRM_MODE_ENCODER_DAC ,NULL ); -drm_encoder_helper_add (encoder, &bochs_encoder_helper_funcs); }
Signature · 1 line
2.9.3
PATCH v3 1/15 drm/bochs: encoder cleanup
In reply to Gerd HoffmannMost unused callbacks can be NULL pointers these days. Drop a bunch of empty encoder callbacks.
--- drivers/gpu/drm/bochs/bochs_kms.c | 26 -------------------------- 1 file changed, 26 deletions(-)
drivers/gpu/drm/bochs/bochs_kms.c +0 -26
@@ -170,31 +170,6 @@ static void bochs_crtc_init(struct drm_device *dev)drm_crtc_helper_add (crtc, &bochs_helper_funcs); } -static void bochs_encoder_mode_set (struct drm_encoder *encoder, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode) -{ -} - -static void bochs_encoder_dpms (struct drm_encoder *encoder,int state) -{ -} - -static void bochs_encoder_prepare (struct drm_encoder *encoder) -{ -} - -static void bochs_encoder_commit (struct drm_encoder *encoder) -{ -} - -static const struct drm_encoder_helper_funcs bochs_encoder_helper_funcs = { - .dpms = bochs_encoder_dpms, - .mode_set = bochs_encoder_mode_set, - .prepare = bochs_encoder_prepare, - .commit = bochs_encoder_commit, -}; -static const struct drm_encoder_funcs bochs_encoder_encoder_funcs = { .destroy = drm_encoder_cleanup, };
@@ -207,7 +182,6 @@ static void bochs_encoder_init(struct drm_device *dev) encoder->possible_crtcs =0x1 ;drm_encoder_init (dev, encoder, &bochs_encoder_encoder_funcs,DRM_MODE_ENCODER_DAC ,NULL ); -drm_encoder_helper_add (encoder, &bochs_encoder_helper_funcs); }
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 2/15 drm/bochs: split bochs_hw_setmode
In reply to Gerd HoffmannCreate a separate bochs_hw_setformat function to configure the framebuffer format (actually just the byteorder).
--- drivers/gpu/drm/bochs/bochs.h | 5 +++-- drivers/gpu/drm/bochs/bochs_hw.c | 19 ++++++++++++------- drivers/gpu/drm/bochs/bochs_kms.c | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-)
drivers/gpu/drm/bochs/bochs.h +3 -2
@@ -121,8 +121,9 @@ int bochs_hw_init(struct drm_device *dev);void bochs_hw_fini (struct drm_device *dev);void bochs_hw_setmode (struct bochs_device *bochs, -struct drm_display_mode *mode, -const struct drm_format_info *format); +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,u64 addr);int bochs_hw_load_edid (struct bochs_device *bochs);
drivers/gpu/drm/bochs/bochs_hw.c +12 -7
@@ -204,8 +204,7 @@ void bochs_hw_fini(struct drm_device *dev) }void bochs_hw_setmode (struct bochs_device *bochs, -struct drm_display_mode *mode, -const struct drm_format_info *format) +struct drm_display_mode *mode) { bochs->xres = mode->hdisplay; bochs->yres = mode->vdisplay;
@@ -213,12 +212,8 @@ void bochs_hw_setmode(struct bochs_device *bochs, bochs->stride = mode->hdisplay * (bochs->bpp /8 ); bochs->yres_virtual = bochs->fb_size / bochs->stride; -DRM_DEBUG_DRIVER ("%dx%d @ %d bpp, format %c%c%c%c, vy %d\n" , +DRM_DEBUG_DRIVER ("%dx%d @ %d bpp, vy %d\n" , bochs->xres, bochs->yres, bochs->bpp, - (format->format >>0 ) &0xff , - (format->format >>8 ) &0xff , - (format->format >>16 ) &0xff , - (format->format >>24 ) &0xff , bochs->yres_virtual);bochs_vga_writeb (bochs,0x3c0 ,0x20 );/* unblank */
@@ -236,6 +231,16 @@ void bochs_hw_setmode(struct bochs_device *bochs,bochs_dispi_write (bochs,VBE_DISPI_INDEX_ENABLE ,VBE_DISPI_ENABLED |VBE_DISPI_LFB_ENABLED ); +} + +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 , + (format->format >>8 ) &0xff , + (format->format >>16 ) &0xff , + (format->format >>24 ) &0xff );switch (format->format) {case DRM_FORMAT_XRGB8888 :
drivers/gpu/drm/bochs/bochs_kms.c +2 -1
@@ -80,7 +80,8 @@ static int bochs_crtc_mode_set(struct drm_crtc *crtc,if (WARN_ON (crtc->primary->fb ==NULL ))return -EINVAL ; -bochs_hw_setmode (bochs, mode, crtc->primary->fb->format); +bochs_hw_setmode (bochs, mode); +bochs_hw_setformat (bochs, crtc->primary->fb->format);bochs_crtc_mode_set_base (crtc, x, y, old_fb);return 0 ; }
Signature · 1 line
2.9.3
PATCH v3 2/15 drm/bochs: split bochs_hw_setmode
In reply to Gerd HoffmannCreate a separate bochs_hw_setformat function to configure the framebuffer format (actually just the byteorder).
--- drivers/gpu/drm/bochs/bochs.h | 5 +++-- drivers/gpu/drm/bochs/bochs_hw.c | 19 ++++++++++++------- drivers/gpu/drm/bochs/bochs_kms.c | 3 ++- 3 files changed, 17 insertions(+), 10 deletions(-)
drivers/gpu/drm/bochs/bochs.h +3 -2
@@ -121,8 +121,9 @@ int bochs_hw_init(struct drm_device *dev);void bochs_hw_fini (struct drm_device *dev);void bochs_hw_setmode (struct bochs_device *bochs, -struct drm_display_mode *mode, -const struct drm_format_info *format); +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,u64 addr);int bochs_hw_load_edid (struct bochs_device *bochs);
drivers/gpu/drm/bochs/bochs_hw.c +12 -7
@@ -204,8 +204,7 @@ void bochs_hw_fini(struct drm_device *dev) }void bochs_hw_setmode (struct bochs_device *bochs, -struct drm_display_mode *mode, -const struct drm_format_info *format) +struct drm_display_mode *mode) { bochs->xres = mode->hdisplay; bochs->yres = mode->vdisplay;
@@ -213,12 +212,8 @@ void bochs_hw_setmode(struct bochs_device *bochs, bochs->stride = mode->hdisplay * (bochs->bpp /8 ); bochs->yres_virtual = bochs->fb_size / bochs->stride; -DRM_DEBUG_DRIVER ("%dx%d @ %d bpp, format %c%c%c%c, vy %d\n" , +DRM_DEBUG_DRIVER ("%dx%d @ %d bpp, vy %d\n" , bochs->xres, bochs->yres, bochs->bpp, - (format->format >>0 ) &0xff , - (format->format >>8 ) &0xff , - (format->format >>16 ) &0xff , - (format->format >>24 ) &0xff , bochs->yres_virtual);bochs_vga_writeb (bochs,0x3c0 ,0x20 );/* unblank */
@@ -236,6 +231,16 @@ void bochs_hw_setmode(struct bochs_device *bochs,bochs_dispi_write (bochs,VBE_DISPI_INDEX_ENABLE ,VBE_DISPI_ENABLED |VBE_DISPI_LFB_ENABLED ); +} + +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 , + (format->format >>8 ) &0xff , + (format->format >>16 ) &0xff , + (format->format >>24 ) &0xff );switch (format->format) {case DRM_FORMAT_XRGB8888 :
drivers/gpu/drm/bochs/bochs_kms.c +2 -1
@@ -80,7 +80,8 @@ static int bochs_crtc_mode_set(struct drm_crtc *crtc,if (WARN_ON (crtc->primary->fb ==NULL ))return -EINVAL ; -bochs_hw_setmode (bochs, mode, crtc->primary->fb->format); +bochs_hw_setmode (bochs, mode); +bochs_hw_setformat (bochs, crtc->primary->fb->format);bochs_crtc_mode_set_base (crtc, x, y, old_fb);return 0 ; }
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 3/15 drm/bochs: atomic: add atomic_flush+atomic_enable callbacks.
In reply to Gerd HoffmannConversion to atomic modesetting, step one.
Add atomic crtc helper callbacks.
--- drivers/gpu/drm/bochs/bochs_kms.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/gpu/drm/bochs/bochs_kms.c +25 -0
@@ -115,6 +115,29 @@ static int bochs_crtc_page_flip(struct drm_crtc *crtc,return 0 ; } +static void bochs_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_crtc_state) +{ +} + +static void bochs_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_crtc_state *old_crtc_state) +{ +struct drm_device *dev = crtc->dev; +struct drm_pending_vblank_event *event; + +if (crtc->state && crtc->state->event) { +unsigned long irqflags; + +spin_lock_irqsave (&dev->event_lock, irqflags); + event = crtc->state->event; + crtc->state->event =NULL ; +drm_crtc_send_vblank_event (crtc, event); +spin_unlock_irqrestore (&dev->event_lock, irqflags); + } +} + +/* These provide the minimum set of functions required to handle a CRTC */ static const struct drm_crtc_funcs bochs_crtc_funcs = { .set_config = drm_crtc_helper_set_config,
@@ -128,6 +151,8 @@ static const struct drm_crtc_helper_funcs bochs_helper_funcs = { .mode_set_base = bochs_crtc_mode_set_base, .prepare = bochs_crtc_prepare, .commit = bochs_crtc_commit, + .atomic_enable = bochs_crtc_atomic_enable, + .atomic_flush = bochs_crtc_atomic_flush, };static const uint32_t bochs_formats[] = {
Signature · 1 line
2.9.3
PATCH v3 3/15 drm/bochs: atomic: add atomic_flush+atomic_enable callbacks.
In reply to Gerd HoffmannConversion to atomic modesetting, step one.
Add atomic crtc helper callbacks.
--- drivers/gpu/drm/bochs/bochs_kms.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+)
drivers/gpu/drm/bochs/bochs_kms.c +25 -0
@@ -115,6 +115,29 @@ static int bochs_crtc_page_flip(struct drm_crtc *crtc,return 0 ; } +static void bochs_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_crtc_state) +{ +} + +static void bochs_crtc_atomic_flush (struct drm_crtc *crtc, +struct drm_crtc_state *old_crtc_state) +{ +struct drm_device *dev = crtc->dev; +struct drm_pending_vblank_event *event; + +if (crtc->state && crtc->state->event) { +unsigned long irqflags; + +spin_lock_irqsave (&dev->event_lock, irqflags); + event = crtc->state->event; + crtc->state->event =NULL ; +drm_crtc_send_vblank_event (crtc, event); +spin_unlock_irqrestore (&dev->event_lock, irqflags); + } +} + +/* These provide the minimum set of functions required to handle a CRTC */ static const struct drm_crtc_funcs bochs_crtc_funcs = { .set_config = drm_crtc_helper_set_config,
@@ -128,6 +151,8 @@ static const struct drm_crtc_helper_funcs bochs_helper_funcs = { .mode_set_base = bochs_crtc_mode_set_base, .prepare = bochs_crtc_prepare, .commit = bochs_crtc_commit, + .atomic_enable = bochs_crtc_atomic_enable, + .atomic_flush = bochs_crtc_atomic_flush, };static const uint32_t bochs_formats[] = {
Signature · 1 line
2.9.3
PATCH v3 4/15 drm/bochs: atomic: add mode_set_nofb callback.
In reply to Gerd HoffmannConversion to atomic modesetting, step two.
Add mode_set_nofb crtc helper callback.
--- drivers/gpu/drm/bochs/bochs_kms.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/bochs/bochs_kms.c +9 -0
@@ -86,6 +86,14 @@ static int bochs_crtc_mode_set(struct drm_crtc *crtc,return 0 ; } +static void bochs_crtc_mode_set_nofb (struct drm_crtc *crtc) +{ +struct bochs_device *bochs = + container_of(crtc, struct bochs_device, crtc); + +bochs_hw_setmode (bochs, &crtc->mode); +} +static void bochs_crtc_prepare (struct drm_crtc *crtc) { }
@@ -149,6 +157,7 @@ static const struct drm_crtc_helper_funcs bochs_helper_funcs = { .dpms = bochs_crtc_dpms, .mode_set = bochs_crtc_mode_set, .mode_set_base = bochs_crtc_mode_set_base, + .mode_set_nofb = bochs_crtc_mode_set_nofb, .prepare = bochs_crtc_prepare, .commit = bochs_crtc_commit, .atomic_enable = bochs_crtc_atomic_enable,
Signature · 1 line
2.9.3
PATCH v3 4/15 drm/bochs: atomic: add mode_set_nofb callback.
In reply to Gerd HoffmannConversion to atomic modesetting, step two.
Add mode_set_nofb crtc helper callback.
--- drivers/gpu/drm/bochs/bochs_kms.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/gpu/drm/bochs/bochs_kms.c +9 -0
@@ -86,6 +86,14 @@ static int bochs_crtc_mode_set(struct drm_crtc *crtc,return 0 ; } +static void bochs_crtc_mode_set_nofb (struct drm_crtc *crtc) +{ +struct bochs_device *bochs = + container_of(crtc, struct bochs_device, crtc); + +bochs_hw_setmode (bochs, &crtc->mode); +} +static void bochs_crtc_prepare (struct drm_crtc *crtc) { }
@@ -149,6 +157,7 @@ static const struct drm_crtc_helper_funcs bochs_helper_funcs = { .dpms = bochs_crtc_dpms, .mode_set = bochs_crtc_mode_set, .mode_set_base = bochs_crtc_mode_set_base, + .mode_set_nofb = bochs_crtc_mode_set_nofb, .prepare = bochs_crtc_prepare, .commit = bochs_crtc_commit, .atomic_enable = bochs_crtc_atomic_enable,
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 5/15 drm/bochs: atomic: switch planes to atomic, wire up helpers.
In reply to Gerd HoffmannConversion to atomic modesetting, step three.
Wire up atomic helpers. Switch planes to atomic.
We are late to the party, the transitional helpers are gone, so this can't be splitted into smaller steps any more.
--- drivers/gpu/drm/bochs/bochs_fbdev.c | 3 ++ drivers/gpu/drm/bochs/bochs_kms.c | 82 +++++++++++++++++++++++++++++++++++-- 2 files changed, 82 insertions(+), 3 deletions(-)
drivers/gpu/drm/bochs/bochs_fbdev.c +3 -0
@@ -6,6 +6,7 @@*/ #include "bochs.h" +#include <drm/drm_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> /* ---------------------------------------------------------------------- */
@@ -149,6 +150,8 @@ bochs_gem_fb_create(struct drm_device *dev, struct drm_file *file,const struct drm_mode_config_funcs bochs_mode_funcs = { .fb_create = bochs_gem_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, };int bochs_fbdev_init (struct bochs_device *bochs)
drivers/gpu/drm/bochs/bochs_kms.c +79 -3
133 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH v3 5/15 drm/bochs: atomic: switch planes to atomic, wire up helpers.
In reply to Gerd HoffmannConversion to atomic modesetting, step three.
Wire up atomic helpers. Switch planes to atomic.
We are late to the party, the transitional helpers are gone, so this can't be splitted into smaller steps any more.
--- drivers/gpu/drm/bochs/bochs_fbdev.c | 3 ++ drivers/gpu/drm/bochs/bochs_kms.c | 82 +++++++++++++++++++++++++++++++++++-- 2 files changed, 82 insertions(+), 3 deletions(-)
drivers/gpu/drm/bochs/bochs_fbdev.c +3 -0
@@ -6,6 +6,7 @@*/ #include "bochs.h" +#include <drm/drm_atomic_helper.h> #include <drm/drm_gem_framebuffer_helper.h> /* ---------------------------------------------------------------------- */
@@ -149,6 +150,8 @@ bochs_gem_fb_create(struct drm_device *dev, struct drm_file *file,const struct drm_mode_config_funcs bochs_mode_funcs = { .fb_create = bochs_gem_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, };int bochs_fbdev_init (struct bochs_device *bochs)
drivers/gpu/drm/bochs/bochs_kms.c +79 -3
133 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 6/15 drm/bochs: atomic: use atomic set_config helper
In reply to Gerd HoffmannConversion to atomic modesetting, step four.
Use atomic set_config helper for crtc.
--- drivers/gpu/drm/bochs/bochs_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bochs/bochs_kms.c +1 -1
@@ -150,7 +150,7 @@ static void bochs_crtc_atomic_flush(struct drm_crtc *crtc,/* These provide the minimum set of functions required to handle a CRTC */ static const struct drm_crtc_funcs bochs_crtc_funcs = { - .set_config = drm_crtc_helper_set_config, + .set_config = drm_atomic_helper_set_config, .destroy = drm_crtc_cleanup, .page_flip = bochs_crtc_page_flip, .reset = drm_atomic_helper_crtc_reset,
Signature · 1 line
2.9.3
PATCH v3 6/15 drm/bochs: atomic: use atomic set_config helper
In reply to Gerd HoffmannConversion to atomic modesetting, step four.
Use atomic set_config helper for crtc.
--- drivers/gpu/drm/bochs/bochs_kms.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bochs/bochs_kms.c +1 -1
@@ -150,7 +150,7 @@ static void bochs_crtc_atomic_flush(struct drm_crtc *crtc,/* These provide the minimum set of functions required to handle a CRTC */ static const struct drm_crtc_funcs bochs_crtc_funcs = { - .set_config = drm_crtc_helper_set_config, + .set_config = drm_atomic_helper_set_config, .destroy = drm_crtc_cleanup, .page_flip = bochs_crtc_page_flip, .reset = drm_atomic_helper_crtc_reset,
Signature · 1 line
2.9.3
PATCH v3 7/15 drm/bochs: atomic: use atomic page_flip helper
In reply to Gerd HoffmannConversion to atomic modesetting, step five.
Use atomic page_flip helper for crtc.
--- drivers/gpu/drm/bochs/bochs_kms.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-)
drivers/gpu/drm/bochs/bochs_kms.c +1 -22
@@ -104,27 +104,6 @@ static void bochs_crtc_commit(struct drm_crtc *crtc) { } -static int bochs_crtc_page_flip (struct drm_crtc *crtc, -struct drm_framebuffer *fb, -struct drm_pending_vblank_event *event, -uint32_t page_flip_flags, -struct drm_modeset_acquire_ctx *ctx) -{ -struct bochs_device *bochs = - container_of(crtc, struct bochs_device, crtc); -struct drm_framebuffer *old_fb = crtc->primary->fb; -unsigned long irqflags; - -drm_atomic_set_fb_for_plane (crtc->primary->state, fb); -bochs_crtc_mode_set_base (crtc,0 ,0 , old_fb); -if (event) { -spin_lock_irqsave (&bochs->dev->event_lock, irqflags); -drm_crtc_send_vblank_event (crtc, event); -spin_unlock_irqrestore (&bochs->dev->event_lock, irqflags); - } -return 0 ; -} -static void bochs_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state) {
@@ -152,7 +131,7 @@ static void bochs_crtc_atomic_flush(struct drm_crtc *crtc,static const struct drm_crtc_funcs bochs_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = drm_crtc_cleanup, - .page_flip = bochs_crtc_page_flip, + .page_flip = drm_atomic_helper_page_flip, .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
Signature · 1 line
2.9.3
PATCH v3 7/15 drm/bochs: atomic: use atomic page_flip helper
In reply to Gerd HoffmannConversion to atomic modesetting, step five.
Use atomic page_flip helper for crtc.
--- drivers/gpu/drm/bochs/bochs_kms.c | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-)
drivers/gpu/drm/bochs/bochs_kms.c +1 -22
@@ -104,27 +104,6 @@ static void bochs_crtc_commit(struct drm_crtc *crtc) { } -static int bochs_crtc_page_flip (struct drm_crtc *crtc, -struct drm_framebuffer *fb, -struct drm_pending_vblank_event *event, -uint32_t page_flip_flags, -struct drm_modeset_acquire_ctx *ctx) -{ -struct bochs_device *bochs = - container_of(crtc, struct bochs_device, crtc); -struct drm_framebuffer *old_fb = crtc->primary->fb; -unsigned long irqflags; - -drm_atomic_set_fb_for_plane (crtc->primary->state, fb); -bochs_crtc_mode_set_base (crtc,0 ,0 , old_fb); -if (event) { -spin_lock_irqsave (&bochs->dev->event_lock, irqflags); -drm_crtc_send_vblank_event (crtc, event); -spin_unlock_irqrestore (&bochs->dev->event_lock, irqflags); - } -return 0 ; -} -static void bochs_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state) {
@@ -152,7 +131,7 @@ static void bochs_crtc_atomic_flush(struct drm_crtc *crtc,static const struct drm_crtc_funcs bochs_crtc_funcs = { .set_config = drm_atomic_helper_set_config, .destroy = drm_crtc_cleanup, - .page_flip = bochs_crtc_page_flip, + .page_flip = drm_atomic_helper_page_flip, .reset = drm_atomic_helper_crtc_reset, .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
Signature · 1 line
2.9.3
PATCH v3 8/15 drm/bochs: atomic: set DRIVER_ATOMIC
In reply to Gerd HoffmannConversion to atomic modesetting, final step.
Set the DRIVER_ATOMIC flag.
--- drivers/gpu/drm/bochs/bochs_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bochs/bochs_drv.c +1 -1
@@ -81,7 +81,7 @@ static const struct file_operations bochs_fops = { };static struct drm_driver bochs_driver = { - .driver_features =DRIVER_GEM |DRIVER_MODESET , + .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &bochs_fops, .name ="bochs-drm" , .desc ="bochs dispi vga interface (qemu stdvga)" ,
Signature · 1 line
2.9.3
PATCH v3 8/15 drm/bochs: atomic: set DRIVER_ATOMIC
In reply to Gerd HoffmannConversion to atomic modesetting, final step.
Set the DRIVER_ATOMIC flag.
--- drivers/gpu/drm/bochs/bochs_drv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/bochs/bochs_drv.c +1 -1
@@ -81,7 +81,7 @@ static const struct file_operations bochs_fops = { };static struct drm_driver bochs_driver = { - .driver_features =DRIVER_GEM |DRIVER_MODESET , + .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , .fops = &bochs_fops, .name ="bochs-drm" , .desc ="bochs dispi vga interface (qemu stdvga)" ,
Signature · 1 line
2.9.3
PATCH v3 9/15 drm/bochs: remove old bochs_crtc_* functions
In reply to Gerd HoffmannRemove the old, now unused crtc callbacks.
--- drivers/gpu/drm/bochs/bochs_kms.c | 81 --------------------------------------- 1 file changed, 81 deletions(-)
drivers/gpu/drm/bochs/bochs_kms.c +0 -81
@@ -20,74 +20,6 @@ MODULE_PARM_DESC(defy, "default y resolution");/* ---------------------------------------------------------------------- */ -static void bochs_crtc_dpms (struct drm_crtc *crtc,int mode) -{ -switch (mode) { -case DRM_MODE_DPMS_ON : -case DRM_MODE_DPMS_STANDBY : -case DRM_MODE_DPMS_SUSPEND : -case DRM_MODE_DPMS_OFF : -default : -return ; - } -} - -static int bochs_crtc_mode_set_base (struct drm_crtc *crtc,int x,int y, -struct drm_framebuffer *old_fb) -{ -struct bochs_device *bochs = - container_of(crtc, struct bochs_device, crtc); -struct bochs_bo *bo; -u64 gpu_addr =0 ; -int ret; - -if (old_fb) { - bo =gem_to_bochs_bo (old_fb->obj[0 ]); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) { -DRM_ERROR ("failed to reserve old_fb bo\n" ); - }else { -bochs_bo_unpin (bo); -ttm_bo_unreserve (&bo->bo); - } - } - -if (WARN_ON (crtc->primary->fb ==NULL )) -return -EINVAL ; - - bo =gem_to_bochs_bo (crtc->primary->fb->obj[0 ]); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) -return ret; - - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM , &gpu_addr); -if (ret) { -ttm_bo_unreserve (&bo->bo); -return ret; - } - -ttm_bo_unreserve (&bo->bo); -bochs_hw_setbase (bochs, x, y, gpu_addr); -return 0 ; -} - -static int bochs_crtc_mode_set (struct drm_crtc *crtc, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode, -int x,int y,struct drm_framebuffer *old_fb) -{ -struct bochs_device *bochs = - container_of(crtc, struct bochs_device, crtc); - -if (WARN_ON (crtc->primary->fb ==NULL )) -return -EINVAL ; - -bochs_hw_setmode (bochs, mode); -bochs_hw_setformat (bochs, crtc->primary->fb->format); -bochs_crtc_mode_set_base (crtc, x, y, old_fb); -return 0 ; -} -static void bochs_crtc_mode_set_nofb (struct drm_crtc *crtc) { struct bochs_device *bochs =
@@ -96,14 +28,6 @@ static void bochs_crtc_mode_set_nofb(struct drm_crtc *crtc)bochs_hw_setmode (bochs, &crtc->mode); } -static void bochs_crtc_prepare (struct drm_crtc *crtc) -{ -} - -static void bochs_crtc_commit (struct drm_crtc *crtc) -{ -} -static void bochs_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state) {
@@ -138,12 +62,7 @@ static const struct drm_crtc_funcs bochs_crtc_funcs = { };static const struct drm_crtc_helper_funcs bochs_helper_funcs = { - .dpms = bochs_crtc_dpms, - .mode_set = bochs_crtc_mode_set, - .mode_set_base = bochs_crtc_mode_set_base, .mode_set_nofb = bochs_crtc_mode_set_nofb, - .prepare = bochs_crtc_prepare, - .commit = bochs_crtc_commit, .atomic_enable = bochs_crtc_atomic_enable, .atomic_flush = bochs_crtc_atomic_flush, };
Signature · 1 line
2.9.3
PATCH v3 9/15 drm/bochs: remove old bochs_crtc_* functions
In reply to Gerd HoffmannRemove the old, now unused crtc callbacks.
--- drivers/gpu/drm/bochs/bochs_kms.c | 81 --------------------------------------- 1 file changed, 81 deletions(-)
drivers/gpu/drm/bochs/bochs_kms.c +0 -81
@@ -20,74 +20,6 @@ MODULE_PARM_DESC(defy, "default y resolution");/* ---------------------------------------------------------------------- */ -static void bochs_crtc_dpms (struct drm_crtc *crtc,int mode) -{ -switch (mode) { -case DRM_MODE_DPMS_ON : -case DRM_MODE_DPMS_STANDBY : -case DRM_MODE_DPMS_SUSPEND : -case DRM_MODE_DPMS_OFF : -default : -return ; - } -} - -static int bochs_crtc_mode_set_base (struct drm_crtc *crtc,int x,int y, -struct drm_framebuffer *old_fb) -{ -struct bochs_device *bochs = - container_of(crtc, struct bochs_device, crtc); -struct bochs_bo *bo; -u64 gpu_addr =0 ; -int ret; - -if (old_fb) { - bo =gem_to_bochs_bo (old_fb->obj[0 ]); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) { -DRM_ERROR ("failed to reserve old_fb bo\n" ); - }else { -bochs_bo_unpin (bo); -ttm_bo_unreserve (&bo->bo); - } - } - -if (WARN_ON (crtc->primary->fb ==NULL )) -return -EINVAL ; - - bo =gem_to_bochs_bo (crtc->primary->fb->obj[0 ]); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) -return ret; - - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM , &gpu_addr); -if (ret) { -ttm_bo_unreserve (&bo->bo); -return ret; - } - -ttm_bo_unreserve (&bo->bo); -bochs_hw_setbase (bochs, x, y, gpu_addr); -return 0 ; -} - -static int bochs_crtc_mode_set (struct drm_crtc *crtc, -struct drm_display_mode *mode, -struct drm_display_mode *adjusted_mode, -int x,int y,struct drm_framebuffer *old_fb) -{ -struct bochs_device *bochs = - container_of(crtc, struct bochs_device, crtc); - -if (WARN_ON (crtc->primary->fb ==NULL )) -return -EINVAL ; - -bochs_hw_setmode (bochs, mode); -bochs_hw_setformat (bochs, crtc->primary->fb->format); -bochs_crtc_mode_set_base (crtc, x, y, old_fb); -return 0 ; -} -static void bochs_crtc_mode_set_nofb (struct drm_crtc *crtc) { struct bochs_device *bochs =
@@ -96,14 +28,6 @@ static void bochs_crtc_mode_set_nofb(struct drm_crtc *crtc)bochs_hw_setmode (bochs, &crtc->mode); } -static void bochs_crtc_prepare (struct drm_crtc *crtc) -{ -} - -static void bochs_crtc_commit (struct drm_crtc *crtc) -{ -} -static void bochs_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state) {
@@ -138,12 +62,7 @@ static const struct drm_crtc_funcs bochs_crtc_funcs = { };static const struct drm_crtc_helper_funcs bochs_helper_funcs = { - .dpms = bochs_crtc_dpms, - .mode_set = bochs_crtc_mode_set, - .mode_set_base = bochs_crtc_mode_set_base, .mode_set_nofb = bochs_crtc_mode_set_nofb, - .prepare = bochs_crtc_prepare, - .commit = bochs_crtc_commit, .atomic_enable = bochs_crtc_atomic_enable, .atomic_flush = bochs_crtc_atomic_flush, };
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 10/15 drm/bochs: drop unused gpu_addr arg from bochs_bo_pin()
In reply to Gerd HoffmannIt's always NULL, so just remove it.
--- drivers/gpu/drm/bochs/bochs.h | 2 +- drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +- drivers/gpu/drm/bochs/bochs_kms.c | 2 +- drivers/gpu/drm/bochs/bochs_mm.c | 11 +---------- 4 files changed, 4 insertions(+), 13 deletions(-)
drivers/gpu/drm/bochs/bochs.h +1 -1
@@ -142,7 +142,7 @@ int bochs_dumb_create(struct drm_file *file, struct drm_device *dev,int bochs_dumb_mmap_offset (struct drm_file *file,struct drm_device *dev,uint32_t handle,uint64_t *offset); -int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag,u64 *gpu_addr); +int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag);int bochs_bo_unpin (struct bochs_bo *bo);/* bochs_kms.c */
drivers/gpu/drm/bochs/bochs_fbdev.c +1 -1
@@ -81,7 +81,7 @@ static int bochsfb_create(struct drm_fb_helper *helper,if (ret)return ret; - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ,NULL ); + ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM );if (ret) {DRM_ERROR ("failed to pin fbcon\n" );ttm_bo_unreserve (&bo->bo);
drivers/gpu/drm/bochs/bochs_kms.c +1 -1
@@ -101,7 +101,7 @@ static int bochs_plane_prepare_fb(struct drm_plane *plane, ret =ttm_bo_reserve (&bo->bo, true, false,NULL );if (ret)return ret; - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ,NULL ); + ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM );ttm_bo_unreserve (&bo->bo);return ret; }
drivers/gpu/drm/bochs/bochs_mm.c +1 -10
@@ -210,20 +210,13 @@ static void bochs_ttm_placement(struct bochs_bo *bo, int domain) bo->placement.num_busy_placement = c; } -static inline u64 bochs_bo_gpu_offset (struct bochs_bo *bo) -{ -return bo->bo.offset; -} - -int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag,u64 *gpu_addr) +int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag) {struct ttm_operation_ctx ctx = { false, false };int i, ret;if (bo->pin_count) { bo->pin_count++; -if (gpu_addr) - *gpu_addr =bochs_bo_gpu_offset (bo);return 0 ; }
@@ -235,8 +228,6 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr)return ret; bo->pin_count =1 ; -if (gpu_addr) - *gpu_addr =bochs_bo_gpu_offset (bo);return 0 ; }
Signature · 1 line
2.9.3
PATCH v3 10/15 drm/bochs: drop unused gpu_addr arg from bochs_bo_pin()
In reply to Gerd HoffmannIt's always NULL, so just remove it.
--- drivers/gpu/drm/bochs/bochs.h | 2 +- drivers/gpu/drm/bochs/bochs_fbdev.c | 2 +- drivers/gpu/drm/bochs/bochs_kms.c | 2 +- drivers/gpu/drm/bochs/bochs_mm.c | 11 +---------- 4 files changed, 4 insertions(+), 13 deletions(-)
drivers/gpu/drm/bochs/bochs.h +1 -1
@@ -142,7 +142,7 @@ int bochs_dumb_create(struct drm_file *file, struct drm_device *dev,int bochs_dumb_mmap_offset (struct drm_file *file,struct drm_device *dev,uint32_t handle,uint64_t *offset); -int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag,u64 *gpu_addr); +int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag);int bochs_bo_unpin (struct bochs_bo *bo);/* bochs_kms.c */
drivers/gpu/drm/bochs/bochs_fbdev.c +1 -1
@@ -81,7 +81,7 @@ static int bochsfb_create(struct drm_fb_helper *helper,if (ret)return ret; - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ,NULL ); + ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM );if (ret) {DRM_ERROR ("failed to pin fbcon\n" );ttm_bo_unreserve (&bo->bo);
drivers/gpu/drm/bochs/bochs_kms.c +1 -1
@@ -101,7 +101,7 @@ static int bochs_plane_prepare_fb(struct drm_plane *plane, ret =ttm_bo_reserve (&bo->bo, true, false,NULL );if (ret)return ret; - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ,NULL ); + ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM );ttm_bo_unreserve (&bo->bo);return ret; }
drivers/gpu/drm/bochs/bochs_mm.c +1 -10
@@ -210,20 +210,13 @@ static void bochs_ttm_placement(struct bochs_bo *bo, int domain) bo->placement.num_busy_placement = c; } -static inline u64 bochs_bo_gpu_offset (struct bochs_bo *bo) -{ -return bo->bo.offset; -} - -int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag,u64 *gpu_addr) +int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag) {struct ttm_operation_ctx ctx = { false, false };int i, ret;if (bo->pin_count) { bo->pin_count++; -if (gpu_addr) - *gpu_addr =bochs_bo_gpu_offset (bo);return 0 ; }
@@ -235,8 +228,6 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag, u64 *gpu_addr)return ret; bo->pin_count =1 ; -if (gpu_addr) - *gpu_addr =bochs_bo_gpu_offset (bo);return 0 ; }
Signature · 1 line
2.9.3
PATCH v3 11/15 drm/bochs: move ttm_bo_(un)reserve calls into bochs_bo_{pin,unpin}
In reply to Gerd Hoffmann--- drivers/gpu/drm/bochs/bochs_fbdev.c | 8 -------- drivers/gpu/drm/bochs/bochs_kms.c | 14 +------------- drivers/gpu/drm/bochs/bochs_mm.c | 8 ++++++++ 3 files changed, 9 insertions(+), 21 deletions(-)
drivers/gpu/drm/bochs/bochs_fbdev.c +0 -8
@@ -77,14 +77,9 @@ static int bochsfb_create(struct drm_fb_helper *helper, bo =gem_to_bochs_bo (gobj); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) -return ret; - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM );if (ret) {DRM_ERROR ("failed to pin fbcon\n" ); -ttm_bo_unreserve (&bo->bo);return ret; }
@@ -92,12 +87,9 @@ static int bochsfb_create(struct drm_fb_helper *helper, &bo->kmap);if (ret) {DRM_ERROR ("failed to kmap fbcon\n" ); -ttm_bo_unreserve (&bo->bo);return ret; } -ttm_bo_unreserve (&bo->bo); -/* init fb device */ info =drm_fb_helper_alloc_fbi (helper);if (IS_ERR (info)) {
drivers/gpu/drm/bochs/bochs_kms.c +1 -13
@@ -92,34 +92,22 @@ static int bochs_plane_prepare_fb(struct drm_plane *plane, struct drm_plane_state *new_state) {struct bochs_bo *bo; -int ret;if (!new_state->fb)return 0 ; bo =gem_to_bochs_bo (new_state->fb->obj[0 ]); - - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) -return ret; - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ); -ttm_bo_unreserve (&bo->bo); -return ret; +return bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ); }static void bochs_plane_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) {struct bochs_bo *bo; -int ret;if (!old_state->fb)return ; bo =gem_to_bochs_bo (old_state->fb->obj[0 ]); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) -return ;bochs_bo_unpin (bo); -ttm_bo_unreserve (&bo->bo); }static const struct drm_plane_helper_funcs bochs_plane_helper_funcs = {
drivers/gpu/drm/bochs/bochs_mm.c +8 -0
@@ -223,7 +223,11 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag)bochs_ttm_placement (bo, pl_flag);for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; + ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); +if (ret) +return ret; ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx); +ttm_bo_unreserve (&bo->bo);if (ret)return ret;
@@ -247,7 +251,11 @@ int bochs_bo_unpin(struct bochs_bo *bo)for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; + ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); +if (ret) +return ret; ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx); +ttm_bo_unreserve (&bo->bo);if (ret)return ret;
Signature · 1 line
2.9.3
PATCH v3 11/15 drm/bochs: move ttm_bo_(un)reserve calls into bochs_bo_{pin, unpin}
In reply to Gerd Hoffmann--- drivers/gpu/drm/bochs/bochs_fbdev.c | 8 -------- drivers/gpu/drm/bochs/bochs_kms.c | 14 +------------- drivers/gpu/drm/bochs/bochs_mm.c | 8 ++++++++ 3 files changed, 9 insertions(+), 21 deletions(-)
drivers/gpu/drm/bochs/bochs_fbdev.c +0 -8
@@ -77,14 +77,9 @@ static int bochsfb_create(struct drm_fb_helper *helper, bo =gem_to_bochs_bo (gobj); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) -return ret; - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM );if (ret) {DRM_ERROR ("failed to pin fbcon\n" ); -ttm_bo_unreserve (&bo->bo);return ret; }
@@ -92,12 +87,9 @@ static int bochsfb_create(struct drm_fb_helper *helper, &bo->kmap);if (ret) {DRM_ERROR ("failed to kmap fbcon\n" ); -ttm_bo_unreserve (&bo->bo);return ret; } -ttm_bo_unreserve (&bo->bo); -/* init fb device */ info =drm_fb_helper_alloc_fbi (helper);if (IS_ERR (info)) {
drivers/gpu/drm/bochs/bochs_kms.c +1 -13
@@ -92,34 +92,22 @@ static int bochs_plane_prepare_fb(struct drm_plane *plane, struct drm_plane_state *new_state) {struct bochs_bo *bo; -int ret;if (!new_state->fb)return 0 ; bo =gem_to_bochs_bo (new_state->fb->obj[0 ]); - - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) -return ret; - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ); -ttm_bo_unreserve (&bo->bo); -return ret; +return bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ); }static void bochs_plane_cleanup_fb (struct drm_plane *plane,struct drm_plane_state *old_state) {struct bochs_bo *bo; -int ret;if (!old_state->fb)return ; bo =gem_to_bochs_bo (old_state->fb->obj[0 ]); - ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); -if (ret) -return ;bochs_bo_unpin (bo); -ttm_bo_unreserve (&bo->bo); }static const struct drm_plane_helper_funcs bochs_plane_helper_funcs = {
drivers/gpu/drm/bochs/bochs_mm.c +8 -0
@@ -223,7 +223,11 @@ int bochs_bo_pin(struct bochs_bo *bo, u32 pl_flag)bochs_ttm_placement (bo, pl_flag);for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags |=TTM_PL_FLAG_NO_EVICT ; + ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); +if (ret) +return ret; ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx); +ttm_bo_unreserve (&bo->bo);if (ret)return ret;
@@ -247,7 +251,11 @@ int bochs_bo_unpin(struct bochs_bo *bo)for (i =0 ; i < bo->placement.num_placement; i++) bo->placements[i].flags &= ~TTM_PL_FLAG_NO_EVICT ; + ret =ttm_bo_reserve (&bo->bo, true, false,NULL ); +if (ret) +return ret; ret =ttm_bo_validate (&bo->bo, &bo->placement, &ctx); +ttm_bo_unreserve (&bo->bo);if (ret)return ret;
Signature · 1 line
2.9.3
PATCH v3 12/15 drm/bochs: add basic prime support
In reply to Gerd HoffmannJust enough to make the generic framebuffer emulation happy.
--- drivers/gpu/drm/bochs/bochs.h | 7 ++++++ drivers/gpu/drm/bochs/bochs_drv.c | 11 ++++++++- drivers/gpu/drm/bochs/bochs_mm.c | 49 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-)
drivers/gpu/drm/bochs/bochs.h +7 -0
@@ -145,6 +145,13 @@ int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag);int bochs_bo_unpin (struct bochs_bo *bo); +int bochs_gem_prime_pin (struct drm_gem_object *obj); +void bochs_gem_prime_unpin (struct drm_gem_object *obj); +void *bochs_gem_prime_vmap (struct drm_gem_object *obj); +void bochs_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); +int bochs_gem_prime_mmap (struct drm_gem_object *obj, +struct vm_area_struct *vma); +/* bochs_kms.c */ int bochs_kms_init (struct bochs_device *bochs);void bochs_kms_fini (struct bochs_device *bochs);
drivers/gpu/drm/bochs/bochs_drv.c +10 -1
@@ -81,7 +81,8 @@ static const struct file_operations bochs_fops = { };static struct drm_driver bochs_driver = { - .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , + .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC | +DRIVER_PRIME , .fops = &bochs_fops, .name ="bochs-drm" , .desc ="bochs dispi vga interface (qemu stdvga)" ,
@@ -91,6 +92,14 @@ static struct drm_driver bochs_driver = { .gem_free_object_unlocked = bochs_gem_free_object, .dumb_create = bochs_dumb_create, .dumb_map_offset = bochs_dumb_mmap_offset, + + .gem_prime_export = drm_gem_prime_export, + .gem_prime_import = drm_gem_prime_import, + .gem_prime_pin = bochs_gem_prime_pin, + .gem_prime_unpin = bochs_gem_prime_unpin, + .gem_prime_vmap = bochs_gem_prime_vmap, + .gem_prime_vunmap = bochs_gem_prime_vunmap, + .gem_prime_mmap = bochs_gem_prime_mmap, };/* ---------------------------------------------------------------------- */
drivers/gpu/drm/bochs/bochs_mm.c +49 -0
52 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH v3 12/15 drm/bochs: add basic prime support
In reply to Gerd HoffmannJust enough to make the generic framebuffer emulation happy.
--- drivers/gpu/drm/bochs/bochs.h | 7 ++++++ drivers/gpu/drm/bochs/bochs_drv.c | 11 ++++++++- drivers/gpu/drm/bochs/bochs_mm.c | 49 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 66 insertions(+), 1 deletion(-)
drivers/gpu/drm/bochs/bochs.h +7 -0
@@ -145,6 +145,13 @@ int bochs_dumb_mmap_offset(struct drm_file *file, struct drm_device *dev,int bochs_bo_pin (struct bochs_bo *bo,u32 pl_flag);int bochs_bo_unpin (struct bochs_bo *bo); +int bochs_gem_prime_pin (struct drm_gem_object *obj); +void bochs_gem_prime_unpin (struct drm_gem_object *obj); +void *bochs_gem_prime_vmap (struct drm_gem_object *obj); +void bochs_gem_prime_vunmap (struct drm_gem_object *obj,void *vaddr); +int bochs_gem_prime_mmap (struct drm_gem_object *obj, +struct vm_area_struct *vma); +/* bochs_kms.c */ int bochs_kms_init (struct bochs_device *bochs);void bochs_kms_fini (struct bochs_device *bochs);
drivers/gpu/drm/bochs/bochs_drv.c +10 -1
@@ -81,7 +81,8 @@ static const struct file_operations bochs_fops = { };static struct drm_driver bochs_driver = { - .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC , + .driver_features =DRIVER_GEM |DRIVER_MODESET |DRIVER_ATOMIC | +DRIVER_PRIME , .fops = &bochs_fops, .name ="bochs-drm" , .desc ="bochs dispi vga interface (qemu stdvga)" ,
@@ -91,6 +92,14 @@ static struct drm_driver bochs_driver = { .gem_free_object_unlocked = bochs_gem_free_object, .dumb_create = bochs_dumb_create, .dumb_map_offset = bochs_dumb_mmap_offset, + + .gem_prime_export = drm_gem_prime_export, + .gem_prime_import = drm_gem_prime_import, + .gem_prime_pin = bochs_gem_prime_pin, + .gem_prime_unpin = bochs_gem_prime_unpin, + .gem_prime_vmap = bochs_gem_prime_vmap, + .gem_prime_vunmap = bochs_gem_prime_vunmap, + .gem_prime_mmap = bochs_gem_prime_mmap, };/* ---------------------------------------------------------------------- */
drivers/gpu/drm/bochs/bochs_mm.c +49 -0
52 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 13/15 drm/bochs: switch to generic drm fbdev emulation
In reply to Gerd Hoffmann--- drivers/gpu/drm/bochs/bochs_drv.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/gpu/drm/bochs/bochs_drv.c +1 -8
@@ -16,10 +16,6 @@ static int bochs_modeset = -1;module_param_named (modeset, bochs_modeset, int,0444 );MODULE_PARM_DESC (modeset,"enable/disable kernel modesetting" ); -static bool enable_fbdev = true; -module_param_named (fbdev, enable_fbdev, bool,0444 ); -MODULE_PARM_DESC (fbdev,"register fbdev device" ); -/* ---------------------------------------------------------------------- */ /* drm interface */
@@ -27,7 +23,6 @@ static void bochs_unload(struct drm_device *dev) {struct bochs_device *bochs = dev->dev_private; -bochs_fbdev_fini (bochs);bochs_kms_fini (bochs);bochs_mm_fini (bochs);bochs_hw_fini (dev);
@@ -58,9 +53,6 @@ static int bochs_load(struct drm_device *dev)if (ret) goto err; -if (enable_fbdev) -bochs_fbdev_init (bochs); -return 0 ; err:
@@ -174,6 +166,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,if (ret) goto err_unload; +drm_fbdev_generic_setup (dev,32 );return ret; err_unload:
Signature · 1 line
2.9.3
PATCH v3 13/15 drm/bochs: switch to generic drm fbdev emulation
In reply to Gerd Hoffmann--- drivers/gpu/drm/bochs/bochs_drv.c | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-)
drivers/gpu/drm/bochs/bochs_drv.c +1 -8
@@ -16,10 +16,6 @@ static int bochs_modeset = -1;module_param_named (modeset, bochs_modeset, int,0444 );MODULE_PARM_DESC (modeset,"enable/disable kernel modesetting" ); -static bool enable_fbdev = true; -module_param_named (fbdev, enable_fbdev, bool,0444 ); -MODULE_PARM_DESC (fbdev,"register fbdev device" ); -/* ---------------------------------------------------------------------- */ /* drm interface */
@@ -27,7 +23,6 @@ static void bochs_unload(struct drm_device *dev) {struct bochs_device *bochs = dev->dev_private; -bochs_fbdev_fini (bochs);bochs_kms_fini (bochs);bochs_mm_fini (bochs);bochs_hw_fini (dev);
@@ -58,9 +53,6 @@ static int bochs_load(struct drm_device *dev)if (ret) goto err; -if (enable_fbdev) -bochs_fbdev_init (bochs); -return 0 ; err:
@@ -174,6 +166,7 @@ static int bochs_pci_probe(struct pci_dev *pdev,if (ret) goto err_unload; +drm_fbdev_generic_setup (dev,32 );return ret; err_unload:
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH v3 14/15 drm/bochs: drop old fbdev emulation code
In reply to Gerd HoffmannNot needed any more, bochs uses the generic emulation now.
--- drivers/gpu/drm/bochs/bochs.h | 9 --- drivers/gpu/drm/bochs/bochs_drv.c | 6 -- drivers/gpu/drm/bochs/bochs_fbdev.c | 129 ------------------------------------ 3 files changed, 144 deletions(-)
drivers/gpu/drm/bochs/bochs.h +0 -9
@@ -80,12 +80,6 @@ struct bochs_device {struct ttm_bo_device bdev;bool initialized; } ttm; - -/* fbdev */ -struct { -struct drm_framebuffer *fb; -struct drm_fb_helper helper; - } fb; };struct bochs_bo {
@@ -157,7 +151,4 @@ int bochs_kms_init(struct bochs_device *bochs);void bochs_kms_fini (struct bochs_device *bochs);/* bochs_fbdev.c */ -int bochs_fbdev_init (struct bochs_device *bochs); -void bochs_fbdev_fini (struct bochs_device *bochs); -extern const struct drm_mode_config_funcs bochs_mode_funcs;
drivers/gpu/drm/bochs/bochs_drv.c +0 -6
@@ -102,12 +102,9 @@ static int bochs_pm_suspend(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct drm_device *drm_dev =pci_get_drvdata (pdev); -struct bochs_device *bochs = drm_dev->dev_private;drm_kms_helper_poll_disable (drm_dev); -drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,1 ); -return 0 ; }
@@ -115,12 +112,9 @@ static int bochs_pm_resume(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct drm_device *drm_dev =pci_get_drvdata (pdev); -struct bochs_device *bochs = drm_dev->dev_private;drm_helper_resume_force_mode (drm_dev); -drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,0 ); -drm_kms_helper_poll_enable (drm_dev);return 0 ; }
drivers/gpu/drm/bochs/bochs_fbdev.c +0 -129
138 lines not on this page · raw message
Signature · 1 line
2.9.3
PATCH v3 14/15 drm/bochs: drop old fbdev emulation code
In reply to Gerd HoffmannNot needed any more, bochs uses the generic emulation now.
--- drivers/gpu/drm/bochs/bochs.h | 9 --- drivers/gpu/drm/bochs/bochs_drv.c | 6 -- drivers/gpu/drm/bochs/bochs_fbdev.c | 129 ------------------------------------ 3 files changed, 144 deletions(-)
drivers/gpu/drm/bochs/bochs.h +0 -9
@@ -80,12 +80,6 @@ struct bochs_device {struct ttm_bo_device bdev;bool initialized; } ttm; - -/* fbdev */ -struct { -struct drm_framebuffer *fb; -struct drm_fb_helper helper; - } fb; };struct bochs_bo {
@@ -157,7 +151,4 @@ int bochs_kms_init(struct bochs_device *bochs);void bochs_kms_fini (struct bochs_device *bochs);/* bochs_fbdev.c */ -int bochs_fbdev_init (struct bochs_device *bochs); -void bochs_fbdev_fini (struct bochs_device *bochs); -extern const struct drm_mode_config_funcs bochs_mode_funcs;
drivers/gpu/drm/bochs/bochs_drv.c +0 -6
@@ -102,12 +102,9 @@ static int bochs_pm_suspend(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct drm_device *drm_dev =pci_get_drvdata (pdev); -struct bochs_device *bochs = drm_dev->dev_private;drm_kms_helper_poll_disable (drm_dev); -drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,1 ); -return 0 ; }
@@ -115,12 +112,9 @@ static int bochs_pm_resume(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct drm_device *drm_dev =pci_get_drvdata (pdev); -struct bochs_device *bochs = drm_dev->dev_private;drm_helper_resume_force_mode (drm_dev); -drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,0 ); -drm_kms_helper_poll_enable (drm_dev);return 0 ; }
drivers/gpu/drm/bochs/bochs_fbdev.c +0 -129
138 lines not on this page · raw message
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 14/15] drm/bochs: drop old fbdev emulation code
Den 10.01.2019 09.28, skrev Gerd Hoffmann:
Quoted 41 lines
Not needed any more, bochs uses the generic emulation now.
Signed-off-by Gerd Hoffmann <[email protected]>Reviewed-by Oleksandr Andrushchenko <[email protected]>Acked-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/bochs/bochs.h | 9 --- drivers/gpu/drm/bochs/bochs_drv.c | 6 -- drivers/gpu/drm/bochs/bochs_fbdev.c | 129 ------------------------------------ 3 files changed, 144 deletions(-)drivers/gpu/drm/bochs/bochs.h +0
-9@@ -80,12 +80,6 @@ struct bochs_device {struct ttm_bo_device bdev;bool initialized; } ttm; - -/* fbdev */ -struct { -struct drm_framebuffer *fb; -struct drm_fb_helper helper; - } fb; };struct bochs_bo {@@ -157,7 +151,4 @@ int bochs_kms_init(struct bochs_device *bochs);void bochs_kms_fini (struct bochs_device *bochs);/* bochs_fbdev.c */ -int bochs_fbdev_init (struct bochs_device *bochs); -void bochs_fbdev_fini (struct bochs_device *bochs); -extern const struct drm_mode_config_funcs bochs_mode_funcs;drivers/gpu/drm/bochs/bochs_drv.c +0
-0
drivers/gpu/drm/bochs/bochs_drv.c static int bochs_pm_suspend(struct device *dev) · line 109
Quoted 8 lines
drivers/gpu/drm/bochs/bochs_drv.c +0
-2@@ -102,12 +102,9 @@ static int bochs_pm_suspend(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct drm_device *drm_dev =pci_get_drvdata (pdev); -struct bochs_device *bochs = drm_dev->dev_private;drm_kms_helper_poll_disable (drm_dev); -drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,1 );
The generic fbdev emulation doesn't take care of suspend/resume. You could do this:drm_fb_helper_set_suspend_unlocked(drm_dev->fb_helper, 1);
drivers/gpu/drm/bochs/bochs_drv.c static int bochs_pm_resume(struct device *dev) · line 116
Quoted 11 lines
drivers/gpu/drm/bochs/bochs_drv.c +0
-2-return 0 ; }@@ -115,12 +112,9 @@ static int bochs_pm_resume(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct drm_device *drm_dev =pci_get_drvdata (pdev); -struct bochs_device *bochs = drm_dev->dev_private;drm_helper_resume_force_mode (drm_dev);
The docs for this function has this to say:
* This function is deprecated. New drivers should implement atomic mode-
* setting and use the atomic suspend/resume helpers.
Maybe you can use drm_mode_config_helper_suspend/resume() instead like suggested in the drm_fbdev_generic_setup() docs.
Noralf.
Quoted 151 lines
drivers/gpu/drm/bochs/bochs_drv.c +0
-2-drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,0 ); -drm_kms_helper_poll_enable (drm_dev);return 0 ; }drivers/gpu/drm/bochs/bochs_fbdev.c +0
-129@@ -11,124 +11,6 @@/* ---------------------------------------------------------------------- */ -static int bochsfb_mmap (struct fb_info *info, -struct vm_area_struct *vma) -{ -struct drm_fb_helper *fb_helper = info->par; -struct bochs_bo *bo =gem_to_bochs_bo (fb_helper->fb->obj[0 ]); - -return ttm_fbdev_mmap (vma, &bo->bo); -} - -static struct fb_ops bochsfb_ops = { - .owner =THIS_MODULE , -DRM_FB_HELPER_DEFAULT_OPS , - .fb_fillrect = drm_fb_helper_cfb_fillrect, - .fb_copyarea = drm_fb_helper_cfb_copyarea, - .fb_imageblit = drm_fb_helper_cfb_imageblit, - .fb_mmap = bochsfb_mmap, -}; - -static int bochsfb_create_object (struct bochs_device *bochs, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object **gobj_p) -{ -struct drm_device *dev = bochs->dev; -struct drm_gem_object *gobj; -u32 size; -int ret =0 ; - - size = mode_cmd->pitches[0 ] * mode_cmd->height; - ret =bochs_gem_create (dev, size, true, &gobj); -if (ret) -return ret; - - *gobj_p = gobj; -return ret; -} - -static int bochsfb_create (struct drm_fb_helper *helper, -struct drm_fb_helper_surface_size *sizes) -{ -struct bochs_device *bochs = - container_of(helper, struct bochs_device, fb.helper); -struct fb_info *info; -struct drm_framebuffer *fb; -struct drm_mode_fb_cmd2 mode_cmd; -struct drm_gem_object *gobj =NULL ; -struct bochs_bo *bo =NULL ; -int size, ret; - -if (sizes->surface_bpp !=32 ) -return -EINVAL ; - - mode_cmd.width = sizes->surface_width; - mode_cmd.height = sizes->surface_height; - mode_cmd.pitches[0 ] = sizes->surface_width *4 ; - mode_cmd.pixel_format =DRM_FORMAT_HOST_XRGB8888 ; - size = mode_cmd.pitches[0 ] * mode_cmd.height; - -/* alloc, pin & map bo */ - ret =bochsfb_create_object (bochs, &mode_cmd, &gobj); -if (ret) { -DRM_ERROR ("failed to create fbcon backing object %d\n" , ret); -return ret; - } - - bo =gem_to_bochs_bo (gobj); - - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ); -if (ret) { -DRM_ERROR ("failed to pin fbcon\n" ); -return ret; - } - - ret =ttm_bo_kmap (&bo->bo,0 , bo->bo.num_pages, - &bo->kmap); -if (ret) { -DRM_ERROR ("failed to kmap fbcon\n" ); -return ret; - } - -/* init fb device */ - info =drm_fb_helper_alloc_fbi (helper); -if (IS_ERR (info)) { -DRM_ERROR ("Failed to allocate fbi: %ld\n" ,PTR_ERR (info)); -return PTR_ERR (info); - } - - info->par = &bochs->fb.helper; - - fb =drm_gem_fbdev_fb_create (bochs->dev, sizes,0 , gobj,NULL ); -if (IS_ERR (fb)) { -DRM_ERROR ("Failed to create framebuffer: %ld\n" ,PTR_ERR (fb)); -return PTR_ERR (fb); - } - -/* setup helper */ - bochs->fb.helper.fb = fb; - -strcpy (info->fix.id,"bochsdrmfb" ); - - info->fbops = &bochsfb_ops; - -drm_fb_helper_fill_fix (info, fb->pitches[0 ], fb->format->depth); -drm_fb_helper_fill_var (info, &bochs->fb.helper, sizes->fb_width, - sizes->fb_height); - - info->screen_base = bo->kmap.virtual; - info->screen_size = size; - -drm_vma_offset_remove (&bo->bo.bdev->vma_manager, &bo->bo.vma_node); - info->fix.smem_start =0 ; - info->fix.smem_len = size; -return 0 ; -} - -static const struct drm_fb_helper_funcs bochs_fb_helper_funcs = { - .fb_probe = bochsfb_create, -}; -static struct drm_framebuffer *bochs_gem_fb_create (struct drm_device *dev,struct drm_file *file,const struct drm_mode_fb_cmd2 *mode_cmd)@@ -145,14 +27,3 @@ const struct drm_mode_config_funcs bochs_mode_funcs = { .atomic_check = drm_atomic_helper_check, .atomic_commit = drm_atomic_helper_commit, }; - -int bochs_fbdev_init (struct bochs_device *bochs) -{ -return drm_fb_helper_fbdev_setup (bochs->dev, &bochs->fb.helper, - &bochs_fb_helper_funcs,32 ,1 ); -} - -void bochs_fbdev_fini (struct bochs_device *bochs) -{ -drm_fb_helper_fbdev_teardown (bochs->dev); -}
Re: [PATCH v3 14/15] drm/bochs: drop old fbdev emulation code
In reply to Gerd HoffmannDen 10.01.2019 09.28, skrev Gerd Hoffmann:
Quoted 41 lines
Not needed any more, bochs uses the generic emulation now.
Signed-off-by Gerd Hoffmann <[email protected]>Reviewed-by Oleksandr Andrushchenko <[email protected]>Acked-by Daniel Vetter <[email protected]>--- drivers/gpu/drm/bochs/bochs.h | 9 --- drivers/gpu/drm/bochs/bochs_drv.c | 6 -- drivers/gpu/drm/bochs/bochs_fbdev.c | 129 ------------------------------------ 3 files changed, 144 deletions(-)drivers/gpu/drm/bochs/bochs.h +0
-9@@ -80,12 +80,6 @@ struct bochs_device {struct ttm_bo_device bdev;bool initialized; } ttm; - -/* fbdev */ -struct { -struct drm_framebuffer *fb; -struct drm_fb_helper helper; - } fb; };struct bochs_bo {@@ -157,7 +151,4 @@ int bochs_kms_init(struct bochs_device *bochs);void bochs_kms_fini (struct bochs_device *bochs);/* bochs_fbdev.c */ -int bochs_fbdev_init (struct bochs_device *bochs); -void bochs_fbdev_fini (struct bochs_device *bochs); -extern const struct drm_mode_config_funcs bochs_mode_funcs;drivers/gpu/drm/bochs/bochs_drv.c +0
-0
drivers/gpu/drm/bochs/bochs_drv.c static int bochs_pm_suspend(struct device *dev) · line 109
Quoted 8 lines
drivers/gpu/drm/bochs/bochs_drv.c +0
-2@@ -102,12 +102,9 @@ static int bochs_pm_suspend(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct drm_device *drm_dev =pci_get_drvdata (pdev); -struct bochs_device *bochs = drm_dev->dev_private;drm_kms_helper_poll_disable (drm_dev); -drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,1 );
The generic fbdev emulation doesn't take care of suspend/resume. You could do this:drm_fb_helper_set_suspend_unlocked(drm_dev->fb_helper, 1);
drivers/gpu/drm/bochs/bochs_drv.c static int bochs_pm_resume(struct device *dev) · line 116
Quoted 11 lines
drivers/gpu/drm/bochs/bochs_drv.c +0
-2-return 0 ; }@@ -115,12 +112,9 @@ static int bochs_pm_resume(struct device *dev) {struct pci_dev *pdev =to_pci_dev (dev);struct drm_device *drm_dev =pci_get_drvdata (pdev); -struct bochs_device *bochs = drm_dev->dev_private;drm_helper_resume_force_mode (drm_dev);
The docs for this function has this to say:
* This function is deprecated. New drivers should implement atomic mode-
* setting and use the atomic suspend/resume helpers.
Maybe you can use drm_mode_config_helper_suspend/resume() instead like suggested in the drm_fbdev_generic_setup() docs.
Noralf.
Quoted 141 lines
drivers/gpu/drm/bochs/bochs_drv.c +0
-2-drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,0 ); -drm_kms_helper_poll_enable (drm_dev);return 0 ; }drivers/gpu/drm/bochs/bochs_fbdev.c +0
-119@@ -11,124 +11,6 @@/* ---------------------------------------------------------------------- */ -static int bochsfb_mmap (struct fb_info *info, -struct vm_area_struct *vma) -{ -struct drm_fb_helper *fb_helper = info->par; -struct bochs_bo *bo =gem_to_bochs_bo (fb_helper->fb->obj[0 ]); - -return ttm_fbdev_mmap (vma, &bo->bo); -} - -static struct fb_ops bochsfb_ops = { - .owner =THIS_MODULE , -DRM_FB_HELPER_DEFAULT_OPS , - .fb_fillrect = drm_fb_helper_cfb_fillrect, - .fb_copyarea = drm_fb_helper_cfb_copyarea, - .fb_imageblit = drm_fb_helper_cfb_imageblit, - .fb_mmap = bochsfb_mmap, -}; - -static int bochsfb_create_object (struct bochs_device *bochs, -const struct drm_mode_fb_cmd2 *mode_cmd, -struct drm_gem_object **gobj_p) -{ -struct drm_device *dev = bochs->dev; -struct drm_gem_object *gobj; -u32 size; -int ret =0 ; - - size = mode_cmd->pitches[0 ] * mode_cmd->height; - ret =bochs_gem_create (dev, size, true, &gobj); -if (ret) -return ret; - - *gobj_p = gobj; -return ret; -} - -static int bochsfb_create (struct drm_fb_helper *helper, -struct drm_fb_helper_surface_size *sizes) -{ -struct bochs_device *bochs = - container_of(helper, struct bochs_device, fb.helper); -struct fb_info *info; -struct drm_framebuffer *fb; -struct drm_mode_fb_cmd2 mode_cmd; -struct drm_gem_object *gobj =NULL ; -struct bochs_bo *bo =NULL ; -int size, ret; - -if (sizes->surface_bpp !=32 ) -return -EINVAL ; - - mode_cmd.width = sizes->surface_width; - mode_cmd.height = sizes->surface_height; - mode_cmd.pitches[0 ] = sizes->surface_width *4 ; - mode_cmd.pixel_format =DRM_FORMAT_HOST_XRGB8888 ; - size = mode_cmd.pitches[0 ] * mode_cmd.height; - -/* alloc, pin & map bo */ - ret =bochsfb_create_object (bochs, &mode_cmd, &gobj); -if (ret) { -DRM_ERROR ("failed to create fbcon backing object %d\n" , ret); -return ret; - } - - bo =gem_to_bochs_bo (gobj); - - ret =bochs_bo_pin (bo,TTM_PL_FLAG_VRAM ); -if (ret) { -DRM_ERROR ("failed to pin fbcon\n" ); -return ret; - } - - ret =ttm_bo_kmap (&bo->bo,0 , bo->bo.num_pages, - &bo->kmap); -if (ret) { -DRM_ERROR ("failed to kmap fbcon\n" ); -return ret; - } - -/* init fb device */ - info =drm_fb_helper_alloc_fbi (helper); -if (IS_ERR (info)) { -DRM_ERROR ("Failed to allocate fbi: %ld\n" ,PTR_ERR (info)); -return PTR_ERR (info); - } - - info->par = &bochs->fb.helper; - - fb =drm_gem_fbdev_fb_create (bochs->dev, sizes,0 , gobj,NULL ); -if (IS_ERR (fb)) { -DRM_ERROR ("Failed to create framebuffer: %ld\n" ,PTR_ERR (fb)); -return PTR_ERR (fb); - } - -/* setup helper */ - bochs->fb.helper.fb = fb; - -strcpy (info->fix.id,"bochsdrmfb" ); - - info->fbops = &bochsfb_ops; - -drm_fb_helper_fill_fix (info, fb->pitches[0 ], fb->format->depth); -drm_fb_helper_fill_var (info, &bochs->fb.helper, sizes->fb_width, - sizes->fb_height); - - info->screen_base = bo->kmap.virtual; - info->screen_size = size; - -drm_vma_offset_remove (&bo->bo.bdev->vma_manager, &bo->bo.vma_node); - info->fix.smem_start =0 ; - info->fix.smem_len = size; -return 0 ; -} - -static const struct drm_fb_helper_funcs bochs_fb_helper_funcs = { - .fb_probe = bochsfb_create, -}; -static struct drm_framebuffer *bochs_gem_fb_create (struct drm_device *dev,struct drm_file *file,const struct drm_mode_fb_cmd2 *mode_cmd)@@ -145,14 +27,3 @@ const struct drm_mode_config_funcs bochs_mode_funcs = { .atomic_check = drm_atomic_helper_check, .atomic_commit = drm_atomic_helper_commit, }; -
drivers/gpu/drm/bochs/bochs_fbdev.c const struct drm_mode_config_funcs bochs_mode_funcs = { · line 158
Quoted 10 lines
drivers/gpu/drm/bochs/bochs_fbdev.c +0
-10-int bochs_fbdev_init (struct bochs_device *bochs) -{ -return drm_fb_helper_fbdev_setup (bochs->dev, &bochs->fb.helper, - &bochs_fb_helper_funcs,32 ,1 ); -} - -void bochs_fbdev_fini (struct bochs_device *bochs) -{ -drm_fb_helper_fbdev_teardown (bochs->dev); -}
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 14/15] drm/bochs: drop old fbdev emulation code
Hi,
Quoted 5 lines
drivers/gpu/drm/bochs/bochs_drv.c static int bochs_pm_suspend(struct device *dev) · line 109
Quoted 1 line
drivers/gpu/drm/bochs/bochs_drv.c +0
-1-drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,1 );The generic fbdev emulation doesn't take care of suspend/resume. You could do this:
drm_fb_helper_set_suspend_unlocked(drm_dev->fb_helper, 1);
Additional to drm_mode_config_helper_suspend() I assume? Does the call order matter?
Quoted 8 lines
Quoted 1 line
drm_helper_resume_force_mode(drm_dev);The docs for this function has this to say:
* This function is deprecated. New drivers should implement atomic mode-
* setting and use the atomic suspend/resume helpers.Maybe you can use drm_mode_config_helper_suspend/resume() instead like suggested in the
drm_fbdev_generic_setup()docs.
That should work, yes. The driver is simple enough ;)
cheers,
Gerd
Re: [PATCH v3 14/15] drm/bochs: drop old fbdev emulation code
Den 10.01.2019 11.16, skrev Gerd Hoffmann:
Quoted 9 lines
Hi,
Quoted 5 lines
drivers/gpu/drm/bochs/bochs_drv.c static int bochs_pm_suspend(struct device *dev) · line 109
Quoted 1 line
drivers/gpu/drm/bochs/bochs_drv.c +0
-1-drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,1 );The generic fbdev emulation doesn't take care of suspend/resume. You could do this:
drm_fb_helper_set_suspend_unlocked(drm_dev->fb_helper, 1);Additional to
drm_mode_config_helper_suspend()I assume?
No, sorry for the confusion. I didn't know if you could use drm_mode_config_helper_suspend() or not. That function takes care of fbdev suspend as well:
int drm_mode_config_helper_suspend(struct drm_device *dev) {
<...>
drm_kms_helper_poll_disable(dev); drm_fb_helper_set_suspend_unlocked(dev->fb_helper, 1); state = drm_atomic_helper_suspend(dev);
<...>
}
Quoted 16 lines
Does the call order matter?
Quoted 8 lines
Quoted 1 line
drm_helper_resume_force_mode(drm_dev);The docs for this function has this to say:
* This function is deprecated. New drivers should implement atomic mode-
* setting and use the atomic suspend/resume helpers.Maybe you can use drm_mode_config_helper_suspend/resume() instead like suggested in the
drm_fbdev_generic_setup()docs.That should work, yes. The driver is simple enough ;)
cheers,
Gerd
Re: [PATCH v3 14/15] drm/bochs: drop old fbdev emulation code
In reply to Gerd HoffmannDen 10.01.2019 11.16, skrev Gerd Hoffmann:
Quoted 9 lines
Hi,
Quoted 5 lines
drivers/gpu/drm/bochs/bochs_drv.c static int bochs_pm_suspend(struct device *dev) · line 109
Quoted 1 line
drivers/gpu/drm/bochs/bochs_drv.c +0
-1-drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,1 );The generic fbdev emulation doesn't take care of suspend/resume. You could do this:
drm_fb_helper_set_suspend_unlocked(drm_dev->fb_helper, 1);Additional to
drm_mode_config_helper_suspend()I assume?
No, sorry for the confusion. I didn't know if you could use drm_mode_config_helper_suspend() or not. That function takes care of fbdev suspend as well:
int drm_mode_config_helper_suspend(struct drm_device *dev) {
<...>
drm_kms_helper_poll_disable(dev); drm_fb_helper_set_suspend_unlocked(dev->fb_helper, 1); state = drm_atomic_helper_suspend(dev);
<...>
}
Quoted 8 lines
Does the call order matter?
Quoted 6 lines
Quoted 1 line
drm_helper_resume_force_mode(drm_dev);The docs for this function has this to say:
* This function is deprecated. New drivers should implement atomic mode-
* setting and use the atomic suspend/resume helpers.
Quoted 8 lines
Quoted 2 lines
Maybe you can use drm_mode_config_helper_suspend/resume() instead like suggested in the
drm_fbdev_generic_setup()docs.That should work, yes. The driver is simple enough ;)
cheers,
Gerd
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v3 14/15] drm/bochs: drop old fbdev emulation code
In reply to Noralf TrønnesHi,
Quoted 5 lines
drivers/gpu/drm/bochs/bochs_drv.c static int bochs_pm_suspend(struct device *dev) · line 109
Quoted 1 line
drivers/gpu/drm/bochs/bochs_drv.c +0
-1-drm_fb_helper_set_suspend_unlocked (&bochs->fb.helper,1 );The generic fbdev emulation doesn't take care of suspend/resume. You could do this:
drm_fb_helper_set_suspend_unlocked(drm_dev->fb_helper, 1);
Additional to drm_mode_config_helper_suspend() I assume? Does the call order matter?
Quoted 8 lines
Quoted 1 line
drm_helper_resume_force_mode(drm_dev);The docs for this function has this to say:
* This function is deprecated. New drivers should implement atomic mode-
* setting and use the atomic suspend/resume helpers.Maybe you can use drm_mode_config_helper_suspend/resume() instead like suggested in the
drm_fbdev_generic_setup()docs.
That should work, yes. The driver is simple enough ;)
cheers,
Gerd
PATCH v3 15/15 drm/bochs: move remaining fb bits to kms
In reply to Gerd Hoffmannbochs_fbdev.c is almost empty now. Move the remaining framebuffer bits over to bochs_kms.c. Pure code motion. No functional change.
--- drivers/gpu/drm/bochs/bochs_fbdev.c | 29 ----------------------------- drivers/gpu/drm/bochs/bochs_kms.c | 17 +++++++++++++++++ drivers/gpu/drm/bochs/Makefile | 2 +- 3 files changed, 18 insertions(+), 30 deletions(-) delete mode 100644 drivers/gpu/drm/bochs/bochs_fbdev.c
drivers/gpu/drm/bochs/bochs_fbdev.c deleted +0 -29
@@ -1,29 +0,0 @@ -/* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -*/ - -#include "bochs.h" -#include <drm/drm_atomic_helper.h> -#include <drm/drm_gem_framebuffer_helper.h> - -/* ---------------------------------------------------------------------- */ - -static struct drm_framebuffer * -bochs_gem_fb_create (struct drm_device *dev,struct drm_file *file, -const struct drm_mode_fb_cmd2 *mode_cmd) -{ -if (mode_cmd->pixel_format !=DRM_FORMAT_XRGB8888 && - mode_cmd->pixel_format !=DRM_FORMAT_BGRX8888 ) -return ERR_PTR (-EINVAL ); - -return drm_gem_fb_create (dev, file, mode_cmd); -} - -const struct drm_mode_config_funcs bochs_mode_funcs = { - .fb_create = bochs_gem_fb_create, - .atomic_check = drm_atomic_helper_check, - .atomic_commit = drm_atomic_helper_commit, -};
drivers/gpu/drm/bochs/bochs_kms.c +17 -0
@@ -9,6 +9,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_gem_framebuffer_helper.h> static int defx =1024 ;static int defy =768 ;
@@ -256,6 +257,22 @@ static void bochs_connector_init(struct drm_device *dev) } } +static struct drm_framebuffer * +bochs_gem_fb_create (struct drm_device *dev,struct drm_file *file, +const struct drm_mode_fb_cmd2 *mode_cmd) +{ +if (mode_cmd->pixel_format !=DRM_FORMAT_XRGB8888 && + mode_cmd->pixel_format !=DRM_FORMAT_BGRX8888 ) +return ERR_PTR (-EINVAL ); + +return drm_gem_fb_create (dev, file, mode_cmd); +} + +const struct drm_mode_config_funcs bochs_mode_funcs = { + .fb_create = bochs_gem_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +};int bochs_kms_init (struct bochs_device *bochs) {
drivers/gpu/drm/bochs/Makefile +1 -1
@@ -1,3 +1,3 @@ -bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_fbdev.o bochs_hw.o +bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_hw.o obj-$(CONFIG_DRM_BOCHS) += bochs-drm.o
Signature · 1 line
2.9.3
PATCH v3 15/15 drm/bochs: move remaining fb bits to kms
In reply to Gerd Hoffmannbochs_fbdev.c is almost empty now. Move the remaining framebuffer bits over to bochs_kms.c. Pure code motion. No functional change.
--- drivers/gpu/drm/bochs/bochs_fbdev.c | 29 ----------------------------- drivers/gpu/drm/bochs/bochs_kms.c | 17 +++++++++++++++++ drivers/gpu/drm/bochs/Makefile | 2 +- 3 files changed, 18 insertions(+), 30 deletions(-) delete mode 100644 drivers/gpu/drm/bochs/bochs_fbdev.c
drivers/gpu/drm/bochs/bochs_fbdev.c deleted +0 -29
@@ -1,29 +0,0 @@ -/* -* This program is free software; you can redistribute it and/or modify -* it under the terms of the GNU General Public License as published by -* the Free Software Foundation; either version 2 of the License, or -* (at your option) any later version. -*/ - -#include "bochs.h" -#include <drm/drm_atomic_helper.h> -#include <drm/drm_gem_framebuffer_helper.h> - -/* ---------------------------------------------------------------------- */ - -static struct drm_framebuffer * -bochs_gem_fb_create (struct drm_device *dev,struct drm_file *file, -const struct drm_mode_fb_cmd2 *mode_cmd) -{ -if (mode_cmd->pixel_format !=DRM_FORMAT_XRGB8888 && - mode_cmd->pixel_format !=DRM_FORMAT_BGRX8888 ) -return ERR_PTR (-EINVAL ); - -return drm_gem_fb_create (dev, file, mode_cmd); -} - -const struct drm_mode_config_funcs bochs_mode_funcs = { - .fb_create = bochs_gem_fb_create, - .atomic_check = drm_atomic_helper_check, - .atomic_commit = drm_atomic_helper_commit, -};
drivers/gpu/drm/bochs/bochs_kms.c +17 -0
@@ -9,6 +9,7 @@#include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_atomic_uapi.h> +#include <drm/drm_gem_framebuffer_helper.h> static int defx =1024 ;static int defy =768 ;
@@ -256,6 +257,22 @@ static void bochs_connector_init(struct drm_device *dev) } } +static struct drm_framebuffer * +bochs_gem_fb_create (struct drm_device *dev,struct drm_file *file, +const struct drm_mode_fb_cmd2 *mode_cmd) +{ +if (mode_cmd->pixel_format !=DRM_FORMAT_XRGB8888 && + mode_cmd->pixel_format !=DRM_FORMAT_BGRX8888 ) +return ERR_PTR (-EINVAL ); + +return drm_gem_fb_create (dev, file, mode_cmd); +} + +const struct drm_mode_config_funcs bochs_mode_funcs = { + .fb_create = bochs_gem_fb_create, + .atomic_check = drm_atomic_helper_check, + .atomic_commit = drm_atomic_helper_commit, +};int bochs_kms_init (struct bochs_device *bochs) {
drivers/gpu/drm/bochs/Makefile +1 -1
@@ -1,3 +1,3 @@ -bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_fbdev.o bochs_hw.o +bochs-drm-y := bochs_drv.o bochs_mm.o bochs_kms.o bochs_hw.o obj-$(CONFIG_DRM_BOCHS) += bochs-drm.o
Signature · 6 lines
2.9.3 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel