| From 4e2818d2675e13f5f531e009758cb6ca60de61a6 Mon Sep 17 00:00:00 2001 |
| From: Jani Nikula <jani.nikula@intel.com> |
| Date: Thu, 10 Oct 2013 15:25:37 +0300 |
| Subject: drm/i915: tell the user KMS is required for gen6+ |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| 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> |
| Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> |
| Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch> |
| (cherry picked from commit e147accbd19f55489dabdcc4dc3551cc3e3f2553) |
| Signed-off-by: Darren Hart <dvhart@linux.intel.com> |
| --- |
| drivers/gpu/drm/i915/i915_dma.c | 5 ++++- |
| 1 file changed, 4 insertions(+), 1 deletion(-) |
| |
| --- a/drivers/gpu/drm/i915/i915_dma.c |
| +++ b/drivers/gpu/drm/i915/i915_dma.c |
| @@ -1485,8 +1485,11 @@ int i915_driver_load(struct drm_device * |
| 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) |
