Skip to content

Commit 6151603

Browse files
committed
drm/i915/params: Align visibility of device level and global modparams
We have a few modparams which get conditionally 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 <[email protected]> Cc: Jani Nikula <[email protected]> Cc: Ville Syrjälä <[email protected]> Reviewed-by: Jani Nikula <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 0669a6e commit 6151603

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

drivers/gpu/drm/i915/i915_params.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,18 @@ struct drm_printer;
7171
param(int, fastboot, -1, 0600) \
7272
param(int, enable_dpcd_backlight, -1, 0600) \
7373
param(char *, force_probe, CONFIG_DRM_I915_FORCE_PROBE, 0400) \
74-
param(unsigned long, fake_lmem_start, 0, 0400) \
75-
param(unsigned int, request_timeout_ms, CONFIG_DRM_I915_REQUEST_TIMEOUT, 0600) \
74+
param(unsigned long, fake_lmem_start, 0, IS_ENABLED(CONFIG_DRM_I915_UNSTABLE_FAKE_LMEM) ? 0400 : 0) \
75+
param(unsigned int, request_timeout_ms, CONFIG_DRM_I915_REQUEST_TIMEOUT, CONFIG_DRM_I915_REQUEST_TIMEOUT ? 0600 : 0) \
7676
/* leave bools at the end to not create holes */ \
7777
param(bool, enable_hangcheck, true, 0600) \
7878
param(bool, load_detect_test, false, 0600) \
7979
param(bool, force_reset_modeset_test, false, 0600) \
80-
param(bool, error_capture, true, 0600) \
80+
param(bool, error_capture, true, IS_ENABLED(CONFIG_DRM_I915_CAPTURE_ERROR) ? 0600 : 0) \
8181
param(bool, disable_display, false, 0400) \
8282
param(bool, verbose_state_checks, true, 0) \
8383
param(bool, nuclear_pageflip, false, 0400) \
8484
param(bool, enable_dp_mst, true, 0600) \
85-
param(bool, enable_gvt, false, 0400)
85+
param(bool, enable_gvt, false, IS_ENABLED(CONFIG_DRM_I915_GVT) ? 0400 : 0)
8686

8787
#define MEMBER(T, member, ...) T member;
8888
struct i915_params {

0 commit comments

Comments
 (0)