From mboxrd@z Thu Jan 1 00:00:00 1970 From: Paul Bolle Subject: Re: [PATCH] drm/i915: Remove references to previously removed UMS config option Date: Fri, 06 Feb 2015 11:30:13 +0100 Message-ID: <1423218613.32511.20.camel@x220> References: <1423217807-13936-1-git-send-email-rupran@einserver.de> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: In-Reply-To: <1423217807-13936-1-git-send-email-rupran@einserver.de> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" To: Andreas Ruprecht Cc: David Airlie , intel-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, Daniel Vetter List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCAyMDE1LTAyLTA2IGF0IDExOjE2ICswMTAwLCBBbmRyZWFzIFJ1cHJlY2h0IHdyb3Rl Ogo+IENvbW1pdCAwM2RhZTU5YzcyZmZmZmQ4ICgiZHJtL2k5MTU6IERpdGNoIFVNUyBjb25maWcg b3B0aW9uIikgcmVtb3ZlZAo+IENPTkZJR19EUk1fSTkxNV9VTVMgZnJvbSB0aGUgS2NvbmZpZyBm aWxlLCBidXQgaTkxNV9kcnYuYyBzdGlsbAo+IHJlZmVyZW5jZXMgdGhpcyBvcHRpb24gaW4gdHdv ICNpZm5kZWYgc3RhdGVtZW50cy4KPiAKPiBBcyBhbiB1bmRlZmluZWQgY29uZmlnIG9wdGlvbiB3 aWxsIGFsd2F5cyBiZSAnZmFsc2UnLCB3ZSBjYW4gZHJvcAo+IHRoZSAjaWZuZGVmcyBhbGx0b2dl dGhlciBhbmQgYWRhcHQgdGhlIHByaW50ZWQgZXJyb3IgbWVzc2FnZS4KPiAKPiBUaGlzIGluY29u c2lzdGVuY3kgd2FzIGZvdW5kIHdpdGggdGhlIHVuZGVydGFrZXIgdG9vbC4KPiAKPiBTaWduZWQt b2ZmLWJ5OiBBbmRyZWFzIFJ1cHJlY2h0IDxydXByYW5AZWluc2VydmVyLmRlPgo+IC0tLQoKUHJl dmlvdXNseSBkaXNjdXNzZWQgaW4KaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9hcmNoaXZl cy9kcmktZGV2ZWwvMjAxNC1KdWx5LzA2NDcwMi5odG1sCihidXQgbm90IG9uIGxrbWwpLiBJZiBJ IHVuZGVyc3RhbmQgRGFuaWVscyBtZXNzYWdlIGNvcnJlY3RseSB0aGlzCiAgICAkIGdpdCBncmVw IC1uICchZHJtX2NvcmVfY2hlY2tfZmVhdHVyZScgfCBncmVwIC13IERSSVZFUl9NT0RFU0VUIHwg d2MgLWwKICAgIDQzCgptZWFucyB0aGUgY2xlYW51cCBuZWVkZWQgdG8gYmUgZG9uZSBiZWZvcmUg dGhpcyBjbGVhbnVwIHdpbGwgYmUgYXBwbGllZCwKaGFzbid0IGhhcHBlbmVkIHlldC4KCj4gIGRy aXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCA2ICstLS0tLQo+ICAxIGZpbGUgY2hhbmdl ZCwgMSBpbnNlcnRpb24oKyksIDUgZGVsZXRpb25zKC0pCj4gCj4gZGlmZiAtLWdpdCBhL2RyaXZl cnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X2Ry di5jCj4gaW5kZXggODAzOWNlYy4uNGVjZjg1ZiAxMDA2NDQKPiAtLS0gYS9kcml2ZXJzL2dwdS9k cm0vaTkxNS9pOTE1X2Rydi5jCj4gKysrIGIvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYu Ywo+IEBAIC0xNjMwLDExICsxNjMwLDkgQEAgc3RhdGljIGludCBfX2luaXQgaTkxNV9pbml0KHZv aWQpCj4gIAo+ICAJaWYgKCEoZHJpdmVyLmRyaXZlcl9mZWF0dXJlcyAmIERSSVZFUl9NT0RFU0VU KSkgewo+ICAJCWRyaXZlci5nZXRfdmJsYW5rX3RpbWVzdGFtcCA9IE5VTEw7Cj4gLSNpZm5kZWYg Q09ORklHX0RSTV9JOTE1X1VNUwo+ICAJCS8qIFNpbGVudGx5IGZhaWwgbG9hZGluZyB0byBub3Qg dXBzZXQgdXNlcnNwYWNlLiAqLwo+IC0JCURSTV9ERUJVR19EUklWRVIoIktNUyBhbmQgVU1TIGRp c2FibGVkLlxuIik7Cj4gKwkJRFJNX0RFQlVHX0RSSVZFUigiS01TIGRpc2FibGVkLlxuIik7Cj4g IAkJcmV0dXJuIDA7Cj4gLSNlbmRpZgo+ICAJfQo+ICAKPiAgCS8qCj4gQEAgLTE2NTAsMTAgKzE2 NDgsOCBAQCBzdGF0aWMgaW50IF9faW5pdCBpOTE1X2luaXQodm9pZCkKPiAgCj4gIHN0YXRpYyB2 b2lkIF9fZXhpdCBpOTE1X2V4aXQodm9pZCkKPiAgewo+IC0jaWZuZGVmIENPTkZJR19EUk1fSTkx NV9VTVMKPiAgCWlmICghKGRyaXZlci5kcml2ZXJfZmVhdHVyZXMgJiBEUklWRVJfTU9ERVNFVCkp Cj4gIAkJcmV0dXJuOyAvKiBOZXZlciBsb2FkZWQgYSBkcml2ZXIuICovCj4gLSNlbmRpZgo+ICAK PiAgCWRybV9wY2lfZXhpdCgmZHJpdmVyLCAmaTkxNV9wY2lfZHJpdmVyKTsKPiAgfQoKVGhhbmtz LAoKClBhdWwgQm9sbGUKCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxpc3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9w Lm9yZwpodHRwOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8vaW50ZWwt Z2Z4Cg== From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752175AbbBFKaR (ORCPT ); Fri, 6 Feb 2015 05:30:17 -0500 Received: from cpsmtpb-ews10.kpnxchange.com ([213.75.39.15]:54199 "EHLO cpsmtpb-ews10.kpnxchange.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751182AbbBFKaP (ORCPT ); Fri, 6 Feb 2015 05:30:15 -0500 Message-ID: <1423218613.32511.20.camel@x220> Subject: Re: [PATCH] drm/i915: Remove references to previously removed UMS config option From: Paul Bolle To: Andreas Ruprecht Cc: David Airlie , Daniel Vetter , Jani Nikula , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Date: Fri, 06 Feb 2015 11:30:13 +0100 In-Reply-To: <1423217807-13936-1-git-send-email-rupran@einserver.de> References: <1423217807-13936-1-git-send-email-rupran@einserver.de> Content-Type: text/plain; charset="UTF-8" X-Mailer: Evolution 3.10.4 (3.10.4-4.fc20) Mime-Version: 1.0 Content-Transfer-Encoding: 7bit X-OriginalArrivalTime: 06 Feb 2015 10:30:14.0665 (UTC) FILETIME=[E4E47790:01D041F7] X-RcptDomain: vger.kernel.org Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Fri, 2015-02-06 at 11:16 +0100, 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 > --- Previously discussed in http://lists.freedesktop.org/archives/dri-devel/2014-July/064702.html (but not on lkml). If I understand Daniels message correctly this $ git grep -n '!drm_core_check_feature' | grep -w DRIVER_MODESET | wc -l 43 means the cleanup needed to be done before this cleanup will be applied, hasn't happened yet. > 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"); > 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); > } Thanks, Paul Bolle