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

Commit 48928d4b authored by Lucas De Marchi's avatar Lucas De Marchi Committed by Chris Wilson
Browse files

drm/i915/icl: move has_resource_streamer to GEN11_FEATURES 



Resource streamer has been removed on GEN11 so move it to the FEATURES
macro.

Signed-off-by: default avatarLucas De Marchi <lucas.demarchi@intel.com>
Reviewed-by: default avatarDaniele Ceraolo Spurio <daniele.ceraolospurio@intel.com>
Signed-off-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Link: https://patchwork.freedesktop.org/patch/msgid/20180719170557.10729-1-lucas.demarchi@intel.com
parent c444ad79

drivers/gpu/drm/i915/i915_gem_execbuffer.c

+1 −1
Original line number Diff line number Diff line
@@ -2223,7 +2223,7 @@ i915_gem_do_execbuffer(struct drm_device *dev, 


	if (args->flags & I915_EXEC_RESOURCE_STREAMER) {

		if (!HAS_RESOURCE_STREAMER(eb.i915)) {

			DRM_DEBUG("RS is only allowed for Haswell, Gen8 and above\n");

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

			return -EINVAL;

		}

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

drivers/gpu/drm/i915/i915_pci.c

+1 −1
Original line number Diff line number Diff line
@@ -604,13 +604,13 @@ 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 = {

	GEN11_FEATURES,

	PLATFORM(INTEL_ICELAKE),

	.is_alpha_support = 1,

	.has_resource_streamer = 0,

	.ring_mask = RENDER_RING | BLT_RING | VEBOX_RING | BSD_RING | BSD3_RING,

};