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

Commit 08e3e21a authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Chris Wilson
Browse files

drm/i915: kill resource streamer support 



After disabling resource streamer on ICL (due to it actually not
existing there), I got feedback that there have been some experimental
patches for mesa to use RS years ago, but nothing ever landed or shipped
because there was no performance improvement.

This removes it from kernel keeping the uapi defines around for
compatibility.

v2: - re-add the inadvertent removal of CTX_CTRL_INHIBIT_SYN_CTX_SWITCH
    - don't bother trying to document removed params on uapi header:
      applications should know that from the query.
      (from Chris)

v3: - disable CTX_CTRL_RS_CTX_ENABLE istead of removing it
    - reword commit message after Daniele confirmed no performance
      regression on his machine
    - reword commit message to make clear RS is being removed due to
      never been used
v4: - move I915_EXEC_RESOURCE_STREAMER to __I915_EXEC_ILLEGAL_FLAGS so
      the check on ioctl() is made much earlier by
      i915_gem_check_execbuffer() (suggested by Tvrtko)

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Acked-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Reviewed-by: default avatarTvrtko Ursulin <tvrtko.ursulin@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180803232443.17193-1-lucas.demarchi@intel.com
parent 48928d4b

drivers/gpu/drm/i915/i915_drv.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static int i915_getparam_ioctl(struct drm_device *dev, void *data, 
			value = 2;

		break;

	case I915_PARAM_HAS_RESOURCE_STREAMER:

		value = HAS_RESOURCE_STREAMER(dev_priv);

		value = 0;

		break;

	case I915_PARAM_HAS_POOLED_EU:

		value = HAS_POOLED_EU(dev_priv);

drivers/gpu/drm/i915/i915_drv.h

+0 −2
Original line number Diff line number Diff line
@@ -2610,8 +2610,6 @@ intel_info(const struct drm_i915_private *dev_priv) 
#define USES_GUC_SUBMISSION(dev_priv)	intel_uc_is_using_guc_submission()

#define USES_HUC(dev_priv)		intel_uc_is_using_huc()



#define HAS_RESOURCE_STREAMER(dev_priv) ((dev_priv)->info.has_resource_streamer)



#define HAS_POOLED_EU(dev_priv)	((dev_priv)->info.has_pooled_eu)



#define INTEL_PCH_DEVICE_ID_MASK		0xff80

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+3 −15
Original line number Diff line number Diff line
@@ -64,7 +64,9 @@ enum { 
#define BATCH_OFFSET_BIAS (256*1024)



#define __I915_EXEC_ILLEGAL_FLAGS \

	(__I915_EXEC_UNKNOWN_FLAGS | I915_EXEC_CONSTANTS_MASK)

	(__I915_EXEC_UNKNOWN_FLAGS | \

	 I915_EXEC_CONSTANTS_MASK  | \

	 I915_EXEC_RESOURCE_STREAMER)



/* Catch emission of unexpected errors for CI! */

#if IS_ENABLED(CONFIG_DRM_I915_DEBUG_GEM)
@@ -2221,20 +2223,6 @@ i915_gem_do_execbuffer(struct drm_device *dev, 
	if (!eb.engine)

		return -EINVAL;



	if (args->flags & I915_EXEC_RESOURCE_STREAMER) {

		if (!HAS_RESOURCE_STREAMER(eb.i915)) {

			DRM_DEBUG("RS is only allowed for Haswell and Gen8 - Gen10\n");

			return -EINVAL;

		}

		if (eb.engine->id != RCS) {

			DRM_DEBUG("RS is not available on %s\n",

				 eb.engine->name);

			return -EINVAL;

		}



		eb.batch_flags |= I915_DISPATCH_RS;

	}



	if (args->flags & I915_EXEC_FENCE_IN) {

		in_fence = sync_file_get_fence(lower_32_bits(args->rsvd2));

		if (!in_fence)

drivers/gpu/drm/i915/i915_pci.c

+0 −4
Original line number Diff line number Diff line
@@ -368,7 +368,6 @@ static const struct intel_device_info intel_valleyview_info = { 
	.has_ddi = 1, \

	.has_fpga_dbg = 1, \

	.has_psr = 1, \

	.has_resource_streamer = 1, \

	.has_dp_mst = 1, \

	.has_rc6p = 0 /* RC6p removed-by HSW */, \

	.has_runtime_pm = 1
@@ -441,7 +440,6 @@ static const struct intel_device_info intel_cherryview_info = { 
	.ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,

	.has_64bit_reloc = 1,

	.has_runtime_pm = 1,

	.has_resource_streamer = 1,

	.has_rc6 = 1,

	.has_logical_ring_contexts = 1,

	.has_gmch_display = 1,
@@ -515,7 +513,6 @@ static const struct intel_device_info intel_skylake_gt4_info = { 
	.has_runtime_pm = 1, \

	.has_pooled_eu = 0, \

	.has_csr = 1, \

	.has_resource_streamer = 1, \

	.has_rc6 = 1, \

	.has_dp_mst = 1, \

	.has_logical_ring_contexts = 1, \
@@ -604,7 +601,6 @@ static const struct intel_device_info intel_cannonlake_info = { 
	GEN(11), \

	.ddb_size = 2048, \

	.has_csr = 0, \

	.has_resource_streamer = 0, \

	.has_logical_ring_elsq = 1



static const struct intel_device_info intel_icelake_11_info = {

drivers/gpu/drm/i915/intel_device_info.h

+0 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@ enum intel_platform { 
	func(has_psr); \

	func(has_rc6); \

	func(has_rc6p); \

	func(has_resource_streamer); \

	func(has_runtime_pm); \

	func(has_snoop); \

	func(has_coherent_ggtt); \