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

Commit 93c6e966 authored by Chris Wilson's avatar Chris Wilson
Browse files

drm/i915: Remove i915.semaphores modparam 



Having disabled the broken semaphores on Sandybridge, there is no need
for a modparam any more, so remove it in favour of a simple
HAS_LEGACY_SEMAPHORES() guard.

Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Reviewed-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarJoonas Lahtinen <joonas.lahtinen@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20171120205504.21892-5-chris@chris-wilson.co.uk
parent af9ff6c7

drivers/gpu/drm/i915/i915_drv.c

+1 −6
Original line number Diff line number Diff line
@@ -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_modparams.semaphores;

		value = HAS_LEGACY_SEMAPHORES(dev_priv);

		break;

	case I915_PARAM_HAS_SECURE_BATCHES:

		value = capable(CAP_SYS_ADMIN);
@@ -1063,11 +1063,6 @@ static void intel_sanitize_options(struct drm_i915_private *dev_priv) 
					    i915_modparams.enable_ppgtt);

	DRM_DEBUG_DRIVER("ppgtt mode: %i\n", i915_modparams.enable_ppgtt);



	i915_modparams.semaphores =

		intel_sanitize_semaphores(dev_priv, i915_modparams.semaphores);

	DRM_DEBUG_DRIVER("use GPU semaphores? %s\n",

			 yesno(i915_modparams.semaphores));



	intel_uc_sanitize_options(dev_priv);



	intel_gvt_sanitize_options(dev_priv);

drivers/gpu/drm/i915/i915_drv.h

+2 −2
Original line number Diff line number Diff line
@@ -3139,6 +3139,8 @@ intel_info(const struct drm_i915_private *dev_priv) 
#define HAS_BLT(dev_priv)	HAS_ENGINE(dev_priv, BCS)

#define HAS_VEBOX(dev_priv)	HAS_ENGINE(dev_priv, VECS)



#define HAS_LEGACY_SEMAPHORES(dev_priv) IS_GEN7(dev_priv)



#define HAS_LLC(dev_priv)	((dev_priv)->info.has_llc)

#define HAS_SNOOP(dev_priv)	((dev_priv)->info.has_snoop)

#define HAS_EDRAM(dev_priv)	(!!((dev_priv)->edram_cap & EDRAM_ENABLED))
@@ -3302,8 +3304,6 @@ intel_ggtt_update_needs_vtd_wa(struct drm_i915_private *dev_priv) 
int intel_sanitize_enable_ppgtt(struct drm_i915_private *dev_priv,

				int enable_ppgtt);



bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value);



/* i915_drv.c */

void __printf(3, 4)

__i915_printk(struct drm_i915_private *dev_priv, const char *level,

drivers/gpu/drm/i915/i915_gem.c

+0 −11
Original line number Diff line number Diff line
@@ -4997,17 +4997,6 @@ int i915_gem_init_hw(struct drm_i915_private *dev_priv) 
	return ret;

}



bool intel_sanitize_semaphores(struct drm_i915_private *dev_priv, int value)

{

	if (!IS_GEN7(dev_priv))

		return false;



	if (value >= 0)

		return value;



	return true;

}



static int __intel_engines_record_defaults(struct drm_i915_private *i915)

{

	struct i915_gem_context *ctx;

drivers/gpu/drm/i915/i915_gem_context.c

+1 −1
Original line number Diff line number Diff line
@@ -574,7 +574,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_modparams.semaphores && IS_GEN7(dev_priv)) ?

		(HAS_LEGACY_SEMAPHORES(dev_priv) && IS_GEN7(dev_priv)) ?

		INTEL_INFO(dev_priv)->num_rings - 1 :

		0;

	int len;

drivers/gpu/drm/i915/i915_params.c

+0 −4
Original line number Diff line number Diff line
@@ -46,10 +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(semaphores, int, 0400,

	"Use semaphores for inter-ring sync "

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



i915_param_named_unsafe(enable_rc6, int, 0400,

	"Enable power-saving render C-state 6. "

	"Different stages can be selected via bitmask values "