Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7822492f authored by Chris Wilson's avatar Chris Wilson
Browse files

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



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

Testcase: igt/gvt_basic
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Zhi Wang <zhi.a.wang@intel.com>
Reviewed-by: default avatarZhi Wang <zhi.a.wang@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1466507234-23242-1-git-send-email-chris@chris-wilson.co.uk
parent 77ca04cc

drivers/gpu/drm/i915/intel_gvt.c

+7 −3
Original line number Diff line number Diff line
@@ -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;

}



/**