Re: [PATCH] drm/i915: Remove references to previously removed UMS config option

[Jani Nikula <jani.nikula@linux.intel.com>]

On Fri, 06 Feb 2015, Andreas Ruprecht <rupran@einserver.de> wrote:
> Commit 03dae59c72ffffd8 ("drm/i915: Ditch UMS config option") removed
> CONFIG_DRM_I915_UMS from the Kconfig file, but i915_drv.c still
> references this option in two #ifndef statements.
>
> As an undefined config option will always be 'false', we can drop
> the #ifndefs alltogether and adapt the printed error message.
>
> This inconsistency was found with the undertaker tool.
>
> Signed-off-by: Andreas Ruprecht <rupran@einserver.de>
> ---
>  drivers/gpu/drm/i915/i915_drv.c | 6 +-----
>  1 file changed, 1 insertion(+), 5 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 8039cec..4ecf85f 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -1630,11 +1630,9 @@ static int __init i915_init(void)
>  
>  	if (!(driver.driver_features & DRIVER_MODESET)) {
>  		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");
> +		DRM_DEBUG_DRIVER("KMS disabled.\n");

I'm not sure if this logging change is required. UMS will still also be
disabled. Or maybe make it "KMS disabled, UMS not
supported.\n". Background in

commit c9cd7b65db50175a5f1ff64bbad6d5affdad6aba
Author: Jani Nikula <jani.nikula@intel.com>
Date:   Mon Jun 2 16:58:30 2014 +0300

    drm/i915: tell the user if both KMS and UMS are disabled

Other than that,

Reviewed-by: Jani Nikula <jani.nikula@intel.com>

>  		return 0;
> -#endif
>  	}
>  
>  	/*
> @@ -1650,10 +1648,8 @@ static int __init i915_init(void)
>  
>  static void __exit i915_exit(void)
>  {
> -#ifndef CONFIG_DRM_I915_UMS
>  	if (!(driver.driver_features & DRIVER_MODESET))
>  		return; /* Never loaded a driver. */
> -#endif
>  
>  	drm_pci_exit(&driver, &i915_pci_driver);
>  }
> -- 
> 1.9.1
>

-- 
Jani Nikula, Intel Open Source Technology Center