[Intel-gfx] [PATCH 1/2] drm/i915/icl: move has_resource_streamer to GEN11_FEATURES

[Daniele Ceraolo Spurio]

On 09/07/18 17:06, Lucas De Marchi wrote:
> Resource streamer has been removed on GEN11 so move it to the FEATURES
> macro.
> 
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>

Reviewed-by: Daniele Ceraolo Spurio <daniele.ceraolospurio at intel.com>

Daniele

> ---
>   drivers/gpu/drm/i915/i915_gem_execbuffer.c | 2 +-
>   drivers/gpu/drm/i915/i915_pci.c            | 2 +-
>   2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem_execbuffer.c b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> index 3f0c612d42e7..1932bc227942 100644
> --- a/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> +++ b/drivers/gpu/drm/i915/i915_gem_execbuffer.c
> @@ -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) {
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 55543f1b0236..c03ba0fe0845 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -593,13 +593,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,
>   };
>   
>