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

Commit fb6db0f5 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Remove unsafe i915.enable_rc6 



It has been many years since the last confirmed sighting (and fix) of an
RC6 related bug (usually a system hang). Remove the parameter to stop
users from setting dangerous values, as they often set it during triage
and end up disabling the entire runtime pm instead (the option is not a
fine scalpel!).

Furthermore, it allows users to set known dangerous values which were
intended for testing and not for production use. For testing, we can
always patch in the required setting without having to expose ourselves
to random abuse.

v2: Fixup NEEDS_WaRsDisableCoarsePowerGating fumble, and document the
lack of ilk support better.
v3: Clear intel_info->rc6p if we don't support rc6 itself.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Cc: Jani Nikula <jani.nikula@intel.com>
Cc: Imre Deak <imre.deak@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171201113030.18360-1-chris@chris-wilson.co.uk
parent f7096d40

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -2527,7 +2527,7 @@ static int intel_runtime_suspend(struct device *kdev) 
	struct drm_i915_private *dev_priv = to_i915(dev);

	int ret;



	if (WARN_ON_ONCE(!(dev_priv->gt_pm.rc6.enabled && intel_rc6_enabled())))

	if (WARN_ON_ONCE(!(dev_priv->gt_pm.rc6.enabled && HAS_RC6(dev_priv))))

		return -ENODEV;



	if (WARN_ON_ONCE(!HAS_RUNTIME_PM(dev_priv)))

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -3213,8 +3213,10 @@ intel_info(const struct drm_i915_private *dev_priv) 
#define HAS_DDI(dev_priv)		 ((dev_priv)->info.has_ddi)

#define HAS_FPGA_DBG_UNCLAIMED(dev_priv) ((dev_priv)->info.has_fpga_dbg)

#define HAS_PSR(dev_priv)		 ((dev_priv)->info.has_psr)



#define HAS_RC6(dev_priv)		 ((dev_priv)->info.has_rc6)

#define HAS_RC6p(dev_priv)		 ((dev_priv)->info.has_rc6p)

#define HAS_RC6pp(dev_priv)		 (false) /* HW was never validated */



#define HAS_CSR(dev_priv)	((dev_priv)->info.has_csr)

drivers/gpu/drm/i915/i915_params.c

+0 −7
Original line number Diff line number Diff line
@@ -46,13 +46,6 @@ 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(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,

	"Enable power-saving display C-states. "

	"(-1=auto [default]; 0=disable; 1=up to DC5; 2=up to DC6)");

drivers/gpu/drm/i915/i915_params.h

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ 
	param(int, lvds_channel_mode, 0) \

	param(int, panel_use_ssc, -1) \

	param(int, vbt_sdvo_panel_type, -1) \

	param(int, enable_rc6, -1) \

	param(int, enable_dc, -1) \

	param(int, enable_fbc, -1) \

	param(int, enable_ppgtt, -1) \

drivers/gpu/drm/i915/i915_pci.c

+2 −0
Original line number Diff line number Diff line
@@ -209,6 +209,8 @@ static const struct intel_device_info intel_gm45_info __initconst = { 
	.has_hotplug = 1, \

	.ring_mask = RENDER_RING | BSD_RING, \

	.has_snoop = true, \

	/* ilk does support rc6, but we do not implement [power] contexts */ \

	.has_rc6 = 0, \

	GEN_DEFAULT_PIPEOFFSETS, \

	GEN_DEFAULT_PAGE_SIZES, \

	CURSOR_OFFSETS