Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d330a953 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: move module parameters into a struct, in a new file 



With 20+ module parameters, I think referring to them via a struct
improves clarity over just having a bunch of globals. While at it, move
the parameter initialization and definitions into a new file
i915_params.c to reduce clutter in i915_drv.c.

Apart from the ill-named i915_enable_rc6, i915_enable_fbc and
i915_enable_ppgtt parameters, for which we lose the "i915_" prefix
internally, the module parameters now look the same both on the kernel
command line and in code. For example, "i915.modeset".

The downsides of the change are losing static on a couple of variables
and not having the initialization and module_param_named() right next to
each other. On the other hand, all module parameters are now defined in
one place at i915_params.c. Plus you can do this to find all module
parameter references:

$ git grep "i915\." -- drivers/gpu/drm/i915

v2:
- move the definitions into a new file
- s/i915_params/i915/
- make i915_try_reset i915.reset, for consistency

Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 2b7e8082

drivers/gpu/drm/i915/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ 
	  i915_gem_gtt.o \

	  i915_gem_stolen.o \

	  i915_gem_tiling.o \

	  i915_params.o \

	  i915_sysfs.o \

	  i915_trace_points.o \

	  i915_ums.o \

drivers/gpu/drm/i915/i915_drv.c

+8 −122
Original line number Diff line number Diff line
@@ -38,120 +38,6 @@ 
#include <linux/module.h>

#include <drm/drm_crtc_helper.h>



static int i915_modeset __read_mostly = -1;

module_param_named(modeset, i915_modeset, int, 0400);

MODULE_PARM_DESC(modeset,

		"Use kernel modesetting [KMS] (0=DRM_I915_KMS from .config, "

		"1=on, -1=force vga console preference [default])");



int i915_panel_ignore_lid __read_mostly = 1;

module_param_named(panel_ignore_lid, i915_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)");



unsigned int i915_powersave __read_mostly = 1;

module_param_named(powersave, i915_powersave, int, 0600);

MODULE_PARM_DESC(powersave,

		"Enable powersavings, fbc, downclocking, etc. (default: true)");



int i915_semaphores __read_mostly = -1;

module_param_named(semaphores, i915_semaphores, int, 0400);

MODULE_PARM_DESC(semaphores,

		"Use semaphores for inter-ring sync (default: -1 (use per-chip defaults))");



int i915_enable_rc6 __read_mostly = -1;

module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0400);

MODULE_PARM_DESC(i915_enable_rc6,

		"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)");



int i915_enable_fbc __read_mostly = -1;

module_param_named(i915_enable_fbc, i915_enable_fbc, int, 0600);

MODULE_PARM_DESC(i915_enable_fbc,

		"Enable frame buffer compression for power savings "

		"(default: -1 (use per-chip default))");



unsigned int i915_lvds_downclock __read_mostly = 0;

module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);

MODULE_PARM_DESC(lvds_downclock,

		"Use panel (LVDS/eDP) downclocking for power savings "

		"(default: false)");



int i915_lvds_channel_mode __read_mostly;

module_param_named(lvds_channel_mode, i915_lvds_channel_mode, int, 0600);

MODULE_PARM_DESC(lvds_channel_mode,

		 "Specify LVDS channel mode "

		 "(0=probe BIOS [default], 1=single-channel, 2=dual-channel)");



int i915_panel_use_ssc __read_mostly = -1;

module_param_named(lvds_use_ssc, i915_panel_use_ssc, int, 0600);

MODULE_PARM_DESC(lvds_use_ssc,

		"Use Spread Spectrum Clock with panels [LVDS/eDP] "

		"(default: auto from VBT)");



int i915_vbt_sdvo_panel_type __read_mostly = -1;

module_param_named(vbt_sdvo_panel_type, i915_vbt_sdvo_panel_type, int, 0600);

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)");



static bool i915_try_reset __read_mostly = true;

module_param_named(reset, i915_try_reset, bool, 0600);

MODULE_PARM_DESC(reset, "Attempt GPU resets (default: true)");



bool i915_enable_hangcheck __read_mostly = true;

module_param_named(enable_hangcheck, i915_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)");



int i915_enable_ppgtt __read_mostly = -1;

module_param_named(i915_enable_ppgtt, i915_enable_ppgtt, int, 0400);

MODULE_PARM_DESC(i915_enable_ppgtt,

		"Override PPGTT usage. "

		"(-1=auto [default], 0=disabled, 1=aliasing, 2=full)");



int i915_enable_psr __read_mostly = 0;

module_param_named(enable_psr, i915_enable_psr, int, 0600);

MODULE_PARM_DESC(enable_psr, "Enable PSR (default: false)");



unsigned int i915_preliminary_hw_support __read_mostly = IS_ENABLED(CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT);

module_param_named(preliminary_hw_support, i915_preliminary_hw_support, int, 0600);

MODULE_PARM_DESC(preliminary_hw_support,

		"Enable preliminary hardware support.");



int i915_disable_power_well __read_mostly = 1;

module_param_named(disable_power_well, i915_disable_power_well, int, 0600);

MODULE_PARM_DESC(disable_power_well,

		 "Disable the power well when possible (default: true)");



int i915_enable_ips __read_mostly = 1;

module_param_named(enable_ips, i915_enable_ips, int, 0600);

MODULE_PARM_DESC(enable_ips, "Enable IPS (default: true)");



bool i915_fastboot __read_mostly = 0;

module_param_named(fastboot, i915_fastboot, bool, 0600);

MODULE_PARM_DESC(fastboot, "Try to skip unnecessary mode sets at boot time "

		 "(default: false)");



int i915_enable_pc8 __read_mostly = 1;

module_param_named(enable_pc8, i915_enable_pc8, int, 0600);

MODULE_PARM_DESC(enable_pc8, "Enable support for low power package C states (PC8+) (default: true)");



int i915_pc8_timeout __read_mostly = 5000;

module_param_named(pc8_timeout, i915_pc8_timeout, int, 0600);

MODULE_PARM_DESC(pc8_timeout, "Number of msecs of idleness required to enter PC8+ (default: 5000)");



bool i915_prefault_disable __read_mostly;

module_param_named(prefault_disable, i915_prefault_disable, bool, 0600);

MODULE_PARM_DESC(prefault_disable,

		"Disable page prefaulting for pread/pwrite/reloc (default:false). For developers only.");



static struct drm_driver driver;



static const struct intel_device_info intel_i830_info = {
@@ -480,12 +366,12 @@ bool i915_semaphore_is_enabled(struct drm_device *dev) 


	/* Until we get further testing... */

	if (IS_GEN8(dev)) {

		WARN_ON(!i915_preliminary_hw_support);

		WARN_ON(!i915.preliminary_hw_support);

		return false;

	}



	if (i915_semaphores >= 0)

		return i915_semaphores;

	if (i915.semaphores >= 0)

		return i915.semaphores;



#ifdef CONFIG_INTEL_IOMMU

	/* Enable semaphores on SNB when IO remapping is off */
@@ -750,7 +636,7 @@ int i915_reset(struct drm_device *dev) 
	bool simulated;

	int ret;



	if (!i915_try_reset)

	if (!i915.reset)

		return 0;



	mutex_lock(&dev->struct_mutex);
@@ -818,7 +704,7 @@ static int i915_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) 
	struct intel_device_info *intel_info =

		(struct intel_device_info *) ent->driver_data;



	if (IS_PRELIMINARY_HW(intel_info) && !i915_preliminary_hw_support) {

	if (IS_PRELIMINARY_HW(intel_info) && !i915.preliminary_hw_support) {

		DRM_INFO("This hardware requires preliminary hardware support.\n"

			 "See CONFIG_DRM_I915_PRELIMINARY_HW_SUPPORT, and/or modparam preliminary_hw_support\n");

		return -ENODEV;
@@ -1049,14 +935,14 @@ static int __init i915_init(void) 
	 * the default behavior.

	 */

#if defined(CONFIG_DRM_I915_KMS)

	if (i915_modeset != 0)

	if (i915.modeset != 0)

		driver.driver_features |= DRIVER_MODESET;

#endif

	if (i915_modeset == 1)

	if (i915.modeset == 1)

		driver.driver_features |= DRIVER_MODESET;



#ifdef CONFIG_VGA_CONSOLE

	if (vgacon_text_force() && i915_modeset == -1)

	if (vgacon_text_force() && i915.modeset == -1)

		driver.driver_features &= ~DRIVER_MODESET;

#endif

drivers/gpu/drm/i915/i915_drv.h

+29 −21
Original line number Diff line number Diff line
@@ -1891,31 +1891,39 @@ struct drm_i915_file_private { 


extern const struct drm_ioctl_desc i915_ioctls[];

extern int i915_max_ioctl;

extern int i915_panel_ignore_lid __read_mostly;

extern unsigned int i915_powersave __read_mostly;

extern int i915_semaphores __read_mostly;

extern unsigned int i915_lvds_downclock __read_mostly;

extern int i915_lvds_channel_mode __read_mostly;

extern int i915_panel_use_ssc __read_mostly;

extern int i915_vbt_sdvo_panel_type __read_mostly;

extern int i915_enable_rc6 __read_mostly;

extern int i915_enable_fbc __read_mostly;

extern bool i915_enable_hangcheck __read_mostly;

extern int i915_enable_ppgtt __read_mostly;

extern int i915_enable_psr __read_mostly;

extern unsigned int i915_preliminary_hw_support __read_mostly;

extern int i915_disable_power_well __read_mostly;

extern int i915_enable_ips __read_mostly;

extern bool i915_fastboot __read_mostly;

extern int i915_enable_pc8 __read_mostly;

extern int i915_pc8_timeout __read_mostly;

extern bool i915_prefault_disable __read_mostly;



extern int i915_suspend(struct drm_device *dev, pm_message_t state);

extern int i915_resume(struct drm_device *dev);

extern int i915_master_create(struct drm_device *dev, struct drm_master *master);

extern void i915_master_destroy(struct drm_device *dev, struct drm_master *master);



/* i915_params.c */

struct i915_params {

	int modeset;

	int panel_ignore_lid;

	unsigned int powersave;

	int semaphores;

	unsigned int lvds_downclock;

	int lvds_channel_mode;

	int panel_use_ssc;

	int vbt_sdvo_panel_type;

	int enable_rc6;

	int enable_fbc;

	bool enable_hangcheck;

	int enable_ppgtt;

	int enable_psr;

	unsigned int preliminary_hw_support;

	int disable_power_well;

	int enable_ips;

	bool fastboot;

	int enable_pc8;

	int pc8_timeout;

	bool prefault_disable;

	bool reset;

	int invert_brightness;

};

extern struct i915_params i915 __read_mostly;



				/* i915_dma.c */

void i915_update_dri1_breadcrumb(struct drm_device *dev);

extern void i915_kernel_lost_context(struct drm_device * dev);
@@ -2295,10 +2303,10 @@ static inline void i915_gem_chipset_flush(struct drm_device *dev) 
int i915_gem_init_ppgtt(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt);

static inline bool intel_enable_ppgtt(struct drm_device *dev, bool full)

{

	if (i915_enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))

	if (i915.enable_ppgtt == 0 || !HAS_ALIASING_PPGTT(dev))

		return false;



	if (i915_enable_ppgtt == 1 && full)

	if (i915.enable_ppgtt == 1 && full)

		return false;



#ifdef CONFIG_INTEL_IOMMU

drivers/gpu/drm/i915/i915_gem.c

+2 −2
Original line number Diff line number Diff line
@@ -476,7 +476,7 @@ i915_gem_shmem_pread(struct drm_device *dev, 


		mutex_unlock(&dev->struct_mutex);



		if (likely(!i915_prefault_disable) && !prefaulted) {

		if (likely(!i915.prefault_disable) && !prefaulted) {

			ret = fault_in_multipages_writeable(user_data, remain);

			/* Userspace is tricking us, but we've already clobbered

			 * its pages with the prefault and promised to write the
@@ -868,7 +868,7 @@ i915_gem_pwrite_ioctl(struct drm_device *dev, void *data, 
		       args->size))

		return -EFAULT;



	if (likely(!i915_prefault_disable)) {

	if (likely(!i915.prefault_disable)) {

		ret = fault_in_multipages_readable(to_user_ptr(args->data_ptr),

						   args->size);

		if (ret)

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -896,7 +896,7 @@ validate_exec_list(struct drm_i915_gem_exec_object2 *exec, 
		if (!access_ok(VERIFY_WRITE, ptr, length))

			return -EFAULT;



		if (likely(!i915_prefault_disable)) {

		if (likely(!i915.prefault_disable)) {

			if (fault_in_multipages_readable(ptr, length))

				return -EFAULT;

		}