[Intel-gfx] [PATCH 2/5] drm/i915: Use HAS_PCH_SPLIT to determine correct devices

[Ville Syrjälä]

On Mon, Dec 07, 2015 at 10:51:07AM -0800, Wayne Boyer wrote:
> Do some further clean up based on the initial review of
> drm/i915: Separate cherryview from valleyview.
> 
> In this case check for '(GEN7 || GEN8) && HAS_PCH_SPLIT' since we're
> reading FUSE_STRAP and SFUSE_STRAP which live in the PCH.
> 
> Cc: Ville Syrjälä <ville.syrjala at linux.intel.com>
> Cc: Rodrigo Vivi <rodrigo.vivi at intel.com>
> Signed-off-by: Wayne Boyer <wayne.boyer at intel.com>

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

> ---
>  drivers/gpu/drm/i915/i915_dma.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu/drm/i915/i915_dma.c
> index b156b08e..d816aa2 100644
> --- a/drivers/gpu/drm/i915/i915_dma.c
> +++ b/drivers/gpu/drm/i915/i915_dma.c
> @@ -791,7 +791,7 @@ static void intel_device_info_runtime_init(struct drm_device *dev)
>  		info->num_pipes = 0;
>  	} else if (info->num_pipes > 0 &&
>  		   (INTEL_INFO(dev)->gen == 7 || INTEL_INFO(dev)->gen == 8) &&
> -		   !(IS_VALLEYVIEW(dev) || IS_CHERRYVIEW(dev))) {
> +		   HAS_PCH_SPLIT(dev)) {
>  		u32 fuse_strap = I915_READ(FUSE_STRAP);
>  		u32 sfuse_strap = I915_READ(SFUSE_STRAP);
>  
> -- 
> 2.6.3

-- 
Ville Syrjälä
Intel OTC