drm/i915: Rename global i915 to i915_params
v3 cover drm/i915: Rename global i915 to i915_params
Our global struct with params is named exactly the same way as new preferred name for the drm_i915_private function parameter.
To avoid such name reuse and allow further cleanup of deprecated dev_priv lets use different name for the global.
Most of the changes were done by Coccinelle.
v2: But before doing that, do some cleanup in params definitions
to make actual (and future) rename easier (Chris, Jani, Tvrtko)
v3: Separate macros for set/inc/dec (Jani)
Michal Wajdeczko (5):
drm/i915: Rename lvds_use_ssc modparam to panel_use_ssc drm/i915: Introduce custom variant of module_param_named macro drm/i915: Extend private i915_param_named macro with description drm/i915: Wrap access to module params into macro drm/i915: Rename global i915 to i915_params
drivers/gpu/drm/i915/gvt/render.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 14 +-- drivers/gpu/drm/i915/i915_drv.c | 33 ++--- drivers/gpu/drm/i915/i915_drv.h | 10 +- drivers/gpu/drm/i915/i915_gem.c | 6 +- drivers/gpu/drm/i915/i915_gem_context.c | 12 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 +- drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/i915_params.c | 166 +++++++++++--------------- drivers/gpu/drm/i915/i915_params.h | 8 +- drivers/gpu/drm/i915/i915_pci.c | 6 +- drivers/gpu/drm/i915/i915_perf.c | 6 +- drivers/gpu/drm/i915/intel_bios.c | 6 +- drivers/gpu/drm/i915/intel_crt.c | 4 +- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 12 +- drivers/gpu/drm/i915/intel_dp.c | 4 +- drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 6 +- drivers/gpu/drm/i915/intel_fbc.c | 11 +- drivers/gpu/drm/i915/intel_guc_loader.c | 13 +- drivers/gpu/drm/i915/intel_guc_log.c | 25 ++-- drivers/gpu/drm/i915/intel_gvt.c | 12 +- drivers/gpu/drm/i915/intel_hangcheck.c | 2 +- drivers/gpu/drm/i915/intel_huc.c | 4 +- drivers/gpu/drm/i915/intel_lrc.c | 8 +- drivers/gpu/drm/i915/intel_lvds.c | 4 +- drivers/gpu/drm/i915/intel_opregion.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 8 +- drivers/gpu/drm/i915/intel_pm.c | 6 +- drivers/gpu/drm/i915/intel_psr.c | 10 +- drivers/gpu/drm/i915/intel_ringbuffer.c | 8 +- drivers/gpu/drm/i915/intel_runtime_pm.c | 16 +-- drivers/gpu/drm/i915/intel_uc.c | 51 ++++---- drivers/gpu/drm/i915/intel_uncore.c | 23 ++-- 39 files changed, 253 insertions(+), 269 deletions(-)
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 1/5 drm/i915: Rename lvds_use_ssc modparam to panel_use_ssc
This modparam affects not only LVDS but also eDP panels. Additionally with this rename we will keep modparam and i915_params field name in sync. This patch will unblock us with further improvements around params defs.
--- drivers/gpu/drm/i915/i915_params.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/i915/i915_params.c +2 -2
@@ -105,8 +105,8 @@ MODULE_PARM_DESC(lvds_channel_mode,"Specify LVDS channel mode " "(0=probe BIOS [default], 1=single-channel, 2=dual-channel)"); -module_param_named_unsafe (lvds_use_ssc, i915.panel_use_ssc, int,0600 ); -MODULE_PARM_DESC (lvds_use_ssc, +module_param_named_unsafe (panel_use_ssc, i915.panel_use_ssc, int,0600 ); +MODULE_PARM_DESC (panel_use_ssc,"Use Spread Spectrum Clock with panels [LVDS/eDP] " "(default: auto from VBT)" );
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 2/5 drm/i915: Introduce custom variant of module_param_named macro
In reply to Michal WajdeczkoAs we now use same name for public module param and its local representation we can simplify param definition macro.
Changes done with Coccinelle:
@@
declarer name module_param_named;
declarer name module_param_named_unsafe;
declarer name i915_param_named;
declarer name i915_param_named_unsafe;
identifier n;
@@
(
-module_param_named(n, i915.n,
+i915_module_param_named(n,
...);
|
-module_param_named_unsafe(n, i915.n,
+i915_module_param_named_unsafe(n,
...);
)
--- drivers/gpu/drm/i915/i915_params.c | 85 ++++++++++++++++++++------------------ 1 file changed, 45 insertions(+), 40 deletions(-)
drivers/gpu/drm/i915/i915_params.c +45 -40
@@ -25,6 +25,11 @@#include "i915_params.h" #include "i915_drv.h" +#define i915_param_named (name,T , perm) \ + module_param_named(name, i915.name, T, perm) +#define i915_param_named_unsafe (name,T , perm) \ + module_param_named_unsafe(name, i915.name, T, perm) +struct i915_params i915__read_mostly = { .modeset =-1 , .panel_ignore_lid =1 ,
@@ -67,22 +72,22 @@ struct i915_params i915 __read_mostly = { .enable_gvt = false, }; -module_param_named (modeset, i915.modeset, int,0400 ); +i915_param_named (modeset, int,0400 );MODULE_PARM_DESC (modeset,"Use kernel modesetting [KMS] (0=disable, " "1=on, -1=force vga console preference [default])" ); -module_param_named_unsafe (panel_ignore_lid, i915.panel_ignore_lid, int,0600 ); +i915_param_named_unsafe (panel_ignore_lid, int,0600 );MODULE_PARM_DESC (panel_ignore_lid,"Override lid status (0=autodetect, 1=autodetect disabled [default], " "-1=force lid closed, -2=force lid open)" ); -module_param_named_unsafe (semaphores, i915.semaphores, int,0400 ); +i915_param_named_unsafe (semaphores, int,0400 );MODULE_PARM_DESC (semaphores,"Use semaphores for inter-ring sync " "(default: -1 (use per-chip defaults))" ); -module_param_named_unsafe (enable_rc6, i915.enable_rc6, int,0400 ); +i915_param_named_unsafe (enable_rc6, int,0400 );MODULE_PARM_DESC (enable_rc6,"Enable power-saving render C-state 6. " "Different stages can be selected via bitmask values "
@@ -90,100 +95,100 @@ MODULE_PARM_DESC(enable_rc6,"For example, 3 would enable rc6 and deep rc6, and 7 would enable everything. " "default: -1 (use per-chip default)"); -module_param_named_unsafe (enable_dc, i915.enable_dc, int,0400 ); +i915_param_named_unsafe (enable_dc, int,0400 );MODULE_PARM_DESC (enable_dc,"Enable power-saving display C-states. " "(-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6)" ); -module_param_named_unsafe (enable_fbc, i915.enable_fbc, int,0600 ); +i915_param_named_unsafe (enable_fbc, int,0600 );MODULE_PARM_DESC (enable_fbc,"Enable frame buffer compression for power savings " "(default: -1 (use per-chip default))" ); -module_param_named_unsafe (lvds_channel_mode, i915.lvds_channel_mode, int,0400 ); +i915_param_named_unsafe (lvds_channel_mode, int,0400 );MODULE_PARM_DESC (lvds_channel_mode,"Specify LVDS channel mode " "(0=probe BIOS [default], 1=single-channel, 2=dual-channel)" ); -module_param_named_unsafe (panel_use_ssc, i915.panel_use_ssc, int,0600 ); +i915_param_named_unsafe (panel_use_ssc, int,0600 );MODULE_PARM_DESC (panel_use_ssc,"Use Spread Spectrum Clock with panels [LVDS/eDP] " "(default: auto from VBT)" ); -module_param_named_unsafe (vbt_sdvo_panel_type, i915.vbt_sdvo_panel_type, int,0400 ); +i915_param_named_unsafe (vbt_sdvo_panel_type, int,0400 );MODULE_PARM_DESC (vbt_sdvo_panel_type,"Override/Ignore selection of SDVO panel mode in the VBT " "(-2=ignore, -1=auto [default], index in VBT BIOS table)" ); -module_param_named_unsafe (reset, i915.reset, int,0600 ); +i915_param_named_unsafe (reset, int,0600 );MODULE_PARM_DESC (reset,"Attempt GPU resets (0=disabled, 1=full gpu reset, 2=engine reset [default])" ); -module_param_named_unsafe (vbt_firmware, i915.vbt_firmware, charp,0400 ); +i915_param_named_unsafe (vbt_firmware, charp,0400 );MODULE_PARM_DESC (vbt_firmware,"Load VBT from specified file under /lib/firmware" );#if IS_ENABLED (CONFIG_DRM_I915_CAPTURE_ERROR ) -module_param_named (error_capture, i915.error_capture, bool,0600 ); +i915_param_named (error_capture, bool,0600 );MODULE_PARM_DESC (error_capture,"Record the GPU state following a hang. " "This information in /sys/class/drm/card<N>/error is vital for " "triaging and debugging hangs." );#endif -module_param_named_unsafe (enable_hangcheck, i915.enable_hangcheck, bool,0644 ); +i915_param_named_unsafe (enable_hangcheck, bool,0644 );MODULE_PARM_DESC (enable_hangcheck,"Periodically check GPU activity for detecting hangs. " "WARNING: Disabling this can cause system wide hangs. " "(default: true)" ); -module_param_named_unsafe (enable_ppgtt, i915.enable_ppgtt, int,0400 ); +i915_param_named_unsafe (enable_ppgtt, int,0400 );MODULE_PARM_DESC (enable_ppgtt,"Override PPGTT usage. " "(-1=auto [default], 0=disabled, 1=aliasing, 2=full, 3=full with extended address space)" ); -module_param_named_unsafe (enable_execlists, i915.enable_execlists, int,0400 ); +i915_param_named_unsafe (enable_execlists, int,0400 );MODULE_PARM_DESC (enable_execlists,"Override execlists usage. " "(-1=auto [default], 0=disabled, 1=enabled)" ); -module_param_named_unsafe (enable_psr, i915.enable_psr, int,0600 ); +i915_param_named_unsafe (enable_psr, int,0600 );MODULE_PARM_DESC (enable_psr,"Enable PSR " "(0=disabled, 1=enabled - link mode chosen per-platform, 2=force link-standby mode, 3=force link-off mode) " "Default: -1 (use per-chip default)" ); -module_param_named_unsafe (alpha_support, i915.alpha_support, bool,0400 ); +i915_param_named_unsafe (alpha_support, bool,0400 );MODULE_PARM_DESC (alpha_support,"Enable alpha quality driver support for latest hardware. " "See also CONFIG_DRM_I915_ALPHA_SUPPORT." ); -module_param_named_unsafe (disable_power_well, i915.disable_power_well, int,0400 ); +i915_param_named_unsafe (disable_power_well, int,0400 );MODULE_PARM_DESC (disable_power_well,"Disable display power wells when possible " "(-1=auto [default], 0=power wells always on, 1=power wells disabled when possible)" ); -module_param_named_unsafe (enable_ips, i915.enable_ips, int,0600 ); +i915_param_named_unsafe (enable_ips, int,0600 );MODULE_PARM_DESC (enable_ips,"Enable IPS (default: true)" ); -module_param_named (fastboot, i915.fastboot, bool,0600 ); +i915_param_named (fastboot, bool,0600 );MODULE_PARM_DESC (fastboot,"Try to skip unnecessary mode sets at boot time (default: false)" ); -module_param_named_unsafe (prefault_disable, i915.prefault_disable, bool,0600 ); +i915_param_named_unsafe (prefault_disable, bool,0600 );MODULE_PARM_DESC (prefault_disable,"Disable page prefaulting for pread/pwrite/reloc (default:false). " "For developers only." ); -module_param_named_unsafe (load_detect_test, i915.load_detect_test, bool,0600 ); +i915_param_named_unsafe (load_detect_test, bool,0600 );MODULE_PARM_DESC (load_detect_test,"Force-enable the VGA load detect code for testing (default:false). " "For developers only." ); -module_param_named_unsafe (force_reset_modeset_test, i915.force_reset_modeset_test, bool,0600 ); +i915_param_named_unsafe (force_reset_modeset_test, bool,0600 );MODULE_PARM_DESC (force_reset_modeset_test,"Force a modeset during gpu reset for testing (default:false). " "For developers only." ); -module_param_named_unsafe (invert_brightness, i915.invert_brightness, int,0600 ); +i915_param_named_unsafe (invert_brightness, int,0600 );MODULE_PARM_DESC (invert_brightness,"Invert backlight brightness " "(-1 force normal, 0 machine defaults, 1 force inversion), please "
@@ -191,69 +196,69 @@ MODULE_PARM_DESC(invert_brightness,"to [email protected], if your machine needs it. " "It will then be included in an upcoming module version."); -module_param_named (disable_display, i915.disable_display, bool,0400 ); +i915_param_named (disable_display, bool,0400 );MODULE_PARM_DESC (disable_display,"Disable display (default: false)" ); -module_param_named_unsafe (enable_cmd_parser, i915.enable_cmd_parser, bool,0400 ); +i915_param_named_unsafe (enable_cmd_parser, bool,0400 );MODULE_PARM_DESC (enable_cmd_parser,"Enable command parsing (true=enabled [default], false=disabled)" ); -module_param_named_unsafe (use_mmio_flip, i915.use_mmio_flip, int,0600 ); +i915_param_named_unsafe (use_mmio_flip, int,0600 );MODULE_PARM_DESC (use_mmio_flip,"use MMIO flips (-1=never, 0=driver discretion [default], 1=always)" ); -module_param_named (mmio_debug, i915.mmio_debug, int,0600 ); +i915_param_named (mmio_debug, int,0600 );MODULE_PARM_DESC (mmio_debug,"Enable the MMIO debug code for the first N failures (default: off). " "This may negatively affect performance." ); -module_param_named (verbose_state_checks, i915.verbose_state_checks, bool,0600 ); +i915_param_named (verbose_state_checks, bool,0600 );MODULE_PARM_DESC (verbose_state_checks,"Enable verbose logs (ie. WARN_ON()) in case of unexpected hw state conditions." ); -module_param_named_unsafe (nuclear_pageflip, i915.nuclear_pageflip, bool,0400 ); +i915_param_named_unsafe (nuclear_pageflip, bool,0400 );MODULE_PARM_DESC (nuclear_pageflip,"Force enable atomic functionality on platforms that don't have full support yet." );/* WA to get away with the default setting in VBT for early platforms.Will be removed */ -module_param_named_unsafe (edp_vswing, i915.edp_vswing, int,0400 ); +i915_param_named_unsafe (edp_vswing, int,0400 );MODULE_PARM_DESC (edp_vswing,"Ignore/Override vswing pre-emph table selection from VBT " "(0=use value from vbt [default], 1=low power swing(200mV)," "2=default swing(400mV))" ); -module_param_named_unsafe (enable_guc_loading, i915.enable_guc_loading, int,0400 ); +i915_param_named_unsafe (enable_guc_loading, int,0400 );MODULE_PARM_DESC (enable_guc_loading,"Enable GuC firmware loading " "(-1=auto, 0=never [default], 1=if available, 2=required)" ); -module_param_named_unsafe (enable_guc_submission, i915.enable_guc_submission, int,0400 ); +i915_param_named_unsafe (enable_guc_submission, int,0400 );MODULE_PARM_DESC (enable_guc_submission,"Enable GuC submission " "(-1=auto, 0=never [default], 1=if available, 2=required)" ); -module_param_named (guc_log_level, i915.guc_log_level, int,0400 ); +i915_param_named (guc_log_level, int,0400 );MODULE_PARM_DESC (guc_log_level,"GuC firmware logging level (-1:disabled (default), 0-3:enabled)" ); -module_param_named_unsafe (guc_firmware_path, i915.guc_firmware_path, charp,0400 ); +i915_param_named_unsafe (guc_firmware_path, charp,0400 );MODULE_PARM_DESC (guc_firmware_path,"GuC firmware path to use instead of the default one" ); -module_param_named_unsafe (huc_firmware_path, i915.huc_firmware_path, charp,0400 ); +i915_param_named_unsafe (huc_firmware_path, charp,0400 );MODULE_PARM_DESC (huc_firmware_path,"HuC firmware path to use instead of the default one" ); -module_param_named_unsafe (enable_dp_mst, i915.enable_dp_mst, bool,0600 ); +i915_param_named_unsafe (enable_dp_mst, bool,0600 );MODULE_PARM_DESC (enable_dp_mst,"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)" ); -module_param_named_unsafe (inject_load_failure, i915.inject_load_failure, uint,0400 ); +i915_param_named_unsafe (inject_load_failure, uint,0400 );MODULE_PARM_DESC (inject_load_failure,"Force an error after a number of failure check points (0:disabled (default), N:force failure at the Nth failure check point)" ); -module_param_named (enable_dpcd_backlight, i915.enable_dpcd_backlight, bool,0600 ); +i915_param_named (enable_dpcd_backlight, bool,0600 );MODULE_PARM_DESC (enable_dpcd_backlight,"Enable support for DPCD backlight control (default:false)" ); -module_param_named (enable_gvt, i915.enable_gvt, bool,0400 ); +i915_param_named (enable_gvt, bool,0400 );MODULE_PARM_DESC (enable_gvt,"Enable support for Intel GVT-g graphics virtualization host support(default:false)" );
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 2/5] drm/i915: Introduce custom variant of module_param_named macro
Quoting Michal Wajdeczko (2017-09-14 16:08:02)
Quoted 23 lines
As we now use same name for public module param and its local representation we can simplify param definition macro.
Changes done with Coccinelle:
@@
declarer namemodule_param_named;
declarer namemodule_param_named_unsafe;
declarer namei915_param_named;
declarer namei915_param_named_unsafe;
identifier n;
@@(
(quoted diff) +1
-1-module_param_named(n, i915.n, +i915_module_param_named(n, ...);|
(quoted diff) +1
-1-module_param_named_unsafe(n, i915.n, +i915_module_param_named_unsafe(n, ...);)
Quoted 3 lines
Suggested-by Chris Wilson <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>Cc Chris Wilson <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 3/5 drm/i915: Extend private i915_param_named macro with description
In reply to Michal WajdeczkoWe're always specifying description of each module param in separate macro. Let's combine description into our main macro. Started with Coccinelle, followed by minor cleanup.
@match1@
declarer name MODULE_PARM_DESC;
identifier n;
constant c;
@@
(
- MODULE_PARM_DESC(n, c);
)
@fix1 depends on match1@
declarer name i915_param_named;
declarer name i915_param_named_unsafe;
identifier match1.n;
constant match1.c;
@@
(
i915_param_named(n, ... + , c ); | i915_param_named_unsafe(n, ... + , c );
)
--- drivers/gpu/drm/i915/i915_params.c | 167 +++++++++++++++---------------------- 1 file changed, 67 insertions(+), 100 deletions(-)
drivers/gpu/drm/i915/i915_params.c +67 -100
@@ -25,10 +25,12 @@#include "i915_params.h" #include "i915_drv.h" -#define i915_param_named (name,T , perm) \ - module_param_named(name, i915.name, T, perm) -#define i915_param_named_unsafe (name,T , perm) \ - module_param_named_unsafe(name, i915.name, T, perm) +#define i915_param_named (name,T , perm, desc) \ + module_param_named(name, i915.name, T, perm); \ + MODULE_PARM_DESC(name, desc) +#define i915_param_named_unsafe (name,T , perm, desc) \ + module_param_named_unsafe(name, i915.name, T, perm); \ + MODULE_PARM_DESC(name, desc)struct i915_params i915__read_mostly = { .modeset =-1 ,
@@ -72,193 +74,158 @@ struct i915_params i915 __read_mostly = { .enable_gvt = false, }; -i915_param_named (modeset, int,0400 ); -MODULE_PARM_DESC (modeset, +i915_param_named (modeset, int,0400 ,"Use kernel modesetting [KMS] (0=disable, " "1=on, -1=force vga console preference [default])" ); -i915_param_named_unsafe (panel_ignore_lid, int,0600 ); -MODULE_PARM_DESC (panel_ignore_lid, +i915_param_named_unsafe (panel_ignore_lid, int,0600 ,"Override lid status (0=autodetect, 1=autodetect disabled [default], " "-1=force lid closed, -2=force lid open)" ); -i915_param_named_unsafe (semaphores, int,0400 ); -MODULE_PARM_DESC (semaphores, +i915_param_named_unsafe (semaphores, int,0400 ,"Use semaphores for inter-ring sync " "(default: -1 (use per-chip defaults))" ); -i915_param_named_unsafe (enable_rc6, int,0400 ); -MODULE_PARM_DESC (enable_rc6, +i915_param_named_unsafe (enable_rc6, int,0400 ,"Enable power-saving render C-state 6. " "Different stages can be selected via bitmask values " "(0 = disable; 1 = enable rc6; 2 = enable deep rc6; 4 = enable deepest rc6). " "For example, 3 would enable rc6 and deep rc6, and 7 would enable everything. " "default: -1 (use per-chip default)" ); -i915_param_named_unsafe (enable_dc, int,0400 ); -MODULE_PARM_DESC (enable_dc, +i915_param_named_unsafe (enable_dc, int,0400 ,"Enable power-saving display C-states. " "(-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6)" ); -i915_param_named_unsafe (enable_fbc, int,0600 ); -MODULE_PARM_DESC (enable_fbc, +i915_param_named_unsafe (enable_fbc, int,0600 ,"Enable frame buffer compression for power savings " "(default: -1 (use per-chip default))" ); -i915_param_named_unsafe (lvds_channel_mode, int,0400 ); -MODULE_PARM_DESC (lvds_channel_mode, +i915_param_named_unsafe (lvds_channel_mode, int,0400 ,"Specify LVDS channel mode " "(0=probe BIOS [default], 1=single-channel, 2=dual-channel)" ); -i915_param_named_unsafe (panel_use_ssc, int,0600 ); -MODULE_PARM_DESC (panel_use_ssc, +i915_param_named_unsafe (panel_use_ssc, int,0600 ,"Use Spread Spectrum Clock with panels [LVDS/eDP] " "(default: auto from VBT)" ); -i915_param_named_unsafe (vbt_sdvo_panel_type, int,0400 ); -MODULE_PARM_DESC (vbt_sdvo_panel_type, +i915_param_named_unsafe (vbt_sdvo_panel_type, int,0400 ,"Override/Ignore selection of SDVO panel mode in the VBT " "(-2=ignore, -1=auto [default], index in VBT BIOS table)" ); -i915_param_named_unsafe (reset, int,0600 ); -MODULE_PARM_DESC (reset,"Attempt GPU resets (0=disabled, 1=full gpu reset, 2=engine reset [default])" ); +i915_param_named_unsafe (reset, int,0600 , +"Attempt GPU resets (0=disabled, 1=full gpu reset, 2=engine reset [default])" ); -i915_param_named_unsafe (vbt_firmware, charp,0400 ); -MODULE_PARM_DESC (vbt_firmware, -"Load VBT from specified file under /lib/firmware" ); +i915_param_named_unsafe (vbt_firmware, charp,0400 , +"Load VBT from specified file under /lib/firmware" );#if IS_ENABLED (CONFIG_DRM_I915_CAPTURE_ERROR ) -i915_param_named (error_capture, bool,0600 ); -MODULE_PARM_DESC (error_capture, +i915_param_named (error_capture, bool,0600 ,"Record the GPU state following a hang. " "This information in /sys/class/drm/card<N>/error is vital for " "triaging and debugging hangs." );#endif -i915_param_named_unsafe (enable_hangcheck, bool,0644 ); -MODULE_PARM_DESC (enable_hangcheck, +i915_param_named_unsafe (enable_hangcheck, bool,0644 ,"Periodically check GPU activity for detecting hangs. " "WARNING: Disabling this can cause system wide hangs. " "(default: true)" ); -i915_param_named_unsafe (enable_ppgtt, int,0400 ); -MODULE_PARM_DESC (enable_ppgtt, +i915_param_named_unsafe (enable_ppgtt, int,0400 ,"Override PPGTT usage. " "(-1=auto [default], 0=disabled, 1=aliasing, 2=full, 3=full with extended address space)" ); -i915_param_named_unsafe (enable_execlists, int,0400 ); -MODULE_PARM_DESC (enable_execlists, +i915_param_named_unsafe (enable_execlists, int,0400 ,"Override execlists usage. " "(-1=auto [default], 0=disabled, 1=enabled)" ); -i915_param_named_unsafe (enable_psr, int,0600 ); -MODULE_PARM_DESC (enable_psr,"Enable PSR " -"(0=disabled, 1=enabled - link mode chosen per-platform, 2=force link-standby mode, 3=force link-off mode) " -"Default: -1 (use per-chip default)" ); +i915_param_named_unsafe (enable_psr, int,0600 , +"Enable PSR " +"(0=disabled, 1=enabled - link mode chosen per-platform, 2=force link-standby mode, 3=force link-off mode) " +"Default: -1 (use per-chip default)" ); -i915_param_named_unsafe (alpha_support, bool,0400 ); -MODULE_PARM_DESC (alpha_support, +i915_param_named_unsafe (alpha_support, bool,0400 ,"Enable alpha quality driver support for latest hardware. " "See also CONFIG_DRM_I915_ALPHA_SUPPORT." ); -i915_param_named_unsafe (disable_power_well, int,0400 ); -MODULE_PARM_DESC (disable_power_well, +i915_param_named_unsafe (disable_power_well, int,0400 ,"Disable display power wells when possible " "(-1=auto [default], 0=power wells always on, 1=power wells disabled when possible)" ); -i915_param_named_unsafe (enable_ips, int,0600 ); -MODULE_PARM_DESC (enable_ips,"Enable IPS (default: true)" ); +i915_param_named_unsafe (enable_ips, int,0600 ,"Enable IPS (default: true)" ); -i915_param_named (fastboot, bool,0600 ); -MODULE_PARM_DESC (fastboot, +i915_param_named (fastboot, bool,0600 ,"Try to skip unnecessary mode sets at boot time (default: false)" ); -i915_param_named_unsafe (prefault_disable, bool,0600 ); -MODULE_PARM_DESC (prefault_disable, +i915_param_named_unsafe (prefault_disable, bool,0600 ,"Disable page prefaulting for pread/pwrite/reloc (default:false). " "For developers only." ); -i915_param_named_unsafe (load_detect_test, bool,0600 ); -MODULE_PARM_DESC (load_detect_test, +i915_param_named_unsafe (load_detect_test, bool,0600 ,"Force-enable the VGA load detect code for testing (default:false). " "For developers only." ); -i915_param_named_unsafe (force_reset_modeset_test, bool,0600 ); -MODULE_PARM_DESC (force_reset_modeset_test, +i915_param_named_unsafe (force_reset_modeset_test, bool,0600 ,"Force a modeset during gpu reset for testing (default:false). " "For developers only." ); -i915_param_named_unsafe (invert_brightness, int,0600 ); -MODULE_PARM_DESC (invert_brightness, +i915_param_named_unsafe (invert_brightness, int,0600 ,"Invert backlight brightness " "(-1 force normal, 0 machine defaults, 1 force inversion), please " "report PCI device ID, subsystem vendor and subsystem device ID " "to [email protected], if your machine needs it. " "It will then be included in an upcoming module version." ); -i915_param_named (disable_display, bool,0400 ); -MODULE_PARM_DESC (disable_display,"Disable display (default: false)" ); +i915_param_named (disable_display, bool,0400 , +"Disable display (default: false)" ); -i915_param_named_unsafe (enable_cmd_parser, bool,0400 ); -MODULE_PARM_DESC (enable_cmd_parser, -"Enable command parsing (true=enabled [default], false=disabled)" ); +i915_param_named_unsafe (enable_cmd_parser, bool,0400 , +"Enable command parsing (true=enabled [default], false=disabled)" ); -i915_param_named_unsafe (use_mmio_flip, int,0600 ); -MODULE_PARM_DESC (use_mmio_flip, -"use MMIO flips (-1=never, 0=driver discretion [default], 1=always)" ); +i915_param_named_unsafe (use_mmio_flip, int,0600 , +"use MMIO flips (-1=never, 0=driver discretion [default], 1=always)" ); -i915_param_named (mmio_debug, int,0600 ); -MODULE_PARM_DESC (mmio_debug, +i915_param_named (mmio_debug, int,0600 ,"Enable the MMIO debug code for the first N failures (default: off). " "This may negatively affect performance." ); -i915_param_named (verbose_state_checks, bool,0600 ); -MODULE_PARM_DESC (verbose_state_checks, +i915_param_named (verbose_state_checks, bool,0600 ,"Enable verbose logs (ie. WARN_ON()) in case of unexpected hw state conditions." ); -i915_param_named_unsafe (nuclear_pageflip, bool,0400 ); -MODULE_PARM_DESC (nuclear_pageflip, -"Force enable atomic functionality on platforms that don't have full support yet." ); +i915_param_named_unsafe (nuclear_pageflip, bool,0400 , +"Force enable atomic functionality on platforms that don't have full support yet." );/* WA to get away with the default setting in VBT for early platforms.Will be removed */ -i915_param_named_unsafe (edp_vswing, int,0400 ); -MODULE_PARM_DESC (edp_vswing, -"Ignore/Override vswing pre-emph table selection from VBT " -"(0=use value from vbt [default], 1=low power swing(200mV)," -"2=default swing(400mV))" ); - -i915_param_named_unsafe (enable_guc_loading, int,0400 ); -MODULE_PARM_DESC (enable_guc_loading, -"Enable GuC firmware loading " -"(-1=auto, 0=never [default], 1=if available, 2=required)" ); - -i915_param_named_unsafe (enable_guc_submission, int,0400 ); -MODULE_PARM_DESC (enable_guc_submission, -"Enable GuC submission " -"(-1=auto, 0=never [default], 1=if available, 2=required)" ); - -i915_param_named (guc_log_level, int,0400 ); -MODULE_PARM_DESC (guc_log_level, +i915_param_named_unsafe (edp_vswing, int,0400 , +"Ignore/Override vswing pre-emph table selection from VBT " +"(0=use value from vbt [default], 1=low power swing(200mV)," +"2=default swing(400mV))" ); + +i915_param_named_unsafe (enable_guc_loading, int,0400 , +"Enable GuC firmware loading " +"(-1=auto, 0=never [default], 1=if available, 2=required)" ); + +i915_param_named_unsafe (enable_guc_submission, int,0400 , +"Enable GuC submission " +"(-1=auto, 0=never [default], 1=if available, 2=required)" ); + +i915_param_named (guc_log_level, int,0400 ,"GuC firmware logging level (-1:disabled (default), 0-3:enabled)" ); -i915_param_named_unsafe (guc_firmware_path, charp,0400 ); -MODULE_PARM_DESC (guc_firmware_path, +i915_param_named_unsafe (guc_firmware_path, charp,0400 ,"GuC firmware path to use instead of the default one" ); -i915_param_named_unsafe (huc_firmware_path, charp,0400 ); -MODULE_PARM_DESC (huc_firmware_path, +i915_param_named_unsafe (huc_firmware_path, charp,0400 ,"HuC firmware path to use instead of the default one" ); -i915_param_named_unsafe (enable_dp_mst, bool,0600 ); -MODULE_PARM_DESC (enable_dp_mst, +i915_param_named_unsafe (enable_dp_mst, bool,0600 ,"Enable multi-stream transport (MST) for new DisplayPort sinks. (default: true)" ); -i915_param_named_unsafe (inject_load_failure, uint,0400 ); -MODULE_PARM_DESC (inject_load_failure, + +i915_param_named_unsafe (inject_load_failure, uint,0400 ,"Force an error after a number of failure check points (0:disabled (default), N:force failure at the Nth failure check point)" ); -i915_param_named (enable_dpcd_backlight, bool,0600 ); -MODULE_PARM_DESC (enable_dpcd_backlight, + +i915_param_named (enable_dpcd_backlight, bool,0600 ,"Enable support for DPCD backlight control (default:false)" ); -i915_param_named (enable_gvt, bool,0400 ); -MODULE_PARM_DESC (enable_gvt, +i915_param_named (enable_gvt, bool,0400 ,"Enable support for Intel GVT-g graphics virtualization host support(default:false)" );
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 3/5] drm/i915: Extend private i915_param_named macro with description
Quoting Michal Wajdeczko (2017-09-14 16:08:03)
Quoted 27 lines
We're always specifying description of each module param in separate macro. Let's combine description into our main macro. Started with Coccinelle, followed by minor cleanup.
@match1@
declarer nameMODULE_PARM_DESC;
identifier n;
constant c;
@@
(
-MODULE_PARM_DESC(n, c);
)@fix1 depends on match1@
declarer namei915_param_named;
declarer namei915_param_named_unsafe;
identifier match1.n;
constantmatch1.c;
@@
(i915_param_named(n, ... + , c ); | i915_param_named_unsafe(n, ... + , c );
Quoted 6 lines
)
Suggested-by Jani Nikula <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>Cc Jani Nikula <[email protected]>Cc Chris Wilson <[email protected]>
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Re: [PATCH v3 3/5] drm/i915: Extend private i915_param_named macro with description
Quoted 30 lines · Chris Wilson
Quoting Michal Wajdeczko (2017-09-14 16:08:03)
Quoted 29 lines
We're always specifying description of each module param in separate macro. Let's combine description into our main macro. Started with Coccinelle, followed by minor cleanup.
@match1@
declarer nameMODULE_PARM_DESC;
identifier n;
constant c;
@@
(
-MODULE_PARM_DESC(n, c);
)@fix1 depends on match1@
declarer namei915_param_named;
declarer namei915_param_named_unsafe;
identifier match1.n;
constantmatch1.c;
@@
(i915_param_named(n, ... + , c ); | i915_param_named_unsafe(n, ... + , c );)
Quoted 5 lines
Quoted 4 lines
Suggested-by Jani Nikula <[email protected]>Signed-off-by Michal Wajdeczko <[email protected]>Cc Jani Nikula <[email protected]>Cc Chris Wilson <[email protected]>Reviewed-by Chris Wilson <[email protected]>
Pushed patches 1-3, undecided for the rest. Thanks for the patches and review.
BR,
Jani.
Signature · 5 lines
Jani Nikula, Intel Open Source Technology Center _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 4/5 drm/i915: Wrap access to module params into macro
In reply to Michal WajdeczkoThis is a preparation step for actual rename of the global params struct. Changes mostly done with Coccinelle.
@@
identifier n;
@@
(
- i915.n
+ i915_param(n)
)
v2: Use separated macro for setter (Jani)
@@
identifier n;
expression e;
@@
(
- i915_param(n) = e;
+ i915_param_set(n, e);
)
--- drivers/gpu/drm/i915/gvt/render.c | 2 +- drivers/gpu/drm/i915/i915_debugfs.c | 14 ++++---- drivers/gpu/drm/i915/i915_drv.c | 33 ++++++++--------- drivers/gpu/drm/i915/i915_drv.h | 10 +++--- drivers/gpu/drm/i915/i915_gem.c | 6 ++-- drivers/gpu/drm/i915/i915_gem_context.c | 12 +++---- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 6 ++-- drivers/gpu/drm/i915/i915_gpu_error.c | 4 +-- drivers/gpu/drm/i915/i915_guc_submission.c | 2 +- drivers/gpu/drm/i915/i915_irq.c | 2 +- drivers/gpu/drm/i915/i915_params.h | 6 ++++ drivers/gpu/drm/i915/i915_pci.c | 6 ++-- drivers/gpu/drm/i915/i915_perf.c | 6 ++-- drivers/gpu/drm/i915/intel_bios.c | 6 ++-- drivers/gpu/drm/i915/intel_crt.c | 4 +-- drivers/gpu/drm/i915/intel_device_info.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 12 +++---- drivers/gpu/drm/i915/intel_dp.c | 4 +-- drivers/gpu/drm/i915/intel_dp_aux_backlight.c | 2 +- drivers/gpu/drm/i915/intel_drv.h | 2 +- drivers/gpu/drm/i915/intel_engine_cs.c | 6 ++-- drivers/gpu/drm/i915/intel_fbc.c | 11 +++--- drivers/gpu/drm/i915/intel_guc_loader.c | 13 +++---- drivers/gpu/drm/i915/intel_guc_log.c | 25 ++++++------- drivers/gpu/drm/i915/intel_gvt.c | 12 +++---- drivers/gpu/drm/i915/intel_hangcheck.c | 2 +- drivers/gpu/drm/i915/intel_huc.c | 4 +-- drivers/gpu/drm/i915/intel_lrc.c | 8 ++--- drivers/gpu/drm/i915/intel_lvds.c | 4 +-- drivers/gpu/drm/i915/intel_opregion.c | 2 +- drivers/gpu/drm/i915/intel_panel.c | 8 ++--- drivers/gpu/drm/i915/intel_pm.c | 6 ++-- drivers/gpu/drm/i915/intel_psr.c | 10 +++--- drivers/gpu/drm/i915/intel_ringbuffer.c | 8 ++--- drivers/gpu/drm/i915/intel_runtime_pm.c | 16 ++++----- drivers/gpu/drm/i915/intel_uc.c | 51 ++++++++++++++------------- drivers/gpu/drm/i915/intel_uncore.c | 23 ++++++------ 38 files changed, 182 insertions(+), 170 deletions(-)
drivers/gpu/drm/i915/gvt/render.c +1 -1
@@ -293,7 +293,7 @@ static void switch_mmio_to_vgpu(struct intel_vgpu *vgpu, int ring_id)*/ if (mmio->in_context && ((ctx_ctrl & inhibit_mask) != inhibit_mask) && - i915.enable_execlists) +i915_param (enable_execlists))continue ;if (mmio->mask)
drivers/gpu/drm/i915/i915_debugfs.c +7 -7
@@ -66,7 +66,7 @@ static int i915_capabilities(struct seq_file *m, void *data)#undef PRINT_FLAGkernel_param_lock (THIS_MODULE ); -#define PRINT_PARAM (T , x) seq_print_param(m, #x, #T, &i915.x); +#define PRINT_PARAM (T , x) seq_print_param(m, #x, #T, i915_param_ptr(x));I915_PARAMS_FOR_EACH (PRINT_PARAM );#undef PRINT_PARAMkernel_param_unlock (THIS_MODULE );
@@ -1266,7 +1266,7 @@ static int i915_hangcheck_info(struct seq_file *m, void *unused)if (waitqueue_active (&dev_priv->gpu_error.reset_queue))seq_puts (m,"struct_mutex blocked for reset\n" ); -if (!i915.enable_hangcheck) { +if (!i915_param (enable_hangcheck)) {seq_puts (m,"Hangcheck disabled\n" );return 0 ; }
@@ -1701,7 +1701,7 @@ static int i915_ips_status(struct seq_file *m, void *unused)intel_runtime_pm_get (dev_priv);seq_printf (m,"Enabled by kernel parameter: %s\n" , -yesno (i915.enable_ips)); +yesno (i915_param (enable_ips)));if (INTEL_GEN (dev_priv) >=8 ) {seq_puts (m,"Currently: unknown\n" );
@@ -2016,7 +2016,7 @@ static int i915_dump_lrc(struct seq_file *m, void *unused)enum intel_engine_id id;int ret; -if (!i915.enable_execlists) { +if (!i915_param (enable_execlists)) {seq_printf (m,"Logical Ring Contexts are disabled\n" );return 0 ; }
@@ -2596,7 +2596,7 @@ static int i915_guc_log_control_get(void *data, u64 *val)if (!dev_priv->guc.log.vma)return -EINVAL ; - *val = i915.guc_log_level; + *val =i915_param (guc_log_level);return 0 ; }
@@ -3314,7 +3314,7 @@ static int i915_engine_info(struct seq_file *m, void *unused)seq_printf (m,"\tBBADDR: 0x%08x_%08x\n" ,upper_32_bits (addr),lower_32_bits (addr)); -if (i915.enable_execlists) { +if (i915_param (enable_execlists)) {const u32 *hws = &engine->status_page.page_addr[I915_HWS_CSB_BUF0_INDEX ];u32 ptr, read, write;unsigned int idx;
@@ -3410,7 +3410,7 @@ static int i915_semaphore_status(struct seq_file *m, void *unused)enum intel_engine_id id;int j, ret; -if (!i915.semaphores) { +if (!i915_param (semaphores)) {seq_puts (m,"Semaphores are disabled\n" );return 0 ; }
drivers/gpu/drm/i915/i915_drv.c +17 -16
@@ -58,12 +58,12 @@ static unsigned int i915_load_fail_count;bool __i915_inject_load_failure (const char *func,int line) { -if (i915_load_fail_count >= i915.inject_load_failure) +if (i915_load_fail_count >=i915_param (inject_load_failure))return false; -if (++i915_load_fail_count == i915.inject_load_failure) { +if (++i915_load_fail_count ==i915_param (inject_load_failure)) {DRM_INFO ("Injecting failure at checkpoint %u [%s:%d]\n" , - i915.inject_load_failure, func, line); +i915_param (inject_load_failure), func, line);return true; }
@@ -106,8 +106,8 @@ __i915_printk(struct drm_i915_private *dev_priv, const char *level,static bool i915_error_injected (struct drm_i915_private *dev_priv) { -return i915.inject_load_failure && - i915_load_fail_count == i915.inject_load_failure; +return i915_param (inject_load_failure) && + i915_load_fail_count ==i915_param (inject_load_failure); }#define i915_load_error (dev_priv, fmt, ...) \
@@ -321,7 +321,7 @@ static int i915_getparam(struct drm_device *dev, void *data, value =USES_PPGTT (dev_priv);break ;case I915_PARAM_HAS_SEMAPHORES : - value = i915.semaphores; + value =i915_param (semaphores);break ;case I915_PARAM_HAS_SECURE_BATCHES : value =capable (CAP_SYS_ADMIN );
@@ -340,7 +340,7 @@ static int i915_getparam(struct drm_device *dev, void *data,return -ENODEV ;break ;case I915_PARAM_HAS_GPU_RESET : - value = i915.enable_hangcheck &&intel_has_gpu_reset (dev_priv); + value =i915_param (enable_hangcheck) &&intel_has_gpu_reset (dev_priv);if (value &&intel_has_reset_engine (dev_priv)) value =2 ;break ;
@@ -1031,9 +1031,8 @@ static void i915_driver_cleanup_mmio(struct drm_i915_private *dev_priv)static void intel_sanitize_options (struct drm_i915_private *dev_priv) { - i915.enable_execlists = -intel_sanitize_enable_execlists (dev_priv, - i915.enable_execlists); +i915_param_set (enable_execlists, +intel_sanitize_enable_execlists (dev_priv,i915_param (enable_execlists)));/* * i915.enable_ppgtt is read-only, so do an early pass to validate the
@@ -1041,12 +1040,14 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv)* do this now so that we can print out any log messages once rather * than every time we check intel_enable_ppgtt(). */ - i915.enable_ppgtt = -intel_sanitize_enable_ppgtt (dev_priv, i915.enable_ppgtt); -DRM_DEBUG_DRIVER ("ppgtt mode: %i\n" , i915.enable_ppgtt); +i915_param_set (enable_ppgtt, +intel_sanitize_enable_ppgtt (dev_priv,i915_param (enable_ppgtt))); +DRM_DEBUG_DRIVER ("ppgtt mode: %i\n" ,i915_param (enable_ppgtt)); - i915.semaphores =intel_sanitize_semaphores (dev_priv, i915.semaphores); -DRM_DEBUG_DRIVER ("use GPU semaphores? %s\n" ,yesno (i915.semaphores)); +i915_param_set (semaphores, +intel_sanitize_semaphores (dev_priv,i915_param (semaphores))); +DRM_DEBUG_DRIVER ("use GPU semaphores? %s\n" , +yesno (i915_param (semaphores)));intel_uc_sanitize_options (dev_priv);
@@ -1277,7 +1278,7 @@ int i915_driver_load(struct pci_dev *pdev, const struct pci_device_id *ent)int ret;/* Enable nuclear pageflip on ILK+ */ -if (!i915.nuclear_pageflip && match_info->gen <5 ) +if (!i915_param (nuclear_pageflip) && match_info->gen <5 ) driver.driver_features &= ~DRIVER_ATOMIC ; ret = -ENOMEM ;
drivers/gpu/drm/i915/i915_drv.h +5 -5
@@ -93,7 +93,7 @@ #define I915_STATE_WARN(condition, format...) ({ \ int __ret_warn_on = !!(condition); \ if (unlikely(__ret_warn_on)) \ - if (!WARN(i915.verbose_state_checks, format)) \ + if (!WARN(i915_param(verbose_state_checks), format)) \ DRM_ERROR(format); \ unlikely(__ret_warn_on); \ })
@@ -3074,9 +3074,9 @@ intel_info(const struct drm_i915_private *dev_priv)#define HAS_LOGICAL_RING_CONTEXTS (dev_priv) \ ((dev_priv)->info.has_logical_ring_contexts) -#define USES_PPGTT (dev_priv) (i915.enable_ppgtt) -#define USES_FULL_PPGTT (dev_priv) (i915.enable_ppgtt >= 2) -#define USES_FULL_48BIT_PPGTT (dev_priv) (i915.enable_ppgtt == 3) +#define USES_PPGTT (dev_priv) (i915_param(enable_ppgtt)) +#define USES_FULL_PPGTT (dev_priv) (i915_param(enable_ppgtt) >= 2) +#define USES_FULL_48BIT_PPGTT (dev_priv) (i915_param(enable_ppgtt) == 3)#define HAS_OVERLAY (dev_priv) ((dev_priv)->info.has_overlay)#define OVERLAY_NEEDS_PHYSICAL (dev_priv) \
@@ -3274,7 +3274,7 @@ static inline void i915_queue_hangcheck(struct drm_i915_private *dev_priv) {unsigned long delay; -if (unlikely (!i915.enable_hangcheck)) +if (unlikely (!i915_param (enable_hangcheck)))return ;/* Don't continually defer the hangcheck so that it is always run at
drivers/gpu/drm/i915/i915_gem.c +3 -3
@@ -3046,7 +3046,7 @@ static void engine_set_wedged(struct intel_engine_cs *engine)* pinned in place. */ -if (i915.enable_execlists) { +if (i915_param (enable_execlists)) {struct execlist_port *port = engine->execlist_port;unsigned long flags;unsigned int n;
@@ -4774,7 +4774,7 @@ bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value)return false;/* TODO: make semaphores and Execlists play nicely together */ -if (i915.enable_execlists) +if (i915_param (enable_execlists))return false;if (value >=0 )
@@ -4795,7 +4795,7 @@ int i915_gem_init(struct drm_i915_private *dev_priv) dev_priv->mm.unordered_timeline =dma_fence_context_alloc (1 ); -if (!i915.enable_execlists) { +if (!i915_param (enable_execlists)) { dev_priv->gt.resume = intel_legacy_submission_resume; dev_priv->gt.cleanup_engine = intel_engine_cleanup; }else {
drivers/gpu/drm/i915/i915_gem_context.c +6 -6
@@ -314,7 +314,7 @@ __create_hw_context(struct drm_i915_private *dev_priv,* present or not in use we still need a small bias as ring wraparound * at offset 0 sometimes hangs. No idea why. */ -if (HAS_GUC (dev_priv) && i915.enable_guc_loading) +if (HAS_GUC (dev_priv) &&i915_param (enable_guc_loading)) ctx->ggtt_offset_bias =GUC_WOPCM_TOP ;else ctx->ggtt_offset_bias =I915_GTT_PAGE_SIZE ;
@@ -407,7 +407,7 @@ i915_gem_context_create_gvt(struct drm_device *dev)i915_gem_context_set_closed (ctx);/* not user accessible */ i915_gem_context_clear_bannable (ctx);i915_gem_context_set_force_single_submission (ctx); -if (!i915.enable_guc_submission) +if (!i915_param (enable_guc_submission)) ctx->ring_size =512 *PAGE_SIZE ;/* Max ring buffer size */ GEM_BUG_ON (i915_gem_context_is_kernel (ctx));
@@ -431,7 +431,7 @@ int i915_gem_contexts_init(struct drm_i915_private *dev_priv)if (intel_vgpu_active (dev_priv) &&HAS_LOGICAL_RING_CONTEXTS (dev_priv)) { -if (!i915.enable_execlists) { +if (!i915_param (enable_execlists)) {DRM_INFO ("Only EXECLIST mode is supported in vgpu.\n" );return -EINVAL ; }
@@ -483,7 +483,7 @@ void i915_gem_contexts_lost(struct drm_i915_private *dev_priv) }/* Force the GPU state to be restored on enabling */ -if (!i915.enable_execlists) { +if (!i915_param (enable_execlists)) {struct i915_gem_context *ctx;list_for_each_entry (ctx, &dev_priv->contexts.list, link) {
@@ -568,7 +568,7 @@ mi_set_context(struct drm_i915_gem_request *req, u32 flags)enum intel_engine_id id;const int num_rings =/* Use an extended w/a on gen7 if signalling from other rings */ - (i915.semaphores &&INTEL_GEN (dev_priv) ==7 ) ? + (i915_param (semaphores) &&INTEL_GEN (dev_priv) ==7 ) ?INTEL_INFO (dev_priv)->num_rings -1 :0 ;int len;
@@ -837,7 +837,7 @@ int i915_switch_context(struct drm_i915_gem_request *req)struct intel_engine_cs *engine = req->engine;lockdep_assert_held (&req->i915->drm.struct_mutex); -if (i915.enable_execlists) +if (i915_param (enable_execlists))return 0 ;if (!req->ctx->engine[engine->id].state) {
drivers/gpu/drm/i915/i915_gem_execbuffer.c +1 -1
@@ -1584,7 +1584,7 @@ static int eb_prefault_relocations(const struct i915_execbuffer *eb)const unsigned int count = eb->buffer_count;unsigned int i; -if (unlikely (i915.prefault_disable)) +if (unlikely (i915_param (prefault_disable)))return 0 ;for (i =0 ; i < count; i++) {
drivers/gpu/drm/i915/i915_gem_gtt.c +3 -3
@@ -180,7 +180,7 @@ int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,return 0 ; } -if (INTEL_GEN (dev_priv) >=8 && i915.enable_execlists) { +if (INTEL_GEN (dev_priv) >=8 &&i915_param (enable_execlists)) {if (has_full_48bit_ppgtt)return 3 ;
@@ -1972,7 +1972,7 @@ int i915_ppgtt_init_hw(struct drm_i915_private *dev_priv)/* In the case of execlists, PPGTT is enabled by the context descriptor * and the PDPs are contained within the context itself. We don't * need to do anything here. */ -if (i915.enable_execlists) +if (i915_param (enable_execlists))return 0 ;if (!USES_PPGTT (dev_priv))
@@ -3292,7 +3292,7 @@ int i915_ggtt_probe_hw(struct drm_i915_private *dev_priv)* currently don't have any bits spare to pass in this upper * restriction! */ -if (HAS_GUC (dev_priv) && i915.enable_guc_loading) { +if (HAS_GUC (dev_priv) &&i915_param (enable_guc_loading)) { ggtt->base.total =min_t (u64, ggtt->base.total,GUC_GGTT_TOP ); ggtt->mappable_end =min (ggtt->mappable_end, ggtt->base.total); }
drivers/gpu/drm/i915/i915_gpu_error.c +2 -2
@@ -1554,7 +1554,7 @@ static void i915_gem_capture_guc_log_buffer(struct drm_i915_private *dev_priv, struct i915_gpu_state *error) {/* Capturing log buf contents won't be useful if logging was disabled */ -if (!dev_priv->guc.log.vma || (i915.guc_log_level <0 )) +if (!dev_priv->guc.log.vma || (i915_param (guc_log_level) <0 ))return ; error->guc_log = i915_error_object_create(dev_priv,
@@ -1751,7 +1751,7 @@ void i915_capture_error_state(struct drm_i915_private *dev_priv,struct i915_gpu_state *error;unsigned long flags; -if (!i915.error_capture) +if (!i915_param (error_capture))return ;if (READ_ONCE (dev_priv->gpu_error.first_error))
drivers/gpu/drm/i915/i915_guc_submission.c +1 -1
@@ -1347,7 +1347,7 @@ int intel_guc_resume(struct drm_i915_private *dev_priv)if (guc->fw.load_status !=INTEL_UC_FIRMWARE_SUCCESS )return 0 ; -if (i915.guc_log_level >=0 ) +if (i915_param (guc_log_level) >=0 )gen9_enable_guc_interrupts (dev_priv); ctx = dev_priv->kernel_context;
drivers/gpu/drm/i915/i915_irq.c +1 -1
@@ -1352,7 +1352,7 @@ gen8_cs_irq_handler(struct intel_engine_cs *engine, u32 iir, int test_shift)if (iir & (GT_RENDER_USER_INTERRUPT << test_shift)) {notify_ring (engine); - tasklet |= i915.enable_guc_submission; + tasklet |=i915_param (enable_guc_submission); }if (tasklet)
drivers/gpu/drm/i915/i915_params.h +6 -0
@@ -78,5 +78,11 @@ struct i915_params {extern struct i915_params i915__read_mostly ; +#define i915_param (n) ({ i915.n; }) +#define i915_param_set (n,e) ({ i915.n = e; }) +#define i915_param_inc (n) ({ i915.n++; }) +#define i915_param_dec (n) ({ i915.n--; }) +#define i915_param_ptr (n) ({ &i915.n; }) +#endif
drivers/gpu/drm/i915/i915_pci.c +3 -3
@@ -638,7 +638,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) (struct intel_device_info *) ent->driver_data;int err; -if (IS_ALPHA_SUPPORT (intel_info) && !i915.alpha_support) { +if (IS_ALPHA_SUPPORT (intel_info) && !i915_param (alpha_support)) {DRM_INFO ("The driver support for your hardware in this kernel version is alpha quality\n" "See CONFIG_DRM_I915_ALPHA_SUPPORT or i915.alpha_support module parameter\n" "to enable support in this kernel version, or check for kernel updates.\n" );
@@ -696,10 +696,10 @@ static int __init i915_init(void)* vga_text_mode_force boot option. */ -if (i915.modeset ==0 ) +if (i915_param (modeset) ==0 ) use_kms = false; -if (vgacon_text_force () && i915.modeset ==-1 ) +if (vgacon_text_force () &&i915_param (modeset) ==-1 ) use_kms = false;if (!use_kms) {
drivers/gpu/drm/i915/i915_perf.c +3 -3
@@ -1213,7 +1213,7 @@ static int oa_get_render_ctx_id(struct i915_perf_stream *stream) {struct drm_i915_private *dev_priv = stream->dev_priv; -if (i915.enable_execlists) +if (i915_param (enable_execlists)) dev_priv->perf.oa.specific_ctx_id = stream->ctx->hw_id;else {struct intel_engine_cs *engine = dev_priv->engine[RCS ];
@@ -1259,7 +1259,7 @@ static void oa_put_render_ctx_id(struct i915_perf_stream *stream) {struct drm_i915_private *dev_priv = stream->dev_priv; -if (i915.enable_execlists) { +if (i915_param (enable_execlists)) { dev_priv->perf.oa.specific_ctx_id =INVALID_CTX_ID ; }else {struct intel_engine_cs *engine = dev_priv->engine[RCS ];
@@ -3405,7 +3405,7 @@ void i915_perf_init(struct drm_i915_private *dev_priv) dev_priv->perf.oa.timestamp_frequency =12500000 ; dev_priv->perf.oa.oa_formats = hsw_oa_formats; - }else if (i915.enable_execlists) { + }else if (i915_param (enable_execlists)) {/* Note: that although we could theoretically also support the * legacy ringbuffer mode on BDW (and earlier iterations of * this driver, before upstreaming did this) it didn't seem
drivers/gpu/drm/i915/intel_bios.c +3 -3
@@ -356,7 +356,7 @@ parse_sdvo_panel_data(struct drm_i915_private *dev_priv,struct drm_display_mode *panel_fixed_mode;int index; - index = i915.vbt_sdvo_panel_type; + index =i915_param (vbt_sdvo_panel_type);if (index ==-2 ) {DRM_DEBUG_KMS ("Ignore SDVO panel mode from BIOS VBT tables.\n" );return ;
@@ -675,8 +675,8 @@ parse_edp(struct drm_i915_private *dev_priv, const struct bdb_header *bdb)uint8_t vswing;/* Don't read from VBT if module parameter has valid value*/ -if (i915.edp_vswing) { - dev_priv->vbt.edp.low_vswing = i915.edp_vswing ==1 ; +if (i915_param (edp_vswing)) { + dev_priv->vbt.edp.low_vswing =i915_param (edp_vswing) ==1 ; }else { vswing = (edp->edp_vswing_preemph >> (panel_type *4 )) &0xF ; dev_priv->vbt.edp.low_vswing = vswing ==0 ;
drivers/gpu/drm/i915/intel_crt.c +2 -2
@@ -712,7 +712,7 @@ intel_crt_detect(struct drm_connector *connector,* broken monitor (without edid) to work behind a broken kvm (that fails * to have the right resistors for HP detection) needs to fix this up. * For now just bail out. */ -if (I915_HAS_HOTPLUG (dev_priv) && !i915.load_detect_test) { +if (I915_HAS_HOTPLUG (dev_priv) && !i915_param (load_detect_test)) { status = connector_status_disconnected; goto out; }
@@ -730,7 +730,7 @@ intel_crt_detect(struct drm_connector *connector,else if (INTEL_GEN (dev_priv) <4 ) status =intel_crt_load_detect (crt,to_intel_crtc (connector->state->crtc)->pipe); -else if (i915.load_detect_test) +else if (i915_param (load_detect_test)) status = connector_status_disconnected;else status = connector_status_unknown;
drivers/gpu/drm/i915/intel_device_info.c +1 -1
@@ -343,7 +343,7 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv) info->num_sprites[pipe] =1 ; } -if (i915.disable_display) { +if (i915_param (disable_display)) {DRM_INFO ("Display disabled (module parameter)\n" ); info->num_pipes =0 ; } else if (info->num_pipes > 0 &&
drivers/gpu/drm/i915/intel_display.c +6 -6
@@ -3701,7 +3701,7 @@ void intel_prepare_reset(struct drm_i915_private *dev_priv)/* reset doesn't touch the display */ -if (!i915.force_reset_modeset_test && +if (!i915_param (force_reset_modeset_test) && !gpu_reset_clobbers_display (dev_priv))return ;
@@ -3757,7 +3757,7 @@ void intel_finish_reset(struct drm_i915_private *dev_priv)int ret;/* reset doesn't touch the display */ -if (!i915.force_reset_modeset_test && +if (!i915_param (force_reset_modeset_test) && !gpu_reset_clobbers_display (dev_priv))return ;
@@ -6313,7 +6313,7 @@ static void hsw_compute_ips_config(struct intel_crtc *crtc,struct drm_device *dev = crtc->base.dev;struct drm_i915_private *dev_priv =to_i915 (dev); - pipe_config->ips_enabled = i915.enable_ips && + pipe_config->ips_enabled =i915_param (enable_ips) &&hsw_crtc_supports_ips (crtc) &&pipe_config_supports_ips (dev_priv, pipe_config); }
@@ -6494,8 +6494,8 @@ intel_link_compute_m_n(int bits_per_pixel, int nlanes,static inline bool intel_panel_use_ssc (struct drm_i915_private *dev_priv) { -if (i915.panel_use_ssc >=0 ) -return i915.panel_use_ssc !=0 ; +if (i915_param (panel_use_ssc) >=0 ) +return i915_param (panel_use_ssc) !=0 ;return dev_priv->vbt.lvds_use_ssc && !(dev_priv->quirks &QUIRK_LVDS_SSC_DISABLE ); }
@@ -12084,7 +12084,7 @@ static int intel_atomic_check(struct drm_device *dev,return ret; } -if (i915.fastboot && +if (i915_param (fastboot) &&intel_pipe_config_compare (dev_priv,to_intel_crtc_state (old_crtc_state), pipe_config, true)) {
drivers/gpu/drm/i915/intel_dp.c +2 -2
@@ -3826,7 +3826,7 @@ intel_dp_can_mst(struct intel_dp *intel_dp) {u8 mstm_cap; -if (!i915.enable_dp_mst) +if (!i915_param (enable_dp_mst))return false;if (!intel_dp->can_mst)
@@ -3844,7 +3844,7 @@ intel_dp_can_mst(struct intel_dp *intel_dp)static void intel_dp_configure_mst (struct intel_dp *intel_dp) { -if (!i915.enable_dp_mst) +if (!i915_param (enable_dp_mst))return ;if (!intel_dp->can_mst)
drivers/gpu/drm/i915/intel_dp_aux_backlight.c +1 -1
@@ -264,7 +264,7 @@ int intel_dp_aux_init_backlight_funcs(struct intel_connector *intel_connector) {struct intel_panel *panel = &intel_connector->panel; -if (!i915.enable_dpcd_backlight) +if (!i915_param (enable_dpcd_backlight))return -ENODEV ;if (!intel_dp_aux_display_control_capable (intel_connector))
drivers/gpu/drm/i915/intel_drv.h +1 -1
@@ -1902,7 +1902,7 @@ void intel_init_ipc(struct drm_i915_private *dev_priv);void intel_enable_ipc (struct drm_i915_private *dev_priv);static inline int intel_enable_rc6 (void ) { -return i915.enable_rc6; +return i915_param (enable_rc6); }/* intel_sdvo.c */
drivers/gpu/drm/i915/intel_engine_cs.c +3 -3
@@ -153,9 +153,9 @@ __intel_engine_context_size(struct drm_i915_private *dev_priv, u8 class)case 9 :return GEN9_LR_CONTEXT_RENDER_SIZE ;case 8 : -return i915.enable_execlists ? +return i915_param (enable_execlists) ?GEN8_LR_CONTEXT_RENDER_SIZE : -GEN8_CXT_TOTAL_SIZE ; +GEN8_CXT_TOTAL_SIZE ;case 7 :if (IS_HASWELL (dev_priv))return HSW_CXT_TOTAL_SIZE ;
@@ -301,7 +301,7 @@ int intel_engines_init(struct drm_i915_private *dev_priv) &intel_engine_classes[engine->class];int (*init)(struct intel_engine_cs *engine); -if (i915.enable_execlists) +if (i915_param (enable_execlists)) init = class_info->init_execlists;else init = class_info->init_legacy;
drivers/gpu/drm/i915/intel_fbc.c +6 -5
@@ -859,7 +859,7 @@ static bool intel_fbc_can_enable(struct drm_i915_private *dev_priv)return false; } -if (!i915.enable_fbc) { +if (!i915_param (enable_fbc)) { fbc->no_fbc_reason ="disabled per module param or by default" ;return false; }
@@ -1310,8 +1310,8 @@ void intel_fbc_init_pipe_state(struct drm_i915_private *dev_priv)*/ static int intel_sanitize_fbc_option (struct drm_i915_private *dev_priv) { -if (i915.enable_fbc >=0 ) -return !!i915.enable_fbc; +if (i915_param (enable_fbc) >=0 ) +return !!i915_param (enable_fbc);if (!HAS_FBC (dev_priv))return 0 ;
@@ -1355,8 +1355,9 @@ void intel_fbc_init(struct drm_i915_private *dev_priv)if (need_fbc_vtd_wa (dev_priv))mkwrite_device_info (dev_priv)->has_fbc = false; - i915.enable_fbc =intel_sanitize_fbc_option (dev_priv); -DRM_DEBUG_KMS ("Sanitized enable_fbc value: %d\n" , i915.enable_fbc); +i915_param_set (enable_fbc,intel_sanitize_fbc_option (dev_priv)); +DRM_DEBUG_KMS ("Sanitized enable_fbc value: %d\n" , +i915_param (enable_fbc));if (!HAS_FBC (dev_priv)) { fbc->no_fbc_reason ="unsupported by this chipset" ;
drivers/gpu/drm/i915/intel_guc_loader.c +7 -6
@@ -131,14 +131,14 @@ static void guc_params_init(struct drm_i915_private *dev_priv) params[GUC_CTL_LOG_PARAMS ] = guc->log.flags; -if (i915.guc_log_level >=0 ) { +if (i915_param (guc_log_level) >=0 ) { params[GUC_CTL_DEBUG ] = - i915.guc_log_level <<GUC_LOG_VERBOSITY_SHIFT ; +i915_param (guc_log_level) <<GUC_LOG_VERBOSITY_SHIFT ; }else params[GUC_CTL_DEBUG ] =GUC_LOG_DISABLED ;/* If GuC submission is enabled, set up additional parameters here */ -if (i915.enable_guc_submission) { +if (i915_param (enable_guc_submission)) {u32 ads =guc_ggtt_offset (guc->ads_vma) >>PAGE_SHIFT ;u32 pgs =guc_ggtt_offset (dev_priv->guc.stage_desc_pool);u32 ctx_in_16 =GUC_MAX_STAGE_DESCRIPTORS /16 ;
@@ -368,7 +368,8 @@ int intel_guc_init_hw(struct intel_guc *guc) guc->fw.load_status =INTEL_UC_FIRMWARE_SUCCESS ;DRM_INFO ("GuC %s (firmware %s [version %u.%u])\n" , - i915.enable_guc_submission ?"submission enabled" :"loaded" , +i915_param (enable_guc_submission) ? +"submission enabled" :"loaded" , guc->fw.path, guc->fw.major_ver_found, guc->fw.minor_ver_found);
@@ -390,8 +391,8 @@ int intel_guc_select_fw(struct intel_guc *guc) guc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; guc->fw.type =INTEL_UC_FW_TYPE_GUC ; -if (i915.guc_firmware_path) { - guc->fw.path = i915.guc_firmware_path; +if (i915_param (guc_firmware_path)) { + guc->fw.path =i915_param (guc_firmware_path); guc->fw.major_ver_wanted =0 ; guc->fw.minor_ver_wanted =0 ; }else if (IS_SKYLAKE (dev_priv)) {
drivers/gpu/drm/i915/intel_guc_log.c +13 -12
@@ -144,7 +144,7 @@ static int guc_log_relay_file_create(struct intel_guc *guc)struct dentry *log_dir;int ret; -if (i915.guc_log_level <0 ) +if (i915_param (guc_log_level) <0 )return 0 ;/* For now create the log file in /sys/kernel/debug/dri/0 dir */
@@ -480,7 +480,7 @@ static int guc_log_late_setup(struct intel_guc *guc)guc_log_runtime_destroy (guc); err:/* logging will remain off */ - i915.guc_log_level =-1 ; +i915_param_set (guc_log_level,-1 );return ret; }
@@ -502,7 +502,8 @@ static void guc_flush_logs(struct intel_guc *guc) {struct drm_i915_private *dev_priv =guc_to_i915 (guc); -if (!i915.enable_guc_submission || (i915.guc_log_level <0 )) +if (!i915_param (enable_guc_submission) || + (i915_param (guc_log_level) <0 ))return ;/* First disable the interrupts, will be renabled afterwards */
@@ -529,8 +530,8 @@ int intel_guc_log_create(struct intel_guc *guc)GEM_BUG_ON (guc->log.vma); -if (i915.guc_log_level >GUC_LOG_VERBOSITY_MAX ) - i915.guc_log_level =GUC_LOG_VERBOSITY_MAX ; +if (i915_param (guc_log_level) >GUC_LOG_VERBOSITY_MAX ) +i915_param_set (guc_log_level,GUC_LOG_VERBOSITY_MAX );/* The first page is to save log buffer state. Allocate one * extra page for others in case for overlap */
@@ -555,7 +556,7 @@ int intel_guc_log_create(struct intel_guc *guc) guc->log.vma = vma; -if (i915.guc_log_level >=0 ) { +if (i915_param (guc_log_level) >=0 ) { ret =guc_log_runtime_create (guc);if (ret <0 ) goto err_vma;
@@ -576,7 +577,7 @@ int intel_guc_log_create(struct intel_guc *guc)i915_vma_unpin_and_release (&guc->log.vma); err:/* logging will be off */ - i915.guc_log_level =-1 ; +i915_param_set (guc_log_level,-1 );return ret; }
@@ -600,7 +601,7 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)return -EINVAL ;/* This combination doesn't make sense & won't have any effect */ -if (!log_param.logging_enabled && (i915.guc_log_level <0 )) +if (!log_param.logging_enabled && (i915_param (guc_log_level) <0 ))return 0 ; ret =guc_log_control (guc, log_param.value);
@@ -610,7 +611,7 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val) }if (log_param.logging_enabled) { - i915.guc_log_level = log_param.verbosity; +i915_param_set (guc_log_level, log_param.verbosity);/* If log_level was set as -1 at boot time, then the relay channel file * wouldn't have been created by now and interrupts also would not have
@@ -633,7 +634,7 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)guc_flush_logs (guc);/* As logging is disabled, update log level to reflect that */ - i915.guc_log_level =-1 ; +i915_param_set (guc_log_level,-1 ); }return ret;
@@ -641,7 +642,7 @@ int i915_guc_log_control(struct drm_i915_private *dev_priv, u64 control_val)void i915_guc_log_register (struct drm_i915_private *dev_priv) { -if (!i915.enable_guc_submission || i915.guc_log_level <0 ) +if (!i915_param (enable_guc_submission) ||i915_param (guc_log_level) <0 )return ;mutex_lock (&dev_priv->drm.struct_mutex);
@@ -651,7 +652,7 @@ void i915_guc_log_register(struct drm_i915_private *dev_priv)void i915_guc_log_unregister (struct drm_i915_private *dev_priv) { -if (!i915.enable_guc_submission) +if (!i915_param (enable_guc_submission))return ;mutex_lock (&dev_priv->drm.struct_mutex);
drivers/gpu/drm/i915/intel_gvt.c +6 -6
@@ -58,7 +58,7 @@ static bool is_supported_device(struct drm_i915_private *dev_priv)*/ void intel_gvt_sanitize_options (struct drm_i915_private *dev_priv) { -if (!i915.enable_gvt) +if (!i915_param (enable_gvt))return ;if (intel_vgpu_active (dev_priv)) {
@@ -73,7 +73,7 @@ void intel_gvt_sanitize_options(struct drm_i915_private *dev_priv)return ; bail: - i915.enable_gvt =0 ; +i915_param_set (enable_gvt,0 ); }/**
@@ -90,17 +90,17 @@ int intel_gvt_init(struct drm_i915_private *dev_priv) {int ret; -if (!i915.enable_gvt) { +if (!i915_param (enable_gvt)) {DRM_DEBUG_DRIVER ("GVT-g is disabled by kernel params\n" );return 0 ; } -if (!i915.enable_execlists) { +if (!i915_param (enable_execlists)) {DRM_ERROR ("i915 GVT-g loading failed due to disabled execlists mode\n" );return -EIO ; } -if (i915.enable_guc_submission) { +if (i915_param (enable_guc_submission)) {DRM_ERROR ("i915 GVT-g loading failed due to Graphics virtualization is not yet supported with GuC submission\n" );return -EIO ; }
@@ -123,7 +123,7 @@ int intel_gvt_init(struct drm_i915_private *dev_priv)return 0 ; bail: - i915.enable_gvt =0 ; +i915_param_set (enable_gvt,0 );return 0 ; }
drivers/gpu/drm/i915/intel_hangcheck.c +1 -1
@@ -428,7 +428,7 @@ static void i915_hangcheck_elapsed(struct work_struct *work)unsigned int hung =0 , stuck =0 ;int busy_count =0 ; -if (!i915.enable_hangcheck) +if (!i915_param (enable_hangcheck))return ;if (!READ_ONCE (dev_priv->gt.awake))
drivers/gpu/drm/i915/intel_huc.c +2 -2
@@ -155,8 +155,8 @@ void intel_huc_select_fw(struct intel_huc *huc) huc->fw.load_status =INTEL_UC_FIRMWARE_NONE ; huc->fw.type =INTEL_UC_FW_TYPE_HUC ; -if (i915.huc_firmware_path) { - huc->fw.path = i915.huc_firmware_path; +if (i915_param (huc_firmware_path)) { + huc->fw.path =i915_param (huc_firmware_path); huc->fw.major_ver_wanted =0 ; huc->fw.minor_ver_wanted =0 ; }else if (IS_SKYLAKE (dev_priv)) {
drivers/gpu/drm/i915/intel_lrc.c +4 -4
@@ -244,7 +244,7 @@ int intel_sanitize_enable_execlists(struct drm_i915_private *dev_priv, int enablif (HAS_LOGICAL_RING_CONTEXTS (dev_priv) &&USES_PPGTT (dev_priv) && - i915.use_mmio_flip >=0 ) +i915_param (use_mmio_flip) >=0 )return 1 ;return 0 ;
@@ -926,7 +926,7 @@ static int execlists_request_alloc(struct drm_i915_gem_request *request)*/ request->reserved_space +=EXECLISTS_REQUEST_SIZE ; -if (i915.enable_guc_submission) { +if (i915_param (enable_guc_submission)) {/* * Check that the GuC has space for the request before * going any further, as the i915_add_request() call
@@ -962,7 +962,7 @@ static int execlists_request_alloc(struct drm_i915_gem_request *request)return 0 ; err_unreserve: -if (i915.enable_guc_submission) +if (i915_param (enable_guc_submission))i915_guc_wq_unreserve (request); err:return ret;
@@ -1298,7 +1298,7 @@ static int gen8_init_common_ring(struct intel_engine_cs *engine) submit = true; } -if (submit && !i915.enable_guc_submission) +if (submit && !i915_param (enable_guc_submission))execlists_submit_ports (engine);return 0 ;
drivers/gpu/drm/i915/intel_lvds.c +2 -2
@@ -880,8 +880,8 @@ static bool compute_is_dual_link_lvds(struct intel_lvds_encoder *lvds_encoder)struct drm_i915_private *dev_priv =to_i915 (dev);/* use the module option value if specified */ -if (i915.lvds_channel_mode >0 ) -return i915.lvds_channel_mode ==2 ; +if (i915_param (lvds_channel_mode) >0 ) +return i915_param (lvds_channel_mode) ==2 ;/* single channel LVDS is limited to 112 MHz */ if (lvds_encoder->attached_connector->base.panel.fixed_mode->clock
drivers/gpu/drm/i915/intel_opregion.c +1 -1
@@ -921,7 +921,7 @@ static int intel_load_vbt_firmware(struct drm_i915_private *dev_priv) {struct intel_opregion *opregion = &dev_priv->opregion;const struct firmware *fw =NULL ; -const char *name = i915.vbt_firmware; +const char *name =i915_param (vbt_firmware);int ret;if (!name || !*name)
drivers/gpu/drm/i915/intel_panel.c +4 -4
@@ -379,13 +379,13 @@ enum drm_connector_status intel_panel_detect(struct drm_i915_private *dev_priv) {/* Assume that the BIOS does not lie through the OpRegion... */ -if (!i915.panel_ignore_lid && dev_priv->opregion.lid_state) { +if (!i915_param (panel_ignore_lid) && dev_priv->opregion.lid_state) {return *dev_priv->opregion.lid_state &0x1 ? connector_status_connected : connector_status_disconnected; } -switch (i915.panel_ignore_lid) { +switch (i915_param (panel_ignore_lid)) {case -2 :return connector_status_connected;case -1 :
@@ -465,10 +465,10 @@ static u32 intel_panel_compute_brightness(struct intel_connector *connector,WARN_ON (panel->backlight.max ==0 ); -if (i915.invert_brightness <0 ) +if (i915_param (invert_brightness) <0 )return val; -if (i915.invert_brightness >0 || +if (i915_param (invert_brightness) >0 || dev_priv->quirks &QUIRK_INVERT_BRIGHTNESS ) {return panel->backlight.max - val + panel->backlight.min; }
drivers/gpu/drm/i915/intel_pm.c +3 -3
@@ -7825,7 +7825,7 @@ void intel_init_gt_powersave(struct drm_i915_private *dev_priv)* RPM depends on RC6 to save restore the GT HW context, so make RC6 a * requirement. */ -if (!i915.enable_rc6) { +if (!i915_param (enable_rc6)) {DRM_INFO ("RC6 disabled, disabling runtime PM support\n" );intel_runtime_pm_get (dev_priv); }
@@ -7882,7 +7882,7 @@ void intel_cleanup_gt_powersave(struct drm_i915_private *dev_priv)if (IS_VALLEYVIEW (dev_priv))valleyview_cleanup_gt_powersave (dev_priv); -if (!i915.enable_rc6) +if (!i915_param (enable_rc6))intel_runtime_pm_put (dev_priv); }
@@ -8004,7 +8004,7 @@ static void __intel_autoenable_gt_powersave(struct work_struct *work)if (IS_ERR (req)) goto unlock; -if (!i915.enable_execlists &&i915_switch_context (req) ==0 ) +if (!i915_param (enable_execlists) &&i915_switch_context (req) ==0 ) rcs->init_context (req);/* Mark the device busy, calling intel_enable_gt_powersave() */
drivers/gpu/drm/i915/intel_psr.c +5 -5
@@ -396,7 +396,7 @@ static bool intel_psr_match_conditions(struct intel_dp *intel_dp)return false; } -if (!i915.enable_psr) { +if (!i915_param (enable_psr)) {DRM_DEBUG_KMS ("PSR disable by flag\n" );return false; }
@@ -942,8 +942,8 @@ void intel_psr_init(struct drm_i915_private *dev_priv) HSW_EDP_PSR_BASE :BDW_EDP_PSR_BASE ;/* Per platform default: all disabled. */ -if (i915.enable_psr ==-1 ) - i915.enable_psr =0 ; +if (i915_param (enable_psr) ==-1 ) +i915_param_set (enable_psr,0 );/* Set link_standby x link_off defaults */ if (IS_HASWELL (dev_priv) ||IS_BROADWELL (dev_priv))
@@ -957,11 +957,11 @@ void intel_psr_init(struct drm_i915_private *dev_priv) dev_priv->psr.link_standby = dev_priv->vbt.psr.full_link;/* Override link_standby x link_off defaults */ -if (i915.enable_psr ==2 && !dev_priv->psr.link_standby) { +if (i915_param (enable_psr) ==2 && !dev_priv->psr.link_standby) {DRM_DEBUG_KMS ("PSR: Forcing link standby\n" ); dev_priv->psr.link_standby = true; } -if (i915.enable_psr ==3 && dev_priv->psr.link_standby) { +if (i915_param (enable_psr) ==3 && dev_priv->psr.link_standby) {DRM_DEBUG_KMS ("PSR: Forcing main link off\n" ); dev_priv->psr.link_standby = false; }
drivers/gpu/drm/i915/intel_ringbuffer.c +4 -4
@@ -1861,7 +1861,7 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,struct drm_i915_gem_object *obj;int ret, i; -if (!i915.semaphores) +if (!i915_param (semaphores))return ;if (INTEL_GEN (dev_priv) >=8 && !dev_priv->semaphore) {
@@ -1961,7 +1961,7 @@ static void intel_ring_init_semaphores(struct drm_i915_private *dev_priv,i915_gem_object_put (obj); err:DRM_DEBUG_DRIVER ("Failed to allocate space for semaphores, disabling\n" ); - i915.semaphores =0 ; +i915_param_set (semaphores,0 ); } static void intel_ring_init_irq(struct drm_i915_private *dev_priv,
@@ -2016,7 +2016,7 @@ static void intel_ring_default_vfuncs(struct drm_i915_private *dev_priv, engine->emit_breadcrumb = i9xx_emit_breadcrumb; engine->emit_breadcrumb_sz = i9xx_emit_breadcrumb_sz; -if (i915.semaphores) { +if (i915_param (semaphores)) {int num_rings; engine->emit_breadcrumb = gen6_sema_emit_breadcrumb;
@@ -2060,7 +2060,7 @@ int intel_init_render_ring_buffer(struct intel_engine_cs *engine) engine->emit_breadcrumb = gen8_render_emit_breadcrumb; engine->emit_breadcrumb_sz = gen8_render_emit_breadcrumb_sz; engine->emit_flush = gen8_render_ring_flush; -if (i915.semaphores) { +if (i915_param (semaphores)) {int num_rings; engine->semaphore.signal = gen8_rcs_signal;
drivers/gpu/drm/i915/intel_runtime_pm.c +8 -8
@@ -2413,7 +2413,7 @@ static uint32_t get_allowed_dc_mask(const struct drm_i915_private *dev_priv, mask =0 ; } -if (!i915.disable_power_well) +if (!i915_param (disable_power_well)) max_dc =0 ;if (enable_dc >=0 && enable_dc <= max_dc) {
@@ -2471,10 +2471,10 @@ int intel_power_domains_init(struct drm_i915_private *dev_priv) {struct i915_power_domains *power_domains = &dev_priv->power_domains; - i915.disable_power_well =sanitize_disable_power_well_option (dev_priv, - i915.disable_power_well); - dev_priv->csr.allowed_dc_mask =get_allowed_dc_mask (dev_priv, - i915.enable_dc); +i915_param_set (disable_power_well, +sanitize_disable_power_well_option (dev_priv,i915_param (disable_power_well))); + dev_priv->csr.allowed_dc_mask = +get_allowed_dc_mask (dev_priv,i915_param (enable_dc));BUILD_BUG_ON (POWER_DOMAIN_NUM >64 );
@@ -2535,7 +2535,7 @@ void intel_power_domains_fini(struct drm_i915_private *dev_priv)intel_display_set_init_power (dev_priv, true);/* Remove the refcount we took to keep power well support disabled. */ -if (!i915.disable_power_well) +if (!i915_param (disable_power_well))intel_display_power_put (dev_priv,POWER_DOMAIN_INIT );/*
@@ -2995,7 +2995,7 @@ void intel_power_domains_init_hw(struct drm_i915_private *dev_priv, bool resume)/* For now, we need the power well to be always enabled. */ intel_display_set_init_power (dev_priv, true);/* Disable power support if the user asked so. */ -if (!i915.disable_power_well) +if (!i915_param (disable_power_well))intel_display_power_get (dev_priv,POWER_DOMAIN_INIT );intel_power_domains_sync_hw (dev_priv); power_domains->initializing = false;
@@ -3014,7 +3014,7 @@ void intel_power_domains_suspend(struct drm_i915_private *dev_priv)* Even if power well support was disabled we still want to disable * power wells while we are system suspended. */ -if (!i915.disable_power_well) +if (!i915_param (disable_power_well))intel_display_power_put (dev_priv,POWER_DOMAIN_INIT );if (IS_CANNONLAKE (dev_priv))
drivers/gpu/drm/i915/intel_uc.c +26 -25
128 lines not on this page · raw message
drivers/gpu/drm/i915/intel_uncore.c +12 -11
@@ -436,7 +436,8 @@ void intel_uncore_resume_early(struct drm_i915_private *dev_priv)void intel_uncore_sanitize (struct drm_i915_private *dev_priv) { - i915.enable_rc6 =sanitize_rc6_option (dev_priv, i915.enable_rc6); +i915_param_set (enable_rc6, +sanitize_rc6_option (dev_priv,i915_param (enable_rc6)));/* BIOS often leaves RC6 enabled, but disable it for hw init */ intel_sanitize_gt_powersave (dev_priv);
@@ -507,10 +508,10 @@ void intel_uncore_forcewake_user_get(struct drm_i915_private *dev_priv) dev_priv->uncore.user_forcewake.saved_mmio_check = dev_priv->uncore.unclaimed_mmio_check; dev_priv->uncore.user_forcewake.saved_mmio_debug = - i915.mmio_debug; +i915_param (mmio_debug); dev_priv->uncore.unclaimed_mmio_check =0 ; - i915.mmio_debug =0 ; +i915_param_set (mmio_debug,0 ); }spin_unlock_irq (&dev_priv->uncore.lock); }
@@ -532,8 +533,8 @@ void intel_uncore_forcewake_user_put(struct drm_i915_private *dev_priv) dev_priv->uncore.unclaimed_mmio_check = dev_priv->uncore.user_forcewake.saved_mmio_check; - i915.mmio_debug = - dev_priv->uncore.user_forcewake.saved_mmio_debug; +i915_param_set (mmio_debug, + dev_priv->uncore.user_forcewake.saved_mmio_debug);intel_uncore_forcewake_put__locked (dev_priv,FORCEWAKE_ALL ); }
@@ -841,7 +842,7 @@ __unclaimed_reg_debug(struct drm_i915_private *dev_priv, "Unclaimed %s register 0x%x\n", read ? "read from" : "write to", i915_mmio_reg_offset(reg))) - i915.mmio_debug--;/* Only report the first N failures */ +i915_param_dec (mmio_debug);/* Only report the first N failures */ } static inline void
@@ -850,7 +851,7 @@ unclaimed_reg_debug(struct drm_i915_private *dev_priv,const bool read, const bool before) { - if (likely(!i915.mmio_debug)) + if (likely(!i915_param(mmio_debug))) return;__unclaimed_reg_debug (dev_priv ,reg ,read ,before );
@@ -1706,7 +1707,7 @@ typedef int (*reset_func)(struct drm_i915_private *, unsigned engine_mask);static reset_func intel_get_gpu_reset (struct drm_i915_private *dev_priv) { -if (!i915.reset) +if (!i915_param (reset))return NULL ;if (INTEL_INFO (dev_priv)->gen >=8 )
@@ -1766,7 +1767,7 @@ bool intel_has_reset_engine(struct drm_i915_private *dev_priv) {return (dev_priv->info.has_reset_engine && !dev_priv->guc.execbuf_client && - i915.reset >=2 ); +i915_param (reset) >=2 ); }int intel_guc_reset (struct drm_i915_private *dev_priv)
@@ -1791,7 +1792,7 @@ bool intel_uncore_unclaimed_mmio(struct drm_i915_private *dev_priv)bool intel_uncore_arm_unclaimed_mmio_detection (struct drm_i915_private *dev_priv) { -if (unlikely (i915.mmio_debug || +if (unlikely (i915_param (mmio_debug) || dev_priv->uncore.unclaimed_mmio_check <=0 ))return false;
@@ -1799,7 +1800,7 @@ intel_uncore_arm_unclaimed_mmio_detection(struct drm_i915_private *dev_priv)DRM_DEBUG ("Unclaimed register detected, " "enabling oneshot unclaimed register reporting. " "Please use i915.mmio_debug=N for more information.\n" ); - i915.mmio_debug++; +i915_param_inc (mmio_debug); dev_priv->uncore.unclaimed_mmio_check--;return true; }
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v3 5/5 drm/i915: Rename global i915 to i915_params
In reply to Michal WajdeczkoOur global struct with params is named exactly the same way as new preferred name for the drm_i915_private function parameter.
To avoid such name reuse and allow further cleanup of deprecated dev_priv lets use different name for the global.
v2: rebased
v3: rebased
--- drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- drivers/gpu/drm/i915/i915_params.c | 6 +++--- drivers/gpu/drm/i915/i915_params.h | 12 ++++++------ 3 files changed, 10 insertions(+), 10 deletions(-)
drivers/gpu/drm/i915/i915_gpu_error.c +1 -1
@@ -1696,7 +1696,7 @@ static int capture(void *data)ktime_to_timeval (ktime_sub (ktime_get (), error->i915->gt.last_init_time)); - error->params = i915; + error->params = i915_params;#define DUP (T , x) dup_param(#T, &error->params.x);I915_PARAMS_FOR_EACH (DUP );#undef DUP
drivers/gpu/drm/i915/i915_params.c +3 -3
@@ -26,13 +26,13 @@#include "i915_drv.h" #define i915_param_named (name,T , perm, desc) \ - module_param_named(name, i915.name, T, perm); \ + module_param_named(name, i915_params.name, T, perm); \ MODULE_PARM_DESC(name, desc)#define i915_param_named_unsafe (name,T , perm, desc) \ - module_param_named_unsafe(name, i915.name, T, perm); \ + module_param_named_unsafe(name, i915_params.name, T, perm); \ MODULE_PARM_DESC(name, desc) -struct i915_params i915__read_mostly = { +struct i915_params i915_params__read_mostly = { .modeset =-1 , .panel_ignore_lid =1 , .semaphores =-1 ,
drivers/gpu/drm/i915/i915_params.h +6 -6
@@ -76,13 +76,13 @@ struct i915_params { };#undef MEMBER -extern struct i915_params i915__read_mostly ; +extern struct i915_params i915_params__read_mostly ; -#define i915_param (n) ({ i915.n; }) -#define i915_param_set (n,e) ({ i915.n = e; }) -#define i915_param_inc (n) ({ i915.n++; }) -#define i915_param_dec (n) ({ i915.n--; }) -#define i915_param_ptr (n) ({ &i915.n; }) +#define i915_param (n) ({ i915_params.n; }) +#define i915_param_set (n,e) ({ i915_params.n = e; }) +#define i915_param_inc (n) ({ i915_params.n++; }) +#define i915_param_dec (n) ({ i915_params.n--; }) +#define i915_param_ptr (n) ({ &i915_params.n; })#endif
Signature · 6 lines
2.7.4 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for drm/i915: Rename global i915 to i915_params (rev3)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: drm/i915: Rename global i915 to i915_params (rev3)
URL : https://patchwork.freedesktop.org/series/30217/
State : success
== Summary ==
Series 30217v3 drm/i915: Rename global i915 to i915_params
https://patchwork.freedesktop.org/api/1.0/series/30217/revisions/3/mbox/
Test kms_flip:
Subgroup basic-flip-vs-modeset:
skip -> PASS (fi-skl-x1585l) fdo#101781
Subgroup basic-flip-vs-wf_vblank:
skip -> PASS (fi-skl-x1585l)fdo#101781 https://bugs.freedesktop.org/show_bug.cgi?id=101781
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:449s fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:458s fi-blb-e6850 total:289 pass:224 dwarn:1 dfail:0 fail:0 skip:64 time:377s fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:541s fi-bwr-2160 total:289 pass:184 dwarn:0 dfail:0 fail:0 skip:105 time:269s fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:504s fi-byt-j1900 total:289 pass:254 dwarn:1 dfail:0 fail:0 skip:34 time:505s fi-byt-n2820 total:289 pass:250 dwarn:1 dfail:0 fail:0 skip:38 time:502s fi-cfl-s total:289 pass:223 dwarn:34 dfail:0 fail:0 skip:32 time:554s fi-elk-e7500 total:289 pass:230 dwarn:0 dfail:0 fail:0 skip:59 time:445s fi-glk-2a total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:593s fi-hsw-4770 total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:429s fi-hsw-4770r total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:409s fi-ilk-650 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:437s fi-ivb-3520m total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:492s fi-ivb-3770 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:470s fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:495s fi-kbl-7560u total:289 pass:270 dwarn:0 dfail:0 fail:0 skip:19 time:578s fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:588s fi-pnv-d510 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:548s fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:456s fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:516s fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:504s fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:465s fi-skl-x1585l total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:496s fi-snb-2520m total:289 pass:251 dwarn:0 dfail:0 fail:0 skip:38 time:567s fi-snb-2600 total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:421s
46e05d756fe32271bca4ac3ef1b3f1f6006fcc0c drm-tip: 2017y-09m-14d-14h-46m-01s UTC integration manifest f3a87d957dec drm/i915: Rename global i915 to i915_paramsfbb06a29c75d drm/i915: Wrap access to module params into macrodf6067419eee drm/i915: Extend private i915_param_named macro with description 14aad3f9fc01 drm/i915: Introduce custom variant of module_param_named macro cae51c8dd33f drm/i915: Rename lvds_use_ssc modparam to panel_use_ssc
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5701/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for drm/i915: Rename global i915 to i915_params (rev3)
In reply to Michal Wajdeczko== Series Details ==
== Series Details ==
Series: drm/i915: Rename global i915 to i915_params (rev3)
URL : https://patchwork.freedesktop.org/series/30217/
State : success
== Summary ==
Test perf:
Subgroup polling:
pass -> FAIL (shard-hsw) fdo#102252 +1
Test kms_plane:
Subgroup plane-panning-bottom-right-suspend-pipe-C-planes:
skip -> PASS (shard-hsw)
Test kms_rmfb:
Subgroup close-fd:
skip -> PASS (shard-hsw)
Test kms_universal_plane:
Subgroup universal-plane-pipe-B-functional:
skip -> PASS (shard-hsw)
Test kms_cursor_crc:
Subgroup cursor-256x256-dpms:
skip -> PASS (shard-hsw)
Test gem_eio:
Subgroup in-flight:
pass -> FAIL (shard-hsw) fdo#102616fdo#102252 https://bugs.freedesktop.org/show_bug.cgi?id=102252
fdo#102616 https://bugs.freedesktop.org/show_bug.cgi?id=102616
shard-hsw total:2313 pass:1243 dwarn:0 dfail:0 fail:15 skip:1055 time:9428s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/Patchwork_5701/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx