Re: [Mesa-dev] [PATCH 1/6] intel/vulkan: Support INTEL_NO_HW environment variable

2018-02-12 Thread Samuel Iglesias Gonsálvez 
Series is,

Reviewed-by: Samuel Iglesias Gonsálvez 

Sam

On 10/02/18 09:06, Jordan Justen wrote:
> Signed-off-by: Jordan Justen 
> ---
>  src/intel/vulkan/anv_device.c  | 3 +++
>  src/intel/vulkan/anv_private.h | 2 ++
>  src/intel/vulkan/anv_queue.c   | 2 +-
>  3 files changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
> index 86c1bdc1d51..59ea073803d 100644
> --- a/src/intel/vulkan/anv_device.c
> +++ b/src/intel/vulkan/anv_device.c
> @@ -294,6 +294,8 @@ anv_physical_device_init(struct anv_physical_device 
> *device,
> assert(strlen(path) < ARRAY_SIZE(device->path));
> strncpy(device->path, path, ARRAY_SIZE(device->path));
>  
> +   device->no_hw = getenv("INTEL_NO_HW") != NULL;
> +
> device->chipset_id = anv_gem_get_param(fd, I915_PARAM_CHIPSET_ID);
> if (!device->chipset_id) {
>result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
> @@ -1371,6 +1373,7 @@ VkResult anv_CreateDevice(
> device->_loader_data.loaderMagic = ICD_LOADER_MAGIC;
> device->instance = physical_device->instance;
> device->chipset_id = physical_device->chipset_id;
> +   device->no_hw = physical_device->no_hw;
> device->lost = false;
>  
> if (pAllocator)
> diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
> index d38dd9e4220..b2d9bf785e7 100644
> --- a/src/intel/vulkan/anv_private.h
> +++ b/src/intel/vulkan/anv_private.h
> @@ -749,6 +749,7 @@ struct anv_physical_device {
>  
>  struct anv_instance *   instance;
>  uint32_tchipset_id;
> +boolno_hw;
>  charpath[20];
>  const char *name;
>  struct gen_device_info  info;
> @@ -852,6 +853,7 @@ struct anv_device {
>  
>  struct anv_instance *   instance;
>  uint32_tchipset_id;
> +boolno_hw;
>  struct gen_device_info  info;
>  struct isl_device   isl_dev;
>  int context_id;
> diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c
> index c6b2e01c628..b0dcc882edc 100644
> --- a/src/intel/vulkan/anv_queue.c
> +++ b/src/intel/vulkan/anv_queue.c
> @@ -39,7 +39,7 @@ anv_device_execbuf(struct anv_device *device,
> struct drm_i915_gem_execbuffer2 *execbuf,
> struct anv_bo **execbuf_bos)
>  {
> -   int ret = anv_gem_execbuffer(device, execbuf);
> +   int ret = device->no_hw ? 0 : anv_gem_execbuffer(device, execbuf);
> if (ret != 0) {
>/* We don't know the real error. */
>device->lost = true;



signature.asc
Description: OpenPGP digital signature
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 1/6] intel/vulkan: Support INTEL_NO_HW environment variable

2018-02-10 Thread Jordan Justen 
Signed-off-by: Jordan Justen 
---
 src/intel/vulkan/anv_device.c  | 3 +++
 src/intel/vulkan/anv_private.h | 2 ++
 src/intel/vulkan/anv_queue.c   | 2 +-
 3 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/intel/vulkan/anv_device.c b/src/intel/vulkan/anv_device.c
index 86c1bdc1d51..59ea073803d 100644
--- a/src/intel/vulkan/anv_device.c
+++ b/src/intel/vulkan/anv_device.c
@@ -294,6 +294,8 @@ anv_physical_device_init(struct anv_physical_device *device,
assert(strlen(path) < ARRAY_SIZE(device->path));
strncpy(device->path, path, ARRAY_SIZE(device->path));
 
+   device->no_hw = getenv("INTEL_NO_HW") != NULL;
+
device->chipset_id = anv_gem_get_param(fd, I915_PARAM_CHIPSET_ID);
if (!device->chipset_id) {
   result = vk_error(VK_ERROR_INCOMPATIBLE_DRIVER);
@@ -1371,6 +1373,7 @@ VkResult anv_CreateDevice(
device->_loader_data.loaderMagic = ICD_LOADER_MAGIC;
device->instance = physical_device->instance;
device->chipset_id = physical_device->chipset_id;
+   device->no_hw = physical_device->no_hw;
device->lost = false;
 
if (pAllocator)
diff --git a/src/intel/vulkan/anv_private.h b/src/intel/vulkan/anv_private.h
index d38dd9e4220..b2d9bf785e7 100644
--- a/src/intel/vulkan/anv_private.h
+++ b/src/intel/vulkan/anv_private.h
@@ -749,6 +749,7 @@ struct anv_physical_device {
 
 struct anv_instance *   instance;
 uint32_tchipset_id;
+boolno_hw;
 charpath[20];
 const char *name;
 struct gen_device_info  info;
@@ -852,6 +853,7 @@ struct anv_device {
 
 struct anv_instance *   instance;
 uint32_tchipset_id;
+boolno_hw;
 struct gen_device_info  info;
 struct isl_device   isl_dev;
 int context_id;
diff --git a/src/intel/vulkan/anv_queue.c b/src/intel/vulkan/anv_queue.c
index c6b2e01c628..b0dcc882edc 100644
--- a/src/intel/vulkan/anv_queue.c
+++ b/src/intel/vulkan/anv_queue.c
@@ -39,7 +39,7 @@ anv_device_execbuf(struct anv_device *device,
struct drm_i915_gem_execbuffer2 *execbuf,
struct anv_bo **execbuf_bos)
 {
-   int ret = anv_gem_execbuffer(device, execbuf);
+   int ret = device->no_hw ? 0 : anv_gem_execbuffer(device, execbuf);
if (ret != 0) {
   /* We don't know the real error. */
   device->lost = true;
-- 
2.15.1

___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev