> -----Original Message----- > From: Chris Wilson [mailto:chris.ickle.wilson@xxxxxxxxx] On Behalf Of Chris > Wilson > Sent: Tuesday, June 21, 2016 2:07 PM > To: intel-gfx@xxxxxxxxxxxxxxxxxxxxx > Cc: Chris Wilson <chris@xxxxxxxxxxxxxxxxxx>; Wang, Zhi A > <zhi.a.wang@xxxxxxxxx> > 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@xxxxxxxxxxxxxxxxxx> > Cc: Zhi Wang <zhi.a.wang@xxxxxxxxx> > --- > 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@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/intel-gfx
