From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E4A27C47082 for ; Wed, 26 May 2021 14:19:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ADC9B613D4 for ; Wed, 26 May 2021 14:19:55 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ADC9B613D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 88EA56ED7E; Wed, 26 May 2021 14:19:54 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 490216ED1E; Wed, 26 May 2021 14:19:53 +0000 (UTC) IronPort-SDR: uAhg/rF/fsKWFcuvKoyApeXwUC8X8DgSeRsZoq1HO86FwR2wquslNOm1Ms/JQkCHxj2FavhplL 4Pk/HHdeO2SA== X-IronPort-AV: E=McAfee;i="6200,9189,9996"; a="182122512" X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="182122512" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 07:19:52 -0700 IronPort-SDR: 4tT9HheDhqBJDmkOfDDQalFYQAoR1R6kszn4f1FZ7Jl9zOSyNbhULiG8HyaTr5QP5fTwGmshsV 7UF578j5QYlQ== X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="444068796" Received: from wardmich-mobl.ger.corp.intel.com (HELO tursulin-mobl2.home) ([10.213.209.181]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 07:19:51 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Subject: [PATCH v2] drm/i915/params: Align visibility of device level and global modparams Date: Wed, 26 May 2021 15:19:46 +0100 Message-Id: <20210526141946.2347085-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210526100006.2205062-1-tvrtko.ursulin@linux.intel.com> References: <20210526100006.2205062-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , dri-devel@lists.freedesktop.org, Tvrtko Ursulin Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Tvrtko Ursulin We have a few modparams which get conditionaly exposed based on a Kconfig options and in most cases this also means portions of the driver implementing the respective feature are also left out. Align the visibility of device level and global modparams to make them consistent in this respect. v2: * Fix misplaced parentheses. Signed-off-by: Tvrtko Ursulin Cc: Jani Nikula Cc: Ville Syrjälä --- drivers/gpu/drm/i915/i915_params.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_params.h b/drivers/gpu/drm/i915/i915_params.h index 14cd64cc61d0..4a114a5ad000 100644 --- a/drivers/gpu/drm/i915/i915_params.h +++ b/drivers/gpu/drm/i915/i915_params.h @@ -71,18 +71,18 @@ struct drm_printer; param(int, fastboot, -1, 0600) \ param(int, enable_dpcd_backlight, -1, 0600) \ param(char *, force_probe, CONFIG_DRM_I915_FORCE_PROBE, 0400) \ - param(unsigned long, fake_lmem_start, 0, 0400) \ - param(unsigned int, request_timeout_ms, CONFIG_DRM_I915_REQUEST_TIMEOUT, 0600) \ + param(unsigned long, fake_lmem_start, 0, IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM) ? 0400 : 0) \ + param(unsigned int, request_timeout_ms, CONFIG_DRM_I915_REQUEST_TIMEOUT, CONFIG_DRM_I915_REQUEST_TIMEOUT ? 0600 : 0) \ /* leave bools at the end to not create holes */ \ param(bool, enable_hangcheck, true, 0600) \ param(bool, load_detect_test, false, 0600) \ param(bool, force_reset_modeset_test, false, 0600) \ - param(bool, error_capture, true, 0600) \ + param(bool, error_capture, true, IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) ? 0600 : 0) \ param(bool, disable_display, false, 0400) \ param(bool, verbose_state_checks, true, 0) \ param(bool, nuclear_pageflip, false, 0400) \ param(bool, enable_dp_mst, true, 0600) \ - param(bool, enable_gvt, false, 0400) + param(bool, enable_gvt, false, IS_ENABLED(CONFIG_DRM_I915_GVT) ? 0400 : 0) #define MEMBER(T, member, ...) T member; struct i915_params { -- 2.30.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,HK_RANDOM_FROM,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 29085C47088 for ; Wed, 26 May 2021 14:19:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DA3BC613D4 for ; Wed, 26 May 2021 14:19:54 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DA3BC613D4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linux.intel.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=intel-gfx-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5DF9B6ED1E; Wed, 26 May 2021 14:19:54 +0000 (UTC) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by gabe.freedesktop.org (Postfix) with ESMTPS id 490216ED1E; Wed, 26 May 2021 14:19:53 +0000 (UTC) IronPort-SDR: uAhg/rF/fsKWFcuvKoyApeXwUC8X8DgSeRsZoq1HO86FwR2wquslNOm1Ms/JQkCHxj2FavhplL 4Pk/HHdeO2SA== X-IronPort-AV: E=McAfee;i="6200,9189,9996"; a="182122512" X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="182122512" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 07:19:52 -0700 IronPort-SDR: 4tT9HheDhqBJDmkOfDDQalFYQAoR1R6kszn4f1FZ7Jl9zOSyNbhULiG8HyaTr5QP5fTwGmshsV 7UF578j5QYlQ== X-IronPort-AV: E=Sophos;i="5.82,331,1613462400"; d="scan'208";a="444068796" Received: from wardmich-mobl.ger.corp.intel.com (HELO tursulin-mobl2.home) ([10.213.209.181]) by fmsmga008-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 26 May 2021 07:19:51 -0700 From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Wed, 26 May 2021 15:19:46 +0100 Message-Id: <20210526141946.2347085-1-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210526100006.2205062-1-tvrtko.ursulin@linux.intel.com> References: <20210526100006.2205062-1-tvrtko.ursulin@linux.intel.com> MIME-Version: 1.0 Subject: [Intel-gfx] [PATCH v2] drm/i915/params: Align visibility of device level and global modparams X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jani Nikula , dri-devel@lists.freedesktop.org Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" RnJvbTogVHZydGtvIFVyc3VsaW4gPHR2cnRrby51cnN1bGluQGludGVsLmNvbT4KCldlIGhhdmUg YSBmZXcgbW9kcGFyYW1zIHdoaWNoIGdldCBjb25kaXRpb25hbHkgZXhwb3NlZCBiYXNlZCBvbiBh IEtjb25maWcKb3B0aW9ucyBhbmQgaW4gbW9zdCBjYXNlcyB0aGlzIGFsc28gbWVhbnMgcG9ydGlv bnMgb2YgdGhlIGRyaXZlcgppbXBsZW1lbnRpbmcgdGhlIHJlc3BlY3RpdmUgZmVhdHVyZSBhcmUg YWxzbyBsZWZ0IG91dC4KCkFsaWduIHRoZSB2aXNpYmlsaXR5IG9mIGRldmljZSBsZXZlbCBhbmQg Z2xvYmFsIG1vZHBhcmFtcyB0byBtYWtlIHRoZW0KY29uc2lzdGVudCBpbiB0aGlzIHJlc3BlY3Qu Cgp2MjoKICogRml4IG1pc3BsYWNlZCBwYXJlbnRoZXNlcy4KClNpZ25lZC1vZmYtYnk6IFR2cnRr byBVcnN1bGluIDx0dnJ0a28udXJzdWxpbkBpbnRlbC5jb20+CkNjOiBKYW5pIE5pa3VsYSA8amFu aS5uaWt1bGFAaW50ZWwuY29tPgpDYzogVmlsbGUgU3lyasOkbMOkIDx2aWxsZS5zeXJqYWxhQGxp bnV4LmludGVsLmNvbT4KLS0tCiBkcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oIHwg OCArKysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDQgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMo LSkKCmRpZmYgLS1naXQgYS9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oIGIvZHJp dmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaAppbmRleCAxNGNkNjRjYzYxZDAuLjRhMTE0 YTVhZDAwMCAxMDA2NDQKLS0tIGEvZHJpdmVycy9ncHUvZHJtL2k5MTUvaTkxNV9wYXJhbXMuaAor KysgYi9kcml2ZXJzL2dwdS9kcm0vaTkxNS9pOTE1X3BhcmFtcy5oCkBAIC03MSwxOCArNzEsMTgg QEAgc3RydWN0IGRybV9wcmludGVyOwogCXBhcmFtKGludCwgZmFzdGJvb3QsIC0xLCAwNjAwKSBc CiAJcGFyYW0oaW50LCBlbmFibGVfZHBjZF9iYWNrbGlnaHQsIC0xLCAwNjAwKSBcCiAJcGFyYW0o Y2hhciAqLCBmb3JjZV9wcm9iZSwgQ09ORklHX0RSTV9JOTE1X0ZPUkNFX1BST0JFLCAwNDAwKSBc Ci0JcGFyYW0odW5zaWduZWQgbG9uZywgZmFrZV9sbWVtX3N0YXJ0LCAwLCAwNDAwKSBcCi0JcGFy YW0odW5zaWduZWQgaW50LCByZXF1ZXN0X3RpbWVvdXRfbXMsIENPTkZJR19EUk1fSTkxNV9SRVFV RVNUX1RJTUVPVVQsIDA2MDApIFwKKwlwYXJhbSh1bnNpZ25lZCBsb25nLCBmYWtlX2xtZW1fc3Rh cnQsIDAsIElTX0VOQUJMRUQoQ09ORklHX0RSTV9JOTE1X1VOU1RBQkxFX0ZBS0VfTE1FTSkgPyAw NDAwIDogMCkgXAorCXBhcmFtKHVuc2lnbmVkIGludCwgcmVxdWVzdF90aW1lb3V0X21zLCBDT05G SUdfRFJNX0k5MTVfUkVRVUVTVF9USU1FT1VULCBDT05GSUdfRFJNX0k5MTVfUkVRVUVTVF9USU1F T1VUID8gMDYwMCA6IDApIFwKIAkvKiBsZWF2ZSBib29scyBhdCB0aGUgZW5kIHRvIG5vdCBjcmVh dGUgaG9sZXMgKi8gXAogCXBhcmFtKGJvb2wsIGVuYWJsZV9oYW5nY2hlY2ssIHRydWUsIDA2MDAp IFwKIAlwYXJhbShib29sLCBsb2FkX2RldGVjdF90ZXN0LCBmYWxzZSwgMDYwMCkgXAogCXBhcmFt KGJvb2wsIGZvcmNlX3Jlc2V0X21vZGVzZXRfdGVzdCwgZmFsc2UsIDA2MDApIFwKLQlwYXJhbShi b29sLCBlcnJvcl9jYXB0dXJlLCB0cnVlLCAwNjAwKSBcCisJcGFyYW0oYm9vbCwgZXJyb3JfY2Fw dHVyZSwgdHJ1ZSwgSVNfRU5BQkxFRChDT05GSUdfRFJNX0k5MTVfQ0FQVFVSRV9FUlJPUikgPyAw NjAwIDogMCkgXAogCXBhcmFtKGJvb2wsIGRpc2FibGVfZGlzcGxheSwgZmFsc2UsIDA0MDApIFwK IAlwYXJhbShib29sLCB2ZXJib3NlX3N0YXRlX2NoZWNrcywgdHJ1ZSwgMCkgXAogCXBhcmFtKGJv b2wsIG51Y2xlYXJfcGFnZWZsaXAsIGZhbHNlLCAwNDAwKSBcCiAJcGFyYW0oYm9vbCwgZW5hYmxl X2RwX21zdCwgdHJ1ZSwgMDYwMCkgXAotCXBhcmFtKGJvb2wsIGVuYWJsZV9ndnQsIGZhbHNlLCAw NDAwKQorCXBhcmFtKGJvb2wsIGVuYWJsZV9ndnQsIGZhbHNlLCBJU19FTkFCTEVEKENPTkZJR19E Uk1fSTkxNV9HVlQpID8gMDQwMCA6IDApCiAKICNkZWZpbmUgTUVNQkVSKFQsIG1lbWJlciwgLi4u KSBUIG1lbWJlcjsKIHN0cnVjdCBpOTE1X3BhcmFtcyB7Ci0tIAoyLjMwLjIKCl9fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCkludGVsLWdmeCBtYWlsaW5nIGxp c3QKSW50ZWwtZ2Z4QGxpc3RzLmZyZWVkZXNrdG9wLm9yZwpodHRwczovL2xpc3RzLmZyZWVkZXNr dG9wLm9yZy9tYWlsbWFuL2xpc3RpbmZvL2ludGVsLWdmeAo=