[PATCH] drm/i915/gvt: Mark i915.enable_gvt as false if loading fails

[PATCH] drm/i915/gvt: Mark i915.enable_gvt as false if loading fails

[Chris Wilson]

If we update the value of i195.enable_gvt if we fail to load GVT
userspace can easily detect if when it fails to load as requested.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Zhi Wang <zhi.a.wang@intel.com>
---
 drivers/gpu/drm/i915/intel_gvt.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/drivers/gpu/drm/i915/intel_gvt.c b/drivers/gpu/drm/i915/intel_gvt.c
index 9fa458c..434f4d5 100644
--- a/drivers/gpu/drm/i915/intel_gvt.c
+++ b/drivers/gpu/drm/i915/intel_gvt.c
@@ -63,7 +63,7 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)
 
 	if (!is_supported_device(dev_priv)) {
 		DRM_DEBUG_DRIVER("Unsupported device. GVT-g is disabled\n");
-		return 0;
+		goto bail;
 	}
 
 	/*
@@ -72,16 +72,20 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)
 	ret = intel_gvt_init_host();
 	if (ret) {
 		DRM_DEBUG_DRIVER("Not in host or MPT modules not found\n");
-		return 0;
+		goto bail;
 	}
 
 	ret = intel_gvt_init_device(dev_priv);
 	if (ret) {
 		DRM_DEBUG_DRIVER("Fail to init GVT device\n");
-		return 0;
+		goto bail;
 	}
 
 	return 0;
+
+bail:
+	i915.enable_gvt = 0;
+	return 0;
 }
 
 /**
-- 
2.8.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/gvt: Mark i915.enable_gvt as false if loading fails

[Wang, Zhi A]

I never thought that before. Brilliant. :P

> -----Original Message-----
> From: Chris Wilson [mailto:chris.ickle.wilson@gmail.com] On Behalf Of Chris
> Wilson
> Sent: Tuesday, June 21, 2016 2:07 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Chris Wilson <chris@chris-wilson.co.uk>; Wang, Zhi A
> <zhi.a.wang@intel.com>
> Subject: [PATCH] drm/i915/gvt: Mark i915.enable_gvt as false if loading fails
> 
> If we update the value of i195.enable_gvt if we fail to load GVT userspace can
> easily detect if when it fails to load as requested.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Zhi Wang <zhi.a.wang@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_gvt.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_gvt.c b/drivers/gpu/drm/i915/intel_gvt.c
> index 9fa458c..434f4d5 100644
> --- a/drivers/gpu/drm/i915/intel_gvt.c
> +++ b/drivers/gpu/drm/i915/intel_gvt.c
> @@ -63,7 +63,7 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)
> 
>  	if (!is_supported_device(dev_priv)) {
>  		DRM_DEBUG_DRIVER("Unsupported device. GVT-g is disabled\n");
> -		return 0;
> +		goto bail;
>  	}
> 
>  	/*
> @@ -72,16 +72,20 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)
>  	ret = intel_gvt_init_host();
>  	if (ret) {
>  		DRM_DEBUG_DRIVER("Not in host or MPT modules not found\n");
> -		return 0;
> +		goto bail;
>  	}
> 
>  	ret = intel_gvt_init_device(dev_priv);
>  	if (ret) {
>  		DRM_DEBUG_DRIVER("Fail to init GVT device\n");
> -		return 0;
> +		goto bail;
>  	}
> 
>  	return 0;
> +
> +bail:
> +	i915.enable_gvt = 0;
> +	return 0;
>  }
> 
>  /**
> --
> 2.8.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

✓ Ro.CI.BAT: success for drm/i915/gvt: Mark i915.enable_gvt as false if loading fails

[Patchwork]

== Series Details ==

Series: drm/i915/gvt: Mark i915.enable_gvt as false if loading fails
URL   : https://patchwork.freedesktop.org/series/8984/
State : success

== Summary ==

Series 8984v1 drm/i915/gvt: Mark i915.enable_gvt as false if loading fails
http://patchwork.freedesktop.org/api/1.0/series/8984/revisions/1/mbox

Test gem_exec_flush:
        Subgroup basic-batch-kernel-default-cmd:
                fail       -> PASS       (ro-byt-n2820)
Test kms_pipe_crc_basic:
        Subgroup suspend-read-crc-pipe-c:
                dmesg-warn -> SKIP       (ro-bdw-i5-5250u)

fi-skl-i7-6700k  total:225  pass:186  dwarn:0   dfail:0   fail:2   skip:37 
ro-bdw-i5-5250u  total:225  pass:197  dwarn:3   dfail:0   fail:0   skip:25 
ro-bdw-i7-5557U  total:225  pass:198  dwarn:0   dfail:0   fail:0   skip:27 
ro-bdw-i7-5600u  total:225  pass:185  dwarn:0   dfail:0   fail:0   skip:40 
ro-byt-n2820     total:225  pass:174  dwarn:0   dfail:0   fail:2   skip:49 
ro-hsw-i3-4010u  total:225  pass:190  dwarn:0   dfail:0   fail:0   skip:35 
ro-hsw-i7-4770r  total:225  pass:190  dwarn:0   dfail:0   fail:0   skip:35 
ro-ilk-i7-620lm  total:225  pass:150  dwarn:0   dfail:0   fail:1   skip:74 
ro-ilk1-i5-650   total:220  pass:150  dwarn:0   dfail:0   fail:1   skip:69 
ro-ivb-i7-3770   total:225  pass:181  dwarn:0   dfail:0   fail:0   skip:44 
ro-ivb2-i7-3770  total:225  pass:185  dwarn:0   dfail:0   fail:0   skip:40 
ro-skl3-i5-6260u total:225  pass:201  dwarn:1   dfail:0   fail:0   skip:23 
ro-snb-i7-2620M  total:225  pass:174  dwarn:0   dfail:0   fail:1   skip:50 
fi-bxt-q6he failed to connect after reboot
fi-hsw-i7-4770k failed to connect after reboot
fi-kbl-qkkr failed to connect after reboot
fi-skl-i5-6260u failed to connect after reboot
fi-snb-i7-2600 failed to connect after reboot

Results at /archive/results/CI_IGT_test/RO_Patchwork_1252/

359aeff drm-intel-nightly: 2016y-06m-21d-10h-45m-51s UTC integration manifest
acd9a65 drm/i915/gvt: Mark i915.enable_gvt as false if loading fails

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/gvt: Mark i915.enable_gvt as false if loading fails

[Chris Wilson]

On Tue, Jun 21, 2016 at 11:11:05AM +0000, Wang, Zhi A wrote:
> I never thought that before. Brilliant. :P

I'll take that as an r-b...
-Chris

-- 
Chris Wilson, Intel Open Source Technology Centre
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [PATCH] drm/i915/gvt: Mark i915.enable_gvt as false if loading fails

[Wang, Zhi A]

> -----Original Message-----
> From: Chris Wilson [mailto:chris.ickle.wilson@gmail.com] On Behalf Of Chris
> Wilson
> Sent: Tuesday, June 21, 2016 2:07 PM
> To: intel-gfx@lists.freedesktop.org
> Cc: Chris Wilson <chris@chris-wilson.co.uk>; Wang, Zhi A
> <zhi.a.wang@intel.com>
> Subject: [PATCH] drm/i915/gvt: Mark i915.enable_gvt as false if loading fails
> 
> If we update the value of i195.enable_gvt if we fail to load GVT userspace can
should be i915. :D

> easily detect if when it fails to load as requested.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Zhi Wang <zhi.a.wang@intel.com>
> ---
>  drivers/gpu/drm/i915/intel_gvt.c | 10 +++++++---
>  1 file changed, 7 insertions(+), 3 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_gvt.c b/drivers/gpu/drm/i915/intel_gvt.c
> index 9fa458c..434f4d5 100644
> --- a/drivers/gpu/drm/i915/intel_gvt.c
> +++ b/drivers/gpu/drm/i915/intel_gvt.c
> @@ -63,7 +63,7 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)
> 
>  	if (!is_supported_device(dev_priv)) {
>  		DRM_DEBUG_DRIVER("Unsupported device. GVT-g is disabled\n");
> -		return 0;
> +		goto bail;
>  	}
> 
>  	/*
> @@ -72,16 +72,20 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)
>  	ret = intel_gvt_init_host();
>  	if (ret) {
>  		DRM_DEBUG_DRIVER("Not in host or MPT modules not found\n");
> -		return 0;
> +		goto bail;
>  	}
> 
>  	ret = intel_gvt_init_device(dev_priv);
>  	if (ret) {
>  		DRM_DEBUG_DRIVER("Fail to init GVT device\n");
> -		return 0;
> +		goto bail;
>  	}
> 
>  	return 0;
> +
> +bail:
> +	i915.enable_gvt = 0;
> +	return 0;
>  }
> 
>  /**
> --
> 2.8.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx