Skip to contentSkip to conversation

drm/vmwgfx: Use DRM's vblank timer

PATCH Superseded Thomas Zimmermann 2 participants 8 messages Mar 5 – Apr 24

Subsystems (3)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore

Thomas Zimmermann

author maintainer
#0 lore raw

cover drm/vmwgfx: Use DRM's vblank timer

Replace vmwgfx's vblank timer with DRM's shared implementation. The common code is mostly equivalent, but provides additional protection against concurrent changes to the vblank counter.

Patches 1 and 2 align vmwgfx with the shared code, so that it can be converted easily.

The conversion is on patch 3. It replaces vmwgfx's custom timer with calls to DRM's vblank interfaces. Initialization happens internally.

This series should get some more testing.

Thomas Zimmermann (3):
drm/vmwgfx: Determine lock-waiting timeout from vblank state drm/vmwgfx: Move vblank handling into separate helper drm/vmwgfx: Convert to DRM vblank timers

 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h  |  2 -
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c  |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 68 ++++++++--------------------
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h |  2 +-
 6 files changed, 22 insertions(+), 53 deletions(-)

base-commit: 3594e3a9ce7d4ad237f43ff907e9744446108603

Signature · 1 line
2.53.0
author maintainer
#1 lore raw

PATCH 1/3 drm/vmwgfx: Determine lock-waiting timeout from vblank state

Use the calculated duration of a frame as stored in the vblank state for the lock-waiting timeout. Decouples the waiting from the details of the vblank implementation. Both values should be equal.

This will be helpful for replacing vmwgfx's vblank timer with DRM's common implementation.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +6 -2
index 5abd7f5ad2db..7862f6972512 100644
@@ -516,9 +516,13 @@ vmw_vkms_set_crc_surface(struct drm_crtc *crtc,
 static inline u64
 vmw_vkms_lock_max_wait_ns(struct vmw_display_unit *du)
 {
-	s64 nsecs = ktime_to_ns(du->vkms.period_ns);
+	struct drm_crtc *crtc = &du->crtc;
+	struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
+
+	if (!vblank || !vblank->framedur_ns)
+		return NSEC_PER_SEC / 60; /* disabled; assume 60 Hz */
 
-	return  (nsecs > 0) ? nsecs : 16666666;
+	return vblank->framedur_ns;
 }
 
 /**
Signature · 1 line
2.53.0
author maintainer
#2 lore raw

PATCH 2/3 drm/vmwgfx: Move vblank handling into separate helper

In reply to Thomas Zimmermann

Decouple vblank handling from the underlying hrtimer. This will be helpful for replacing vmwgfx's vblank timer with DRM's common implementation.

The new helper vmw_vkms_handle_vblank_timeout() can later be used as callback for DRM's handle_vblank call as-is. The remaining code in vmw_vkms_vblank_simulate() will be replaced by the DRM implementation.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 37 +++++++++++++++++++---------
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h |  1 +
 2 files changed, 26 insertions(+), 12 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +25 -12
index 7862f6972512..15439ddd4f22 100644
@@ -157,27 +157,19 @@ crc_generate_worker(struct work_struct *work)
 		drm_crtc_add_crc_entry(crtc, true, frame_start++, &crc32);
 }
 
-static enum hrtimer_restart
-vmw_vkms_vblank_simulate(struct hrtimer *timer)
+bool
+vmw_vkms_handle_vblank_timeout(struct drm_crtc *crtc)
 {
-	struct vmw_display_unit *du = container_of(timer, struct vmw_display_unit, vkms.timer);
-	struct drm_crtc *crtc = &du->crtc;
+	struct vmw_display_unit *du = vmw_crtc_to_du(crtc);
 	struct vmw_private *vmw = vmw_priv(crtc->dev);
 	bool has_surface = false;
-	u64 ret_overrun;
 	bool locked, ret;
 
-	ret_overrun = hrtimer_forward_now(&du->vkms.timer,
-					  du->vkms.period_ns);
-	if (ret_overrun != 1)
-		drm_dbg_driver(crtc->dev, "vblank timer missed %lld frames.\n",
-			       ret_overrun - 1);
-
 	locked = vmw_vkms_vblank_trylock(crtc);
 	ret = drm_crtc_handle_vblank(crtc);
 	WARN_ON(!ret);
 	if (!locked)
-		return HRTIMER_RESTART;
+		return true;
 	has_surface = du->vkms.surface != NULL;
 	vmw_vkms_unlock(crtc);
 
@@ -200,6 +192,27 @@ vmw_vkms_vblank_simulate(struct hrtimer *timer)
 			drm_dbg_driver(crtc->dev, "Composer worker already queued\n");
 	}
 
+	return true;
+}
+
+static enum hrtimer_restart
+vmw_vkms_vblank_simulate(struct hrtimer *timer)
+{
+	struct vmw_display_unit *du = container_of(timer, struct vmw_display_unit, vkms.timer);
+	struct drm_crtc *crtc = &du->crtc;
+	u64 ret_overrun;
+	bool success;
+
+	ret_overrun = hrtimer_forward_now(&du->vkms.timer,
+					  du->vkms.period_ns);
+	if (ret_overrun != 1)
+		drm_dbg_driver(crtc->dev, "vblank timer missed %lld frames.\n",
+			       ret_overrun - 1);
+
+	success = vmw_vkms_handle_vblank_timeout(crtc);
+	if (!success)
+		return HRTIMER_NORESTART;
+
 	return HRTIMER_RESTART;
 }
 
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h +1 -0
index 69ddd33a8444..0b6bbf7c4487 100644
@@ -45,6 +45,7 @@ bool vmw_vkms_modeset_lock_relaxed(struct drm_crtc *crtc);
 bool vmw_vkms_vblank_trylock(struct drm_crtc *crtc);
 void vmw_vkms_unlock(struct drm_crtc *crtc);
 
+bool vmw_vkms_handle_vblank_timeout(struct drm_crtc *crtc);
 bool vmw_vkms_get_vblank_timestamp(struct drm_crtc *crtc,
 				   int *max_error,
 				   ktime_t *vblank_time,
Signature · 1 line
2.53.0
maintainer
#3 lore raw

Re: [PATCH 2/3] drm/vmwgfx: Move vblank handling into separate helper

Quoted 38 lines · Thomas Zimmermann

Decouple vblank handling from the underlying hrtimer. This will be helpful for replacing vmwgfx's vblank timer with DRM's common implementation.

The new helper vmw_vkms_handle_vblank_timeout() can later be used as callback for DRM's handle_vblank call as-is. The remaining code in vmw_vkms_vblank_simulate() will be replaced by the DRM implementation.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 37 +++++++++++++++++++---------
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h |  1 +
 2 files changed, 26 insertions(+), 12 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +3 -7
index 7862f6972512..15439ddd4f22 100644
@@ -157,27 +157,19 @@ crc_generate_worker(struct work_struct *work)
                drm_crtc_add_crc_entry(crtc, true, frame_start++, &crc32);
 }
 
-static enum hrtimer_restart
-vmw_vkms_vblank_simulate(struct hrtimer *timer)
+bool
+vmw_vkms_handle_vblank_timeout(struct drm_crtc *crtc)
 {
-       struct vmw_display_unit *du = container_of(timer, struct vmw_display_unit, vkms.timer);
-       struct drm_crtc *crtc = &du->crtc;
+       struct vmw_display_unit *du = vmw_crtc_to_du(crtc);
        struct vmw_private *vmw = vmw_priv(crtc->dev);
        bool has_surface = false;
-       u64 ret_overrun;
        bool locked, ret;
 
-       ret_overrun = hrtimer_forward_now(&du->vkms.timer,
-                                         du->vkms.period_ns);

drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c crc_generate_worker(struct work_struct *work) · line 172

Quoted 10 lines
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +1 -5
-       if (ret_overrun != 1)
-               drm_dbg_driver(crtc->dev, "vblank timer missed %lld frames.\n",
-                              ret_overrun - 1);
-
        locked = vmw_vkms_vblank_trylock(crtc);
        ret = drm_crtc_handle_vblank(crtc);
        WARN_ON(!ret);
        if (!locked)
-               return HRTIMER_RESTART;
+               return true;

Should this be false? Or is the common layer handling timer restarts differently?

z

author maintainer
#4 lore raw

Re: [PATCH 2/3] drm/vmwgfx: Move vblank handling into separate helper

Hi

Am 23.04.26 um 21:51 schrieb Zack Rusin:
[...]

Quoted 13 lines
Quoted 13 lines
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +3 -5
-static enum hrtimer_restart
-vmw_vkms_vblank_simulate(struct hrtimer *timer)
+bool
+vmw_vkms_handle_vblank_timeout(struct drm_crtc *crtc)
  {
-       struct vmw_display_unit *du = container_of(timer, struct vmw_display_unit, vkms.timer);
-       struct drm_crtc *crtc = &du->crtc;
+       struct vmw_display_unit *du = vmw_crtc_to_du(crtc);
         struct vmw_private *vmw = vmw_priv(crtc->dev);
         bool has_surface = false;
-       u64 ret_overrun;
         bool locked, ret;
Quoted 14 lines

drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c crc_generate_worker(struct work_struct *work) · line 172

Quoted 12 lines
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +1 -7
-       ret_overrun = hrtimer_forward_now(&du->vkms.timer,
-                                         du->vkms.period_ns);
-       if (ret_overrun != 1)
-               drm_dbg_driver(crtc->dev, "vblank timer missed %lld frames.\n",
-                              ret_overrun - 1);
-
         locked = vmw_vkms_vblank_trylock(crtc);
         ret = drm_crtc_handle_vblank(crtc);
         WARN_ON(!ret);
         if (!locked)
-               return HRTIMER_RESTART;
+               return true;

Should this be false? Or is the common layer handling timer restarts differently?

Returning true here will restart the timer as before. See [1] for the logic.

[1] https://elixir.bootlin.com/linux/v7.0.1/source/drivers/gpu/drm/drm_vblank.c#L2193

Best regards
Thomas

Quoted 2 lines

z

Signature · 6 lines
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)
author maintainer
#5 lore raw

PATCH 3/3 drm/vmwgfx: Convert to DRM vblank timers

In reply to Thomas Zimmermann

Replace vmwgfx's vblank timer with DRM's common implementation. The timer handling is almost identical with a few additional bug fixes in the common code.

Replace most of vmwgfx's vmw_vkms_get_vblank_timestamp() with the shared helper drm_crtc_vblank_get_vblank_timeout(). The common helper also works in the presence of delayed vblank timeouts that modify the vblank counter concurrently.

Set the timeout handler to vmw_vkms_handle_vblank_timeout(). In addition to handling vblank events, this function also controls CRC generation.

Remove all the hrtimer-related code from vmwgfx. DRM vblank timers provides this.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h  |  2 -
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c  |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 63 ++++------------------------
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h |  1 -
 6 files changed, 10 insertions(+), 59 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +0 -2
index 445471fe9be6..b5670ece90a9 100644
@@ -322,8 +322,6 @@ struct vmw_display_unit {
 
 	struct {
 		struct work_struct crc_generator_work;
-		struct hrtimer timer;
-		ktime_t period_ns;
 
 		/* protects concurrent access to the vblank handler */
 		atomic_t atomic_lock;
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +1 -0
index f07669b27fba..6f22d5f5c379 100644
@@ -402,6 +402,7 @@ static const struct drm_crtc_helper_funcs vmw_ldu_crtc_helper_funcs = {
 	.atomic_flush = vmw_vkms_crtc_atomic_flush,
 	.atomic_enable = vmw_vkms_crtc_atomic_enable,
 	.atomic_disable = vmw_vkms_crtc_atomic_disable,
+	.handle_vblank_timeout  = vmw_vkms_handle_vblank_timeout,
 };
 
 
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +1 -0
index 605d037d18c6..cfb8ad3ebe43 100644
@@ -797,6 +797,7 @@ static const struct drm_crtc_helper_funcs vmw_sou_crtc_helper_funcs = {
 	.atomic_flush = vmw_vkms_crtc_atomic_flush,
 	.atomic_enable = vmw_vkms_crtc_atomic_enable,
 	.atomic_disable = vmw_sou_crtc_atomic_disable,
+	.handle_vblank_timeout  = vmw_vkms_handle_vblank_timeout,
 };
 
 
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +1 -0
index dcbacee97f61..1f5497e2638a 100644
@@ -1515,6 +1515,7 @@ static const struct drm_crtc_helper_funcs vmw_stdu_crtc_helper_funcs = {
 	.atomic_flush = vmw_stdu_crtc_atomic_flush,
 	.atomic_enable = vmw_vkms_crtc_atomic_enable,
 	.atomic_disable = vmw_stdu_crtc_atomic_disable,
+	.handle_vblank_timeout  = vmw_vkms_handle_vblank_timeout,
 };
 
 
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +7 -56

105 lines not on this page · raw message

drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h +0 -1
index 0b6bbf7c4487..40c679f59db2 100644
@@ -29,7 +29,6 @@
 #ifndef VMWGFX_VKMS_H_
 #define VMWGFX_VKMS_H_
 
-#include <linux/hrtimer_types.h>
 #include <linux/types.h>
 
 struct drm_atomic_state;
Signature · 1 line
2.53.0
maintainer
#6 lore raw

Re: [PATCH 3/3] drm/vmwgfx: Convert to DRM vblank timers

Quoted 177 lines · Thomas Zimmermann

Replace vmwgfx's vblank timer with DRM's common implementation. The timer handling is almost identical with a few additional bug fixes in the common code.

Replace most of vmwgfx's vmw_vkms_get_vblank_timestamp() with the shared helper drm_crtc_vblank_get_vblank_timeout(). The common helper also works in the presence of delayed vblank timeouts that modify the vblank counter concurrently.

Set the timeout handler to vmw_vkms_handle_vblank_timeout(). In addition to handling vblank events, this function also controls CRC generation.

Remove all the hrtimer-related code from vmwgfx. DRM vblank timers provides this.

---
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.h  |  2 -
 drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c  |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c |  1 +
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 63 ++++------------------------
 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h |  1 -
 6 files changed, 10 insertions(+), 59 deletions(-)
drivers/gpu/drm/vmwgfx/vmwgfx_kms.h +0 -2
index 445471fe9be6..b5670ece90a9 100644
@@ -322,8 +322,6 @@ struct vmw_display_unit {
 
        struct {
                struct work_struct crc_generator_work;
-               struct hrtimer timer;
-               ktime_t period_ns;
 
                /* protects concurrent access to the vblank handler */
                atomic_t atomic_lock;
drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c +1 -0
index f07669b27fba..6f22d5f5c379 100644
@@ -402,6 +402,7 @@ static const struct drm_crtc_helper_funcs vmw_ldu_crtc_helper_funcs = {
        .atomic_flush = vmw_vkms_crtc_atomic_flush,
        .atomic_enable = vmw_vkms_crtc_atomic_enable,
        .atomic_disable = vmw_vkms_crtc_atomic_disable,
+       .handle_vblank_timeout  = vmw_vkms_handle_vblank_timeout,
 };
 
 
drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c +1 -0
index 605d037d18c6..cfb8ad3ebe43 100644
@@ -797,6 +797,7 @@ static const struct drm_crtc_helper_funcs vmw_sou_crtc_helper_funcs = {
        .atomic_flush = vmw_vkms_crtc_atomic_flush,
        .atomic_enable = vmw_vkms_crtc_atomic_enable,
        .atomic_disable = vmw_sou_crtc_atomic_disable,
+       .handle_vblank_timeout  = vmw_vkms_handle_vblank_timeout,
 };
 
 
drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c +1 -0
index dcbacee97f61..1f5497e2638a 100644
@@ -1515,6 +1515,7 @@ static const struct drm_crtc_helper_funcs vmw_stdu_crtc_helper_funcs = {
        .atomic_flush = vmw_stdu_crtc_atomic_flush,
        .atomic_enable = vmw_vkms_crtc_atomic_enable,
        .atomic_disable = vmw_stdu_crtc_atomic_disable,
+       .handle_vblank_timeout  = vmw_vkms_handle_vblank_timeout,
 };
 
 
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +5 -55
index 15439ddd4f22..20b6dfd3d3c2 100644
@@ -195,27 +195,6 @@ vmw_vkms_handle_vblank_timeout(struct drm_crtc *crtc)
        return true;
 }
 
-static enum hrtimer_restart
-vmw_vkms_vblank_simulate(struct hrtimer *timer)
-{
-       struct vmw_display_unit *du = container_of(timer, struct vmw_display_unit, vkms.timer);
-       struct drm_crtc *crtc = &du->crtc;
-       u64 ret_overrun;
-       bool success;
-
-       ret_overrun = hrtimer_forward_now(&du->vkms.timer,
-                                         du->vkms.period_ns);
-       if (ret_overrun != 1)
-               drm_dbg_driver(crtc->dev, "vblank timer missed %lld frames.\n",
-                              ret_overrun - 1);
-
-       success = vmw_vkms_handle_vblank_timeout(crtc);
-       if (!success)
-               return HRTIMER_NORESTART;
-
-       return HRTIMER_RESTART;
-}
-
 void
 vmw_vkms_init(struct vmw_private *vmw)
 {
@@ -258,32 +237,12 @@ vmw_vkms_get_vblank_timestamp(struct drm_crtc *crtc,
                              ktime_t *vblank_time,
                              bool in_vblank_irq)
 {
-       struct drm_device *dev = crtc->dev;
-       struct vmw_private *vmw = vmw_priv(dev);
-       struct vmw_display_unit *du = vmw_crtc_to_du(crtc);
-       struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
+       struct vmw_private *vmw = vmw_priv(crtc->dev);
 
        if (!vmw->vkms_enabled)
                return false;
 
-       if (!READ_ONCE(vblank->enabled)) {
-               *vblank_time = ktime_get();
-               return true;
-       }
-
-       *vblank_time = READ_ONCE(du->vkms.timer.node.expires);
-
-       if (WARN_ON(*vblank_time == vblank->time))
-               return true;
-
-       /*
-        * To prevent races we roll the hrtimer forward before we do any
-        * interrupt processing - this is how real hw works (the interrupt is
-        * only generated after all the vblank registers are updated) and what
-        * the vblank core expects. Therefore we need to always correct the
-        * timestampe by one frame.
-        */
-       *vblank_time -= du->vkms.period_ns;
+       drm_crtc_vblank_get_vblank_timeout(crtc, vblank_time);
 
        return true;
 }
@@ -293,20 +252,11 @@ vmw_vkms_enable_vblank(struct drm_crtc *crtc)
 {
        struct drm_device *dev = crtc->dev;
        struct vmw_private *vmw = vmw_priv(dev);
-       struct drm_vblank_crtc *vblank = drm_crtc_vblank_crtc(crtc);
-       struct vmw_display_unit *du = vmw_crtc_to_du(crtc);
 
        if (!vmw->vkms_enabled)
                return -EINVAL;
 
-       drm_calc_timestamping_constants(crtc, &crtc->mode);
-
-       hrtimer_setup(&du->vkms.timer, &vmw_vkms_vblank_simulate, CLOCK_MONOTONIC,
-                     HRTIMER_MODE_REL);
-       du->vkms.period_ns = ktime_set(0, vblank->framedur_ns);
-       hrtimer_start(&du->vkms.timer, du->vkms.period_ns, HRTIMER_MODE_REL);
-
-       return 0;
+       return drm_crtc_vblank_start_timer(crtc);
 }
 
 void
@@ -318,9 +268,9 @@ vmw_vkms_disable_vblank(struct drm_crtc *crtc)
        if (!vmw->vkms_enabled)
                return;
 
-       hrtimer_cancel(&du->vkms.timer);
+       drm_crtc_vblank_cancel_timer(crtc);
+
        du->vkms.surface = NULL;
-       du->vkms.period_ns = ktime_set(0, 0);
 }
 
 enum vmw_vkms_lock_state {

drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c vmw_vkms_crtc_cleanup(struct drm_crtc *crtc) · line 300

Quoted 5 lines
drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c +2 -0
@@ -346,10 +296,11 @@ vmw_vkms_crtc_cleanup(struct drm_crtc *crtc)
 {
        struct vmw_display_unit *du = vmw_crtc_to_du(crtc);
 
+       drm_crtc_vblank_cancel_timer(crtc);
+

This will need somethging like:
struct drm_device *dev = crtc->dev;
struct vmw_private *vmw = vmw_priv(dev);

   if (vmw->vkms_enabled)
         drm_crtc_vblank_cancel_timer(crtc);

Because vmwgfx only calls drm_vblank_init if vmw->vkms_enabled is true, and drm_crtc_vblank_cancel_timer references drm_vblank_crtc without checking for its presence and it will crash here.

z

author maintainer
#7 lore raw
In reply to Thomas Zimmermann

Gentle reminder to give this series a review.

Am 05.03.26 um 14:39 schrieb Thomas Zimmermann:

Quoted 27 lines

Replace vmwgfx's vblank timer with DRM's shared implementation. The common code is mostly equivalent, but provides additional protection against concurrent changes to the vblank counter.

Patches 1 and 2 align vmwgfx with the shared code, so that it can be converted easily.

The conversion is on patch 3. It replaces vmwgfx's custom timer with calls to DRM's vblank interfaces. Initialization happens internally.

This series should get some more testing.

Thomas Zimmermann (3):
drm/vmwgfx: Determine lock-waiting timeout from vblank state drm/vmwgfx: Move vblank handling into separate helper drm/vmwgfx: Convert to DRM vblank timers

  drivers/gpu/drm/vmwgfx/vmwgfx_kms.h  |  2 -
  drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c  |  1 +
  drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c |  1 +
  drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c |  1 +
  drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 68 ++++++++--------------------
  drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h |  2 +-
  6 files changed, 22 insertions(+), 53 deletions(-)

base-commit: 3594e3a9ce7d4ad237f43ff907e9744446108603

Signature · 6 lines
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstr. 146, 90461 Nürnberg, Germany, www.suse.com
GF: Jochen Jaser, Andrew McDonald, Werner Knoblich, (HRB 36809, AG Nürnberg)