[PATCH i-g-t 1/2] lib/drmtest: Fix igt_skip message

[PATCH i-g-t 1/2] lib/drmtest: Fix igt_skip message

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Now other gpus are supported too.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 lib/drmtest.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 884fe7c..9f3ac7f 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -263,7 +263,7 @@ int __drm_open_driver(int chipset)
 		close(fd);
 	}
 
-	igt_skip("No intel gpu found\n");
+	igt_skip("No known gpu found\n");
 	return -1;
 }
 
-- 
2.5.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH i-g-t 2/2] lib/drmtest: add virtio_gpu support

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Support the virtio GPU on drmtest.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 lib/drmtest.c | 9 +++++++++
 lib/drmtest.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 9f3ac7f..b374006 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -115,6 +115,11 @@ static bool is_vgem_device(int fd)
 	return __is_device(fd, "vgem");
 }
 
+static bool is_virtio_device(int fd)
+{
+	return __is_device(fd, "virt");
+}
+
 static bool has_known_intel_chipset(int fd)
 {
 	struct drm_i915_getparam gp;
@@ -260,6 +265,10 @@ int __drm_open_driver(int chipset)
 		    is_vgem_device(fd))
 			return fd;
 
+		if (chipset & DRIVER_VIRTIO &&
+		    is_virtio_device(fd))
+			return fd;
+
 		close(fd);
 	}
 
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 8ce32a6..19d4bd1 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -41,6 +41,7 @@
 #define DRIVER_INTEL	(1 << 0)
 #define DRIVER_VC4	(1 << 1)
 #define DRIVER_VGEM	(1 << 2)
+#define DRIVER_VIRTIO	(1 << 3)
 #define DRIVER_ANY 	~(DRIVER_VGEM)
 
 #ifdef ANDROID
-- 
2.5.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

Re: [PATCH i-g-t 2/2] lib/drmtest: add virtio_gpu support

[Daniel Vetter]

On Thu, Jun 30, 2016 at 06:29:47PM -0300, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
> 
> Support the virtio GPU on drmtest.
> 
> Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Both applied, thanks for the patches. Aside: i-g-t patches should be
submitted to intel-gfx.
-Daniel

> ---
>  lib/drmtest.c | 9 +++++++++
>  lib/drmtest.h | 1 +
>  2 files changed, 10 insertions(+)
> 
> diff --git a/lib/drmtest.c b/lib/drmtest.c
> index 9f3ac7f..b374006 100644
> --- a/lib/drmtest.c
> +++ b/lib/drmtest.c
> @@ -115,6 +115,11 @@ static bool is_vgem_device(int fd)
>  	return __is_device(fd, "vgem");
>  }
>  
> +static bool is_virtio_device(int fd)
> +{
> +	return __is_device(fd, "virt");
> +}
> +
>  static bool has_known_intel_chipset(int fd)
>  {
>  	struct drm_i915_getparam gp;
> @@ -260,6 +265,10 @@ int __drm_open_driver(int chipset)
>  		    is_vgem_device(fd))
>  			return fd;
>  
> +		if (chipset & DRIVER_VIRTIO &&
> +		    is_virtio_device(fd))
> +			return fd;
> +
>  		close(fd);
>  	}
>  
> diff --git a/lib/drmtest.h b/lib/drmtest.h
> index 8ce32a6..19d4bd1 100644
> --- a/lib/drmtest.h
> +++ b/lib/drmtest.h
> @@ -41,6 +41,7 @@
>  #define DRIVER_INTEL	(1 << 0)
>  #define DRIVER_VC4	(1 << 1)
>  #define DRIVER_VGEM	(1 << 2)
> +#define DRIVER_VIRTIO	(1 << 3)
>  #define DRIVER_ANY 	~(DRIVER_VGEM)
>  
>  #ifdef ANDROID
> -- 
> 2.5.5
> 
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel

-- 
Daniel Vetter
Software Engineer, Intel Corporation
http://blog.ffwll.ch
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

[PATCH i-g-t 2/2] lib/drmtest: add virtio_gpu support

[Gustavo Padovan]

From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>

Support the virtio GPU on drmtest.

Signed-off-by: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
---
 lib/drmtest.c | 9 +++++++++
 lib/drmtest.h | 1 +
 2 files changed, 10 insertions(+)

diff --git a/lib/drmtest.c b/lib/drmtest.c
index 9f3ac7f..b374006 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -115,6 +115,11 @@ static bool is_vgem_device(int fd)
 	return __is_device(fd, "vgem");
 }
 
+static bool is_virtio_device(int fd)
+{
+	return __is_device(fd, "virt");
+}
+
 static bool has_known_intel_chipset(int fd)
 {
 	struct drm_i915_getparam gp;
@@ -260,6 +265,10 @@ int __drm_open_driver(int chipset)
 		    is_vgem_device(fd))
 			return fd;
 
+		if (chipset & DRIVER_VIRTIO &&
+		    is_virtio_device(fd))
+			return fd;
+
 		close(fd);
 	}
 
diff --git a/lib/drmtest.h b/lib/drmtest.h
index 8ce32a6..19d4bd1 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -41,6 +41,7 @@
 #define DRIVER_INTEL	(1 << 0)
 #define DRIVER_VC4	(1 << 1)
 #define DRIVER_VGEM	(1 << 2)
+#define DRIVER_VIRTIO	(1 << 3)
 #define DRIVER_ANY 	~(DRIVER_VGEM)
 
 #ifdef ANDROID
-- 
2.5.5

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel