* [PATCH] drm/i915: tell the user KMS is required for gen6+
@ 2013-10-10 12:25 Jani Nikula
2013-10-10 14:28 ` Ville Syrjälä
0 siblings, 1 reply; 3+ messages in thread
From: Jani Nikula @ 2013-10-10 12:25 UTC (permalink / raw)
To: intel-gfx; +Cc: 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
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: tell the user KMS is required for gen6+
2013-10-10 12:25 [PATCH] drm/i915: tell the user KMS is required for gen6+ Jani Nikula
@ 2013-10-10 14:28 ` Ville Syrjälä
2013-10-10 17:08 ` Daniel Vetter
0 siblings, 1 reply; 3+ messages in thread
From: Ville Syrjälä @ 2013-10-10 14:28 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] drm/i915: tell the user KMS is required for gen6+
2013-10-10 14:28 ` Ville Syrjälä
@ 2013-10-10 17:08 ` Daniel Vetter
0 siblings, 0 replies; 3+ messages in thread
From: Daniel Vetter @ 2013-10-10 17:08 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: Jani Nikula, intel-gfx
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
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-10-10 17:08 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-10-10 12:25 [PATCH] drm/i915: tell the user KMS is required for gen6+ Jani Nikula
2013-10-10 14:28 ` Ville Syrjälä
2013-10-10 17:08 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.