[Intel-gfx] [PATCH v2] drm/i915: tell the user if both KMS and UMS are disabled

[Daniel Vetter]

On Mon, Jun 02, 2014 at 04:58:30PM +0300, Jani Nikula wrote:
> If both KMS is disabled (by i915.modeset=0 or nomodeset parameters) and
> UMS is disabled (by CONFIG_DRM_I915_UMS=n, the default), the user might
> not be aware his setup is not supported. Inform the users (and, by
> extension, the poor i915 developers having to read their dmesgs in bug
> reports) why their graphics experience might be lacking.
> 
> A similar message was added on the UMS path in
> commit e147accbd19f55489dabdcc4dc3551cc3e3f2553
> Author: Jani Nikula <jani.nikula at intel.com>
> Date:   Thu Oct 10 15:25:37 2013 +0300
> 
>     drm/i915: tell the user KMS is required for gen6+
> 
> but it won't be reached if CONFIG_DRM_I915_UMS=n since
> commit b30324adaf8d2e5950a602bde63030d15a61826f
> Author: Daniel Vetter <daniel.vetter at ffwll.ch>
> Date:   Wed Nov 13 22:11:25 2013 +0100
> 
>     drm/i915: Deprecated UMS support
> 
> v2: Use DRM_DEBUG_DRIVER.
> 
> Signed-off-by: Jani Nikula <jani.nikula at intel.com>

Queued for -next, thanks for the patch. I'll shuffle it into the 3.16 pile
when I get around to that.
-Daniel
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index b6d2a8f96278..8e58083ffb11 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1576,6 +1576,7 @@ static int __init i915_init(void)
>  		driver.get_vblank_timestamp = NULL;
>  #ifndef CONFIG_DRM_I915_UMS
>  		/* Silently fail loading to not upset userspace. */
> +		DRM_DEBUG_DRIVER("KMS and UMS disabled.\n");
>  		return 0;
>  #endif
>  	}
> -- 
> 1.9.1
> 

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