diff mbox

drm/vmwgfx: Fix a boot time warning

Message ID 1516177285-2384-1-git-send-email-thellstrom@vmware.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Hellstrom Jan. 17, 2018, 8:21 a.m. UTC
From: Woody Suwalski <terraluna977@gmail.com>

The 4.15 vmwgfx driver shows a warning during boot.
It is caused by a mismatch between the result of vmw_enable_vblank()
and what the drm_atomic_helper expects.

Signed-off by: Woody Suwalski <terraluna977@gmail.com>
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
---
 drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Daniel Vetter Jan. 17, 2018, 8:47 a.m. UTC | #1
On Wed, Jan 17, 2018 at 09:21:25AM +0100, Thomas Hellstrom wrote:
> From: Woody Suwalski <terraluna977@gmail.com>
> 
> The 4.15 vmwgfx driver shows a warning during boot.
> It is caused by a mismatch between the result of vmw_enable_vblank()
> and what the drm_atomic_helper expects.
> 
> Signed-off by: Woody Suwalski <terraluna977@gmail.com>
> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>

Just curious question, but why do you even have all that code? Not
enabling any of the vblank stuff should also work with atomic drivers, and
would require much less boilerplate ...

Either way: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> index 641294a..fcd5814 100644
> --- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
> @@ -1863,7 +1863,7 @@ u32 vmw_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
>   */
>  int vmw_enable_vblank(struct drm_device *dev, unsigned int pipe)
>  {
> -	return -ENOSYS;
> +	return -EINVAL;
>  }
>  
>  /**
> -- 
> 2.7.4
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Hellstrom Jan. 17, 2018, 8:49 a.m. UTC | #2
On 01/17/2018 09:47 AM, Daniel Vetter wrote:
> On Wed, Jan 17, 2018 at 09:21:25AM +0100, Thomas Hellstrom wrote:
>> From: Woody Suwalski <terraluna977@gmail.com>
>>
>> The 4.15 vmwgfx driver shows a warning during boot.
>> It is caused by a mismatch between the result of vmw_enable_vblank()
>> and what the drm_atomic_helper expects.
>>
>> Signed-off by: Woody Suwalski <terraluna977@gmail.com>
>> Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
> Just curious question, but why do you even have all that code? Not
> enabling any of the vblank stuff should also work with atomic drivers, and
> would require much less boilerplate ...
>
> Either way: Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>

To be honest, nobody here has really looked at exactly what parts are 
needed when we don't have the vblank interrupt.
We'll put that on the to-do list.

Thanks,
diff mbox

Patch

diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
index 641294a..fcd5814 100644
--- a/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
+++ b/drivers/gpu/drm/vmwgfx/vmwgfx_kms.c
@@ -1863,7 +1863,7 @@  u32 vmw_get_vblank_counter(struct drm_device *dev, unsigned int pipe)
  */
 int vmw_enable_vblank(struct drm_device *dev, unsigned int pipe)
 {
-	return -ENOSYS;
+	return -EINVAL;
 }
 
 /**