From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH] drm/i915: Remove references to previously removed UMS config option Date: Fri, 06 Feb 2015 12:48:57 +0200 Message-ID: <87oap7wc12.fsf@intel.com> 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: David Airlie Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, Andreas Ruprecht , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org T24gRnJpLCAwNiBGZWIgMjAxNSwgQW5kcmVhcyBSdXByZWNodCA8cnVwcmFuQGVpbnNlcnZlci5k ZT4gd3JvdGU6Cj4gQ29tbWl0IDAzZGFlNTljNzJmZmZmZDggKCJkcm0vaTkxNTogRGl0Y2ggVU1T IGNvbmZpZyBvcHRpb24iKSByZW1vdmVkCj4gQ09ORklHX0RSTV9JOTE1X1VNUyBmcm9tIHRoZSBL Y29uZmlnIGZpbGUsIGJ1dCBpOTE1X2Rydi5jIHN0aWxsCj4gcmVmZXJlbmNlcyB0aGlzIG9wdGlv biBpbiB0d28gI2lmbmRlZiBzdGF0ZW1lbnRzLgo+Cj4gQXMgYW4gdW5kZWZpbmVkIGNvbmZpZyBv cHRpb24gd2lsbCBhbHdheXMgYmUgJ2ZhbHNlJywgd2UgY2FuIGRyb3AKPiB0aGUgI2lmbmRlZnMg YWxsdG9nZXRoZXIgYW5kIGFkYXB0IHRoZSBwcmludGVkIGVycm9yIG1lc3NhZ2UuCj4KPiBUaGlz IGluY29uc2lzdGVuY3kgd2FzIGZvdW5kIHdpdGggdGhlIHVuZGVydGFrZXIgdG9vbC4KPgo+IFNp Z25lZC1vZmYtYnk6IEFuZHJlYXMgUnVwcmVjaHQgPHJ1cHJhbkBlaW5zZXJ2ZXIuZGU+Cj4gLS0t Cj4gIGRyaXZlcnMvZ3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMgfCA2ICstLS0tLQo+ICAxIGZpbGUg Y2hhbmdlZCwgMSBpbnNlcnRpb24oKyksIDUgZGVsZXRpb25zKC0pCj4KPiBkaWZmIC0tZ2l0IGEv ZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9kcnYuYyBiL2RyaXZlcnMvZ3B1L2RybS9pOTE1L2k5 MTVfZHJ2LmMKPiBpbmRleCA4MDM5Y2VjLi40ZWNmODVmIDEwMDY0NAo+IC0tLSBhL2RyaXZlcnMv Z3B1L2RybS9pOTE1L2k5MTVfZHJ2LmMKPiArKysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1 X2Rydi5jCj4gQEAgLTE2MzAsMTEgKzE2MzAsOSBAQCBzdGF0aWMgaW50IF9faW5pdCBpOTE1X2lu aXQodm9pZCkKPiAgCj4gIAlpZiAoIShkcml2ZXIuZHJpdmVyX2ZlYXR1cmVzICYgRFJJVkVSX01P REVTRVQpKSB7Cj4gIAkJZHJpdmVyLmdldF92YmxhbmtfdGltZXN0YW1wID0gTlVMTDsKPiAtI2lm bmRlZiBDT05GSUdfRFJNX0k5MTVfVU1TCj4gIAkJLyogU2lsZW50bHkgZmFpbCBsb2FkaW5nIHRv IG5vdCB1cHNldCB1c2Vyc3BhY2UuICovCj4gLQkJRFJNX0RFQlVHX0RSSVZFUigiS01TIGFuZCBV TVMgZGlzYWJsZWQuXG4iKTsKPiArCQlEUk1fREVCVUdfRFJJVkVSKCJLTVMgZGlzYWJsZWQuXG4i KTsKCkknbSBub3Qgc3VyZSBpZiB0aGlzIGxvZ2dpbmcgY2hhbmdlIGlzIHJlcXVpcmVkLiBVTVMg d2lsbCBzdGlsbCBhbHNvIGJlCmRpc2FibGVkLiBPciBtYXliZSBtYWtlIGl0ICJLTVMgZGlzYWJs ZWQsIFVNUyBub3QKc3VwcG9ydGVkLlxuIi4gQmFja2dyb3VuZCBpbgoKY29tbWl0IGM5Y2Q3YjY1 ZGI1MDE3NWE1ZjFmZjY0YmJhZDZkNWFmZmRhZDZhYmEKQXV0aG9yOiBKYW5pIE5pa3VsYSA8amFu aS5uaWt1bGFAaW50ZWwuY29tPgpEYXRlOiAgIE1vbiBKdW4gMiAxNjo1ODozMCAyMDE0ICswMzAw CgogICAgZHJtL2k5MTU6IHRlbGwgdGhlIHVzZXIgaWYgYm90aCBLTVMgYW5kIFVNUyBhcmUgZGlz YWJsZWQKCk90aGVyIHRoYW4gdGhhdCwKClJldmlld2VkLWJ5OiBKYW5pIE5pa3VsYSA8amFuaS5u aWt1bGFAaW50ZWwuY29tPgoKPiAgCQlyZXR1cm4gMDsKPiAtI2VuZGlmCj4gIAl9Cj4gIAo+ICAJ LyoKPiBAQCAtMTY1MCwxMCArMTY0OCw4IEBAIHN0YXRpYyBpbnQgX19pbml0IGk5MTVfaW5pdCh2 b2lkKQo+ICAKPiAgc3RhdGljIHZvaWQgX19leGl0IGk5MTVfZXhpdCh2b2lkKQo+ICB7Cj4gLSNp Zm5kZWYgQ09ORklHX0RSTV9JOTE1X1VNUwo+ICAJaWYgKCEoZHJpdmVyLmRyaXZlcl9mZWF0dXJl cyAmIERSSVZFUl9NT0RFU0VUKSkKPiAgCQlyZXR1cm47IC8qIE5ldmVyIGxvYWRlZCBhIGRyaXZl ci4gKi8KPiAtI2VuZGlmCj4gIAo+ICAJZHJtX3BjaV9leGl0KCZkcml2ZXIsICZpOTE1X3BjaV9k cml2ZXIpOwo+ICB9Cj4gLS0gCj4gMS45LjEKPgoKLS0gCkphbmkgTmlrdWxhLCBJbnRlbCBPcGVu IFNvdXJjZSBUZWNobm9sb2d5IENlbnRlcgpfX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fXwpJbnRlbC1nZnggbWFpbGluZyBsaXN0CkludGVsLWdmeEBsaXN0cy5m cmVlZGVza3RvcC5vcmcKaHR0cDovL2xpc3RzLmZyZWVkZXNrdG9wLm9yZy9tYWlsbWFuL2xpc3Rp bmZvL2ludGVsLWdmeAo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754848AbbBFKr5 (ORCPT ); Fri, 6 Feb 2015 05:47:57 -0500 Received: from mga01.intel.com ([192.55.52.88]:36439 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751551AbbBFKr4 (ORCPT ); Fri, 6 Feb 2015 05:47:56 -0500 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,529,1418112000"; d="scan'208";a="673810565" From: Jani Nikula To: Andreas Ruprecht , David Airlie Cc: Daniel Vetter , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Andreas Ruprecht Subject: Re: [PATCH] drm/i915: Remove references to previously removed UMS config option In-Reply-To: <1423217807-13936-1-git-send-email-rupran@einserver.de> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <1423217807-13936-1-git-send-email-rupran@einserver.de> User-Agent: Notmuch/0.19+54~g59142f6 (http://notmuchmail.org) Emacs/24.4.1 (x86_64-pc-linux-gnu) Date: Fri, 06 Feb 2015 12:48:57 +0200 Message-ID: <87oap7wc12.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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, Reviewed-by: Jani Nikula > 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