[Intel-gfx] [PATCH 1/2] drm/i915: Move device_info.has_snoop into the static tables

[Ville Syrjälä]

On Tue, Sep 05, 2017 at 02:47:34PM +0100, Chris Wilson wrote:
> Currently we define any !llc machine as using snoop instead. However,
> some platforms run into trouble using snoop that we would like to
> disable, and to do so easily we want to be able to use the static
> device_info tables.
> 
> Signed-off-by: Chris Wilson <chris at chris-wilson.co.uk>

Can't spot any functional changes, assuming I correctly deduced
which macros are getting updated.

Reviewed-by: Ville Syrjälä <ville.syrjala at linux.intel.com>

> ---
>  drivers/gpu/drm/i915/i915_pci.c          | 7 +++++++
>  drivers/gpu/drm/i915/intel_device_info.c | 2 --
>  2 files changed, 7 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_pci.c b/drivers/gpu/drm/i915/i915_pci.c
> index 201ed1fe81b6..e6e75a9d140e 100644
> --- a/drivers/gpu/drm/i915/i915_pci.c
> +++ b/drivers/gpu/drm/i915/i915_pci.c
> @@ -63,6 +63,7 @@
>  	.hws_needs_physical = 1, \
>  	.unfenced_needs_alignment = 1, \
>  	.ring_mask = RENDER_RING, \
> +	.has_snoop = true, \
>  	GEN_DEFAULT_PIPEOFFSETS, \
>  	CURSOR_OFFSETS
>  
> @@ -95,6 +96,7 @@ static const struct intel_device_info intel_i865g_info __initconst = {
>  	.gen = 3, .num_pipes = 2, \
>  	.has_gmch_display = 1, \
>  	.ring_mask = RENDER_RING, \
> +	.has_snoop = true, \
>  	GEN_DEFAULT_PIPEOFFSETS, \
>  	CURSOR_OFFSETS
>  
> @@ -157,6 +159,7 @@ static const struct intel_device_info intel_pineview_info __initconst = {
>  	.has_hotplug = 1, \
>  	.has_gmch_display = 1, \
>  	.ring_mask = RENDER_RING, \
> +	.has_snoop = true, \
>  	GEN_DEFAULT_PIPEOFFSETS, \
>  	CURSOR_OFFSETS
>  
> @@ -197,6 +200,7 @@ static const struct intel_device_info intel_gm45_info __initconst = {
>  	.has_hotplug = 1, \
>  	.has_gmbus_irq = 1, \
>  	.ring_mask = RENDER_RING | BSD_RING, \
> +	.has_snoop = true, \
>  	GEN_DEFAULT_PIPEOFFSETS, \
>  	CURSOR_OFFSETS
>  
> @@ -321,6 +325,7 @@ static const struct intel_device_info intel_valleyview_info __initconst = {
>  	.has_hotplug = 1,
>  	.has_aliasing_ppgtt = 1,
>  	.has_full_ppgtt = 1,
> +	.has_snoop = true,
>  	.ring_mask = RENDER_RING | BSD_RING | BLT_RING,
>  	.display_mmio_offset = VLV_DISPLAY_BASE,
>  	GEN_DEFAULT_PIPEOFFSETS,
> @@ -412,6 +417,7 @@ static const struct intel_device_info intel_cherryview_info __initconst = {
>  	.has_aliasing_ppgtt = 1,
>  	.has_full_ppgtt = 1,
>  	.has_reset_engine = 1,
> +	.has_snoop = true,
>  	.display_mmio_offset = VLV_DISPLAY_BASE,
>  	GEN_CHV_PIPEOFFSETS,
>  	CURSOR_OFFSETS,
> @@ -474,6 +480,7 @@ static const struct intel_device_info intel_skylake_gt4_info __initconst = {
>  	.has_full_ppgtt = 1, \
>  	.has_full_48bit_ppgtt = 1, \
>  	.has_reset_engine = 1, \
> +	.has_snoop = true, \
>  	GEN_DEFAULT_PIPEOFFSETS, \
>  	IVB_CURSOR_OFFSETS, \
>  	BDW_COLORS
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 05ef5e1b1750..d9c998fc4707 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -418,8 +418,6 @@ void intel_device_info_runtime_init(struct drm_i915_private *dev_priv)
>  	else if (INTEL_INFO(dev_priv)->gen >= 9)
>  		gen9_sseu_info_init(dev_priv);
>  
> -	info->has_snoop = !info->has_llc;
> -
>  	DRM_DEBUG_DRIVER("slice mask: %04x\n", info->sseu.slice_mask);
>  	DRM_DEBUG_DRIVER("slice total: %u\n", hweight8(info->sseu.slice_mask));
>  	DRM_DEBUG_DRIVER("subslice total: %u\n",
> -- 
> 2.14.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Ville Syrjälä
Intel OTC