drm/vkms: Add support for vkms work without vblank
PATCH 1/1 drm/vkms: Add support for vkms work without vblank
Currently, vkms needs VBlank to work well. This patch adds another operation model that make vkms works without VBlank support.
--- drivers/gpu/drm/vkms/vkms_crtc.c | 10 ++++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 12 ++++++++++-- drivers/gpu/drm/vkms/vkms_drv.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-)
drivers/gpu/drm/vkms/vkms_crtc.c +10 -0
@@ -145,12 +145,22 @@ static const struct drm_crtc_funcs vkms_crtc_funcs = {static void vkms_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_on (crtc); }static void vkms_crtc_atomic_disable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_off (crtc); }
drivers/gpu/drm/vkms/vkms_drv.c +10 -2
@@ -21,6 +21,10 @@static struct vkms_device *vkms_device; +static bool disable_vblank; +module_param_named (disablevblank, disable_vblank, bool,0444 ); +MODULE_PARM_DESC (disablevblank,"Disable vblank interrupt" ); +static const struct file_operations vkms_driver_fops = { .owner =THIS_MODULE , .open = drm_open,
@@ -105,9 +109,13 @@ static int __init vkms_init(void) goto out_fini; } - vkms_device->drm.irq_enabled = true; + vkms_device->output.disable_vblank = disable_vblank; + vkms_device->drm.irq_enabled = !disable_vblank ? true : false; + +if (disable_vblank) +DRM_INFO ("Virtual Hardware mode enabled" ); - ret =drm_vblank_init (&vkms_device->drm,1 ); + ret = (disable_vblank) ?0 :drm_vblank_init (&vkms_device->drm,1 );if (ret) {DRM_ERROR ("Failed to vblank\n" ); goto out_fini;
drivers/gpu/drm/vkms/vkms_drv.h +1 -0
@@ -52,6 +52,7 @@ struct vkms_output {struct drm_encoder encoder;struct drm_connector connector;struct hrtimer vblank_hrtimer; +bool disable_vblank;ktime_t period_ns;struct drm_pending_vblank_event *event;bool crc_enabled;
Signature · 5 lines
2.18.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 42 lines · Rodrigo Siqueira
Currently, vkms needs VBlank to work well. This patch adds another operation model that make vkms works without VBlank support.
Signed-off-by Rodrigo Siqueira <[email protected]>--- drivers/gpu/drm/vkms/vkms_crtc.c | 10 ++++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 12 ++++++++++-- drivers/gpu/drm/vkms/vkms_drv.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-)drivers/gpu/drm/vkms/vkms_crtc.c +10
-0@@ -145,12 +145,22 @@ static const struct drm_crtc_funcs vkms_crtc_funcs = {static void vkms_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_on (crtc); }static void vkms_crtc_atomic_disable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_off (crtc); }drivers/gpu/drm/vkms/vkms_drv.c +0
-0
drivers/gpu/drm/vkms/vkms_drv.c line 26
Quoted 6 lines
drivers/gpu/drm/vkms/vkms_drv.c +3
-0@@ -21,6 +21,10 @@static struct vkms_device *vkms_device; +static bool disable_vblank; +module_param_named (disablevblank, disable_vblank, bool,0444 ); +MODULE_PARM_DESC (disablevblank,"Disable vblank interrupt" );
I think the info output is much clearer, I'd rename this to virtual_hw, with 0 as default, and a help text along of "Enable virtual HW mode (disables vblanks and immediately completes flips)."
Quoted 25 lines
drivers/gpu/drm/vkms/vkms_drv.c +7
-2+static const struct file_operations vkms_driver_fops = { .owner =THIS_MODULE , .open = drm_open,@@ -105,9 +109,13 @@ static int __init vkms_init(void) goto out_fini; } - vkms_device->drm.irq_enabled = true; + vkms_device->output.disable_vblank = disable_vblank; + vkms_device->drm.irq_enabled = !disable_vblank ? true : false; + +if (disable_vblank) +DRM_INFO ("Virtual Hardware mode enabled" ); - ret =drm_vblank_init (&vkms_device->drm,1 ); + ret = (disable_vblank) ?0 :drm_vblank_init (&vkms_device->drm,1 );if (ret) {DRM_ERROR ("Failed to vblank\n" ); goto out_fini;drivers/gpu/drm/vkms/vkms_drv.h +0
-0
drivers/gpu/drm/vkms/vkms_drv.h struct vkms_output { · line 58
Quoted 7 lines
drivers/gpu/drm/vkms/vkms_drv.h +1
-0@@ -52,6 +52,7 @@ struct vkms_output {struct drm_encoder encoder;struct drm_connector connector;struct hrtimer vblank_hrtimer; +bool disable_vblank;ktime_t period_ns;struct drm_pending_vblank_event *event;bool crc_enabled;
The vblank handling parts look correct to me.
Does kms_flip work with this? Virtual hw immediately completes the drm_crtc_state->event in the atomic_update callback, that part seems to be missing from your patch.
Also I like the idea of switching away from the generic -EINVAL to -ENOTTY for when vblanks aren't supported. Do you have that somewhere (as a separate patch).
-Daniel
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 46 lines · Daniel Vetter
Quoted 45 lines · Rodrigo Siqueira
Currently, vkms needs VBlank to work well. This patch adds another operation model that make vkms works without VBlank support.
Signed-off-by Rodrigo Siqueira <[email protected]>--- drivers/gpu/drm/vkms/vkms_crtc.c | 10 ++++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 12 ++++++++++-- drivers/gpu/drm/vkms/vkms_drv.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-)drivers/gpu/drm/vkms/vkms_crtc.c +10
-0@@ -145,12 +145,22 @@ static const struct drm_crtc_funcs vkms_crtc_funcs = {static void vkms_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_on (crtc); }static void vkms_crtc_atomic_disable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_off (crtc); }drivers/gpu/drm/vkms/vkms_drv.c +0
-0@@ -21,6 +21,10 @@static struct vkms_device *vkms_device;
Quoted 7 lines
drivers/gpu/drm/vkms/vkms_drv.c line 26
Quoted 3 lines
drivers/gpu/drm/vkms/vkms_drv.c +3
-0+static bool disable_vblank; +module_param_named (disablevblank, disable_vblank, bool,0444 ); +MODULE_PARM_DESC (disablevblank,"Disable vblank interrupt" );I think the info output is much clearer, I'd rename this to
virtual_hw, with 0 as default, and a help text along of "Enable virtual HW mode (disables vblanks and immediately completes flips)."
You right, virtual_hw is much better :)
I will fix it.
Quoted 35 lines
Quoted 25 lines
drivers/gpu/drm/vkms/vkms_drv.c +7
-2+static const struct file_operations vkms_driver_fops = { .owner =THIS_MODULE , .open = drm_open,@@ -105,9 +109,13 @@ static int __init vkms_init(void) goto out_fini; } - vkms_device->drm.irq_enabled = true; + vkms_device->output.disable_vblank = disable_vblank; + vkms_device->drm.irq_enabled = !disable_vblank ? true : false; + +if (disable_vblank) +DRM_INFO ("Virtual Hardware mode enabled" ); - ret =drm_vblank_init (&vkms_device->drm,1 ); + ret = (disable_vblank) ?0 :drm_vblank_init (&vkms_device->drm,1 );if (ret) {DRM_ERROR ("Failed to vblank\n" ); goto out_fini;drivers/gpu/drm/vkms/vkms_drv.h +0
-0drivers/gpu/drm/vkms/vkms_drv.h struct vkms_output { · line 58
Quoted 7 lines
drivers/gpu/drm/vkms/vkms_drv.h +1
-0@@ -52,6 +52,7 @@ struct vkms_output {struct drm_encoder encoder;struct drm_connector connector;struct hrtimer vblank_hrtimer; +bool disable_vblank;ktime_t period_ns;struct drm_pending_vblank_event *event;bool crc_enabled;The vblank handling parts look correct to me.
Quoted 3 lines
Does
kms_flipwork with this? Virtual hw immediately completes thedrm_crtc_state->eventin theatomic_updatecallback, that part seems to be missing from your patch.
I tested with patched version of kms_flip to skip vblank. Here is the patch:
https://patchwork.kernel.org/patch/10570861/
About the drm_crtc_state->event, afaiu, the code in the function vkms_crtc_atomic_flush immediately send the vblank event to the user space via drm_crtc_send_vblank_event which make things work in the user space. Make sense? Or I missed something?
Quoted 3 lines
Also I like the idea of switching away from the generic
-EINVALto-ENOTTYfor when vblanks aren't supported. Do you have that somewhere (as a separate patch).
I already started to investigate if the change between -EINVAL to -ENOTTY will break an existing kms userspace compositors. I already checked:
* kwin
* sway
* wayland-core
* weston
I still have to check the X drivers, chromium, and drm_hwc.
Thanks for the feedback.
Quoted 5 lines
-Daniel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 9 lines
Rodrigo Siqueira http://siqueira.tech Graduate Student Department of Computer Science University of São Paulo _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 97 lines · Rodrigo Siqueira
Quoted 46 lines · Daniel Vetter
Quoted 45 lines · Rodrigo Siqueira
Currently, vkms needs VBlank to work well. This patch adds another operation model that make vkms works without VBlank support.
Signed-off-by Rodrigo Siqueira <[email protected]>--- drivers/gpu/drm/vkms/vkms_crtc.c | 10 ++++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 12 ++++++++++-- drivers/gpu/drm/vkms/vkms_drv.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-)drivers/gpu/drm/vkms/vkms_crtc.c +10
-0@@ -145,12 +145,22 @@ static const struct drm_crtc_funcs vkms_crtc_funcs = {static void vkms_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_on (crtc); }static void vkms_crtc_atomic_disable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_off (crtc); }drivers/gpu/drm/vkms/vkms_drv.c +0
-0@@ -21,6 +21,10 @@static struct vkms_device *vkms_device;Quoted 7 lines
drivers/gpu/drm/vkms/vkms_drv.c line 26
Quoted 3 lines
drivers/gpu/drm/vkms/vkms_drv.c +3
-0+static bool disable_vblank; +module_param_named (disablevblank, disable_vblank, bool,0444 ); +MODULE_PARM_DESC (disablevblank,"Disable vblank interrupt" );I think the info output is much clearer, I'd rename this to
virtual_hw, with 0 as default, and a help text along of "Enable virtual HW mode (disables vblanks and immediately completes flips)."You right,
virtual_hwis much better :)
I will fix it.Quoted 35 lines
Quoted 25 lines
drivers/gpu/drm/vkms/vkms_drv.c +7
-2+static const struct file_operations vkms_driver_fops = { .owner =THIS_MODULE , .open = drm_open,@@ -105,9 +109,13 @@ static int __init vkms_init(void) goto out_fini; } - vkms_device->drm.irq_enabled = true; + vkms_device->output.disable_vblank = disable_vblank; + vkms_device->drm.irq_enabled = !disable_vblank ? true : false; + +if (disable_vblank) +DRM_INFO ("Virtual Hardware mode enabled" ); - ret =drm_vblank_init (&vkms_device->drm,1 ); + ret = (disable_vblank) ?0 :drm_vblank_init (&vkms_device->drm,1 );if (ret) {DRM_ERROR ("Failed to vblank\n" ); goto out_fini;drivers/gpu/drm/vkms/vkms_drv.h +0
-0drivers/gpu/drm/vkms/vkms_drv.h struct vkms_output { · line 58
Quoted 7 lines
drivers/gpu/drm/vkms/vkms_drv.h +1
-0@@ -52,6 +52,7 @@ struct vkms_output {struct drm_encoder encoder;struct drm_connector connector;struct hrtimer vblank_hrtimer; +bool disable_vblank;ktime_t period_ns;struct drm_pending_vblank_event *event;bool crc_enabled;The vblank handling parts look correct to me.
Quoted 3 lines
Does
kms_flipwork with this? Virtual hw immediately completes thedrm_crtc_state->eventin theatomic_updatecallback, that part seems to be missing from your patch.
Quoted 8 lines
I tested with patched version of
kms_flipto skip vblank. Here is the patch:https://patchwork.kernel.org/patch/10570861/
About the
drm_crtc_state->event, afaiu, the code in the functionvkms_crtc_atomic_flushimmediately send the vblank event to the user space viadrm_crtc_send_vblank_eventwhich make things work in the user space. Make sense? Or I missed something?
Ah, the magic of the vblank_get() == 0 check. A bit tricky, but yes this indeed works. I think it'd be good to explain this in the commit message.
Quoted 8 lines
Quoted 3 lines
Also I like the idea of switching away from the generic
-EINVALto-ENOTTYfor when vblanks aren't supported. Do you have that somewhere (as a separate patch).I already started to investigate if the change between
-EINVALto-ENOTTYwill break an existing kms userspace compositors. I already checked:
Quoted 6 lines
* kwin
* sway
* wayland-core
* westonI still have to check the X drivers, chromium, and
drm_hwc.
Awesome, keep up the great work.
Cheers, Daniel
Quoted 15 lines
Thanks for the feedback.
Quoted 5 lines
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch--
Rodrigo Siqueira
http://siqueira.tech
Graduate Student
Department of Computer Science
University of São Paulo
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thanks for the feedbacks,
I will prepare a V2 based on your suggestions.
Quoted 153 lines · Daniel Vetter
Quoted 97 lines · Rodrigo Siqueira
Quoted 46 lines · Daniel Vetter
Quoted 45 lines · Rodrigo Siqueira
Currently, vkms needs VBlank to work well. This patch adds another operation model that make vkms works without VBlank support.
Signed-off-by Rodrigo Siqueira <[email protected]>--- drivers/gpu/drm/vkms/vkms_crtc.c | 10 ++++++++++ drivers/gpu/drm/vkms/vkms_drv.c | 12 ++++++++++-- drivers/gpu/drm/vkms/vkms_drv.h | 1 + 3 files changed, 21 insertions(+), 2 deletions(-)drivers/gpu/drm/vkms/vkms_crtc.c +10
-0@@ -145,12 +145,22 @@ static const struct drm_crtc_funcs vkms_crtc_funcs = {static void vkms_crtc_atomic_enable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_on (crtc); }static void vkms_crtc_atomic_disable (struct drm_crtc *crtc,struct drm_crtc_state *old_state) { +struct vkms_output *vkms_out =drm_crtc_to_vkms_output (crtc); + +if (vkms_out->disable_vblank) +return ; +drm_crtc_vblank_off (crtc); }drivers/gpu/drm/vkms/vkms_drv.c +0
-0@@ -21,6 +21,10 @@static struct vkms_device *vkms_device;Quoted 7 lines
drivers/gpu/drm/vkms/vkms_drv.c line 26
Quoted 3 lines
drivers/gpu/drm/vkms/vkms_drv.c +3
-0+static bool disable_vblank; +module_param_named (disablevblank, disable_vblank, bool,0444 ); +MODULE_PARM_DESC (disablevblank,"Disable vblank interrupt" );I think the info output is much clearer, I'd rename this to
virtual_hw, with 0 as default, and a help text along of "Enable virtual HW mode (disables vblanks and immediately completes flips)."You right,
virtual_hwis much better :)
I will fix it.Quoted 35 lines
Quoted 25 lines
drivers/gpu/drm/vkms/vkms_drv.c +7
-2+static const struct file_operations vkms_driver_fops = { .owner =THIS_MODULE , .open = drm_open,@@ -105,9 +109,13 @@ static int __init vkms_init(void) goto out_fini; } - vkms_device->drm.irq_enabled = true; + vkms_device->output.disable_vblank = disable_vblank; + vkms_device->drm.irq_enabled = !disable_vblank ? true : false; + +if (disable_vblank) +DRM_INFO ("Virtual Hardware mode enabled" ); - ret =drm_vblank_init (&vkms_device->drm,1 ); + ret = (disable_vblank) ?0 :drm_vblank_init (&vkms_device->drm,1 );if (ret) {DRM_ERROR ("Failed to vblank\n" ); goto out_fini;drivers/gpu/drm/vkms/vkms_drv.h +0
-0drivers/gpu/drm/vkms/vkms_drv.h struct vkms_output { · line 58
Quoted 7 lines
drivers/gpu/drm/vkms/vkms_drv.h +1
-0@@ -52,6 +52,7 @@ struct vkms_output {struct drm_encoder encoder;struct drm_connector connector;struct hrtimer vblank_hrtimer; +bool disable_vblank;ktime_t period_ns;struct drm_pending_vblank_event *event;bool crc_enabled;The vblank handling parts look correct to me.
Quoted 3 lines
Does
kms_flipwork with this? Virtual hw immediately completes thedrm_crtc_state->eventin theatomic_updatecallback, that part seems to be missing from your patch.Quoted 8 lines
I tested with patched version of
kms_flipto skip vblank. Here is the patch:https://patchwork.kernel.org/patch/10570861/
About the
drm_crtc_state->event, afaiu, the code in the functionvkms_crtc_atomic_flushimmediately send the vblank event to the user space viadrm_crtc_send_vblank_eventwhich make things work in the user space. Make sense? Or I missed something?Ah, the magic of the
vblank_get()== 0 check. A bit tricky, but yes this indeed works. I think it'd be good to explain this in the commit message.Quoted 8 lines
Quoted 3 lines
Also I like the idea of switching away from the generic
-EINVALto-ENOTTYfor when vblanks aren't supported. Do you have that somewhere (as a separate patch).I already started to investigate if the change between
-EINVALto-ENOTTYwill break an existing kms userspace compositors. I already checked:Quoted 6 lines
* kwin
* sway
* wayland-core
* westonI still have to check the X drivers, chromium, and
drm_hwc.Awesome, keep up the great work.
Cheers, Daniel
Quoted 15 lines
Thanks for the feedback.
Quoted 5 lines
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch--
Rodrigo Siqueira
http://siqueira.tech
Graduate Student
Department of Computer Science
University of São PauloSignature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch
Signature · 9 lines
Rodrigo Siqueira http://siqueira.tech Graduate Student Department of Computer Science University of São Paulo _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel