Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753348AbbBMOno (ORCPT ); Fri, 13 Feb 2015 09:43:44 -0500 Received: from mail-wg0-f50.google.com ([74.125.82.50]:55377 "EHLO mail-wg0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752023AbbBMOnm (ORCPT ); Fri, 13 Feb 2015 09:43:42 -0500 Date: Fri, 13 Feb 2015 15:44:38 +0100 From: Daniel Vetter To: Jani Nikula Cc: Andreas Ruprecht , David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [Intel-gfx] [PATCH] drm/i915: Remove references to previously removed UMS config option Message-ID: <20150213144438.GM24485@phenom.ffwll.local> Mail-Followup-To: Jani Nikula , Andreas Ruprecht , David Airlie , Daniel Vetter , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org References: <1423217807-13936-1-git-send-email-rupran@einserver.de> <87oap7wc12.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <87oap7wc12.fsf@intel.com> X-Operating-System: Linux phenom 3.16-2-amd64 User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2110 Lines: 56 On Fri, Feb 06, 2015 at 12:48:57PM +0200, Jani Nikula wrote: > On Fri, 06 Feb 2015, Andreas Ruprecht 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 > > --- > > 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 > Date: Mon Jun 2 16:58:30 2014 +0300 > > drm/i915: tell the user if both KMS and UMS are disabled > > Other than that, Undone ... > > Reviewed-by: Jani Nikula and merged for 3.21, thanks for patch&review. -Daniel -- Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/