[PATCH] drm/i915: tell the user KMS is required for gen6+

[PATCH] drm/i915: tell the user KMS is required for gen6+

[Jani Nikula]

Educate the users why i915 won't load on gen6+ and nomodeset.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=61671
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
 drivers/gpu/drm/i915/i915_dma.c |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
index 0c86c48..9a54241 100644
--- a/drivers/gpu/drm/i915/i915_dma.c
+++ b/drivers/gpu/drm/i915/i915_dma.c
@@ -1477,8 +1477,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
 	info = (struct intel_device_info *) flags;
 
 	/* Refuse to load on gen6+ without kms enabled. */
-	if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET))
+	if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET)) {
+		DRM_INFO("Your hardware requires kernel modesetting (KMS)\n");
+		DRM_INFO("See CONFIG_DRM_I915_KMS, nomodeset, and i915.modeset parameters\n");
 		return -ENODEV;
+	}
 
 	dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
 	if (dev_priv == NULL)
-- 
1.7.10.4

Re: [PATCH] drm/i915: tell the user KMS is required for gen6+

[Ville Syrjälä]

On Thu, Oct 10, 2013 at 03:25:37PM +0300, Jani Nikula wrote:
> Educate the users why i915 won't load on gen6+ and nomodeset.
> 
> Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=61671
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>

Yes, much better than the agp wtf error people get currently.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_dma.c |    5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index 0c86c48..9a54241 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -1477,8 +1477,11 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags)
>  	info = (struct intel_device_info *) flags;
>  
>  	/* Refuse to load on gen6+ without kms enabled. */
> -	if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET))
> +	if (info->gen >= 6 && !drm_core_check_feature(dev, DRIVER_MODESET)) {
> +		DRM_INFO("Your hardware requires kernel modesetting (KMS)\n");
> +		DRM_INFO("See CONFIG_DRM_I915_KMS, nomodeset, and i915.modeset parameters\n");
>  		return -ENODEV;
> +	}
>  
>  	dev_priv = kzalloc(sizeof(*dev_priv), GFP_KERNEL);
>  	if (dev_priv == NULL)
> -- 
> 1.7.10.4
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC

Re: [PATCH] drm/i915: tell the user KMS is required for gen6+

[Daniel Vetter]

On Thu, Oct 10, 2013 at 05:28:54PM +0300, Ville Syrjälä wrote:
> On Thu, Oct 10, 2013 at 03:25:37PM +0300, Jani Nikula wrote:
> > Educate the users why i915 won't load on gen6+ and nomodeset.
> > 
> > Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=61671
> > Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> 
> Yes, much better than the agp wtf error people get currently.
> 
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Queued for -next, thanks for the patch.
-Daniel
-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch