Skip to contentSkip to conversation

4.15 vmgfx boot warning

PATCH In review Woody Suwalski 2 participants 5 messages Nov 22, 2017 – Dec 19, 2017

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 4.15 vmgfx boot warning

The 4.15 vmwgfx driver shows a warning during boot (32 bit x86)
It is caused by a mismatch between the result of vmw_enable_vblank() and what the drm_atomic_helper expects:
   /...
   ret = drm_crtc_vblank_get(crtc);
   WARN_ONCE(ret != -EINVAL, "driver forgot to call drm_crtc_vblank_off()\n");
   /...

Signed-off by: Woody Suwalski <[email protected]>

drivers/gpu/drm/vmwgfx/vmwgfx_kms.c    2017-11-22 15:30:35.344559592 -0500 renamed from drivers/gpu/drm/vmwgfx/vmwgfx_kms.c    2017-11-22 15:29:46.511674079 -0500 +0 -0
@@ -1869,7 +1869,7 @@ u32 vmw_get_vblank_counter(struct drm_de

  */
 int vmw_enable_vblank(struct drm_device *dev, unsigned int pipe) {
-    return -ENOSYS;
+    return -EINVAL;
 }

 /**

#1 lore raw

Hi Woody,

Quoted 7 lines · Woody Suwalski

The 4.15 vmwgfx driver shows a warning during boot (32 bit x86) It is caused by a mismatch between the result of vmw_enable_vblank() and what the drm_atomic_helper expects:
   /...
   ret = drm_crtc_vblank_get(crtc);
   WARN_ONCE(ret != -EINVAL, "driver forgot to call drm_crtc_vblank_off()\n");

This doesn't apply to us because we don't have vblank support, and so -ENOSYS seems to be the right error.

In the commit message for 84014b0a39ee, it does state a check for this condition, but the check itself is based on dev->irq_enabled.

Is there another way to check for vblank support?

Quoted 18 lines

   /...

Signed-off by: Woody Suwalski <[email protected]>

--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c    2017-11-22 15:29:46.511674079 -0500
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c    2017-11-22 15:30:35.344559592 -0500

(quoted diff) +1 -1
@@ -1869,7 +1869,7 @@ u32 vmw_get_vblank_counter(struct drm_de
   */
  int vmw_enable_vblank(struct drm_device *dev, unsigned int pipe)
  {
-    return -ENOSYS;
+    return -EINVAL;
  }
 
  /**
#2 lore raw
Quoted 36 lines · Sinclair Yeh

Hi Woody,

Quoted 7 lines · Woody Suwalski

The 4.15 vmwgfx driver shows a warning during boot (32 bit x86) It is caused by a mismatch between the result of vmw_enable_vblank() and what the drm_atomic_helper expects:
   /...
   ret = drm_crtc_vblank_get(crtc);
   WARN_ONCE(ret != -EINVAL, "driver forgot to call
drm_crtc_vblank_off()\n");

This doesn't apply to us because we don't have vblank support, and so -ENOSYS seems to be the right error.

In the commit message for 84014b0a39ee, it does state a check for this condition, but the check itself is based on dev->irq_enabled.

Is there another way to check for vblank support?

Quoted 16 lines

   /...

Signed-off by: Woody Suwalski <[email protected]>

--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c    2017-11-22 15:29:46.511674079 -0500
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c    2017-11-22 15:30:35.344559592 -0500

(quoted diff) +1 -1
@@ -1869,7 +1869,7 @@ u32 vmw_get_vblank_counter(struct drm_de
   */
  int vmw_enable_vblank(struct drm_device *dev, unsigned int pipe)
  {
-    return -ENOSYS;
+    return -EINVAL;
  }
 
Quoted 2 lines

Review u32 vmw_get_vblank_counter(struct drm_de · line 1875

Quoted 2 lines
(quoted diff) +0 -0
  /**

Sinclair, it is a valid stand, so I guess it is time to ask Daniel...

Would it be OK to convert the WARN_ONCE statement in drm_atomic_helper to recognize ENOSYS as a valid error? Something like

WARN_ONCE((ret != -EINVAL && ret != _ENOSYS), "driver forgot to call drm_crtc_vblank_off()\n");

Thanks, Woody

#3 lore raw

The 4.15 drm_atomic_helper driver shows a warning during boot (both 32 and 64 bit x86)
It is caused by a mismatch between the result of vmw_enable_vblank() and what the drm_atomic_helper expects:
   /...
   ret = drm_crtc_vblank_get(crtc);
   WARN_ONCE(ret != -EINVAL, "driver forgot to call drm_crtc_vblank_off()\n");
   /...

Signed-off by: Woody Suwalski <[email protected]>

drivers/gpu/drm/drm_atomic_helper.c    2017-12-16 10:55:56.089090752 -0500 renamed from drivers/gpu/drm/drm_atomic_helper.c    2017-12-16 09:55:33.853374561 -0500 +0 -0
@@ -889,7 +889,7 @@ disable_outputs(struct drm_device *dev,

             continue;

         ret = drm_crtc_vblank_get(crtc);
-        WARN_ONCE(ret != -EINVAL, "driver forgot to call drm_crtc_vblank_off()\n");
+        WARN_ONCE((ret != -EINVAL && ret != -ENOSYS), "driver forgot to call drm_crtc_vblank_off()\n"); if (ret == 0)
             drm_crtc_vblank_put(crtc);
     }

drivers/gpu/drm/drm_atomic_helper.c +1 -1
@@ -889,7 +889,7 @@ disable_outputs(struct drm_device *dev,
 			continue;
 
 		ret = drm_crtc_vblank_get(crtc);
-		WARN_ONCE(ret != -EINVAL, "driver forgot to call drm_crtc_vblank_off()\n");
+		WARN_ONCE((ret != -EINVAL && ret != -ENOSYS), "driver forgot to call drm_crtc_vblank_off()\n");
 		if (ret == 0)
 			drm_crtc_vblank_put(crtc);
 	}
#4 lore raw

This looks okay to me.

Quoted 32 lines · Woody Suwalski

The 4.15 drm_atomic_helper driver shows a warning during boot (both 32 and 64 bit x86)
It is caused by a mismatch between the result of vmw_enable_vblank() and what the drm_atomic_helper expects:
   /...
   ret = drm_crtc_vblank_get(crtc);
   WARN_ONCE(ret != -EINVAL, "driver forgot to call drm_crtc_vblank_off()\n");
   /...

Signed-off by: Woody Suwalski <[email protected]>

--- a/drivers/gpu/drm/drm_atomic_helper.c    2017-12-16 09:55:33.853374561 -0500
+++ b/drivers/gpu/drm/drm_atomic_helper.c    2017-12-16 10:55:56.089090752 -0500

drivers/gpu/drm/drm_atomic_helper.c +1 -1
@@ -889,7 +889,7 @@ disable_outputs(struct drm_device *dev,
              continue;
 
          ret = drm_crtc_vblank_get(crtc);
-        WARN_ONCE(ret != -EINVAL, "driver forgot to call
 drm_crtc_vblank_off()\n");
+        WARN_ONCE((ret != -EINVAL && ret != -ENOSYS), "driver forgot to
 call drm_crtc_vblank_off()\n");
          if (ret == 0)

             drm_crtc_vblank_put(crtc);
     }

drivers/gpu/drm/drm_atomic_helper.c disable_outputs(struct drm_device *dev, · line 895

Quoted 8 lines
drivers/gpu/drm/drm_atomic_helper.c +1 -1
@@ -889,7 +889,7 @@ disable_outputs(struct drm_device *dev,
 			continue;
 
 		ret = drm_crtc_vblank_get(crtc);
-		WARN_ONCE(ret != -EINVAL, "driver forgot to call drm_crtc_vblank_off()\n");
+		WARN_ONCE((ret != -EINVAL && ret != -ENOSYS), "driver forgot to call drm_crtc_vblank_off()\n");
 		if (ret == 0)
 			drm_crtc_vblank_put(crtc);
 	}

_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel