[Intel-gfx] [PATCH] drm/i915: bump platform_mask to u64

[Souza, Jose]

On Thu, 2019-03-14 at 17:13 -0700, Lucas De Marchi wrote:
> With Elkhart Lake being added to the platforms we are almost on the
> edge
> of platforms that fits on this 32 bits mask. So bump it to 64 bits to
> have room for new ones.

Reviewed-by: José Roberto de Souza <jose.souza at intel.com>
But https://patchwork.freedesktop.org/series/58030/ is more long term
solution :P

> 
> Cc: José Roberto de Souza <jose.souza at intel.com>
> Signed-off-by: Lucas De Marchi <lucas.demarchi at intel.com>
> ---
>  drivers/gpu/drm/i915/i915_drv.h          | 3 ++-
>  drivers/gpu/drm/i915/intel_device_info.h | 2 +-
>  2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/i915_drv.h
> b/drivers/gpu/drm/i915/i915_drv.h
> index dccb6006aabf..3105c1d1a5ab 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2281,7 +2281,8 @@ static inline unsigned int
> i915_sg_segment_size(void)
>  #define IS_REVID(p, since, until) \
>  	(INTEL_REVID(p) >= (since) && INTEL_REVID(p) <= (until))
>  
> -#define IS_PLATFORM(dev_priv, p) (INTEL_INFO(dev_priv)-
> >platform_mask & BIT(p))
> +#define IS_PLATFORM(dev_priv, p) \
> +	(INTEL_INFO(dev_priv)->platform_mask & BIT_ULL(p))
>  
>  #define IS_I830(dev_priv)	IS_PLATFORM(dev_priv, INTEL_I830)
>  #define IS_I845G(dev_priv)	IS_PLATFORM(dev_priv, INTEL_I845G)
> diff --git a/drivers/gpu/drm/i915/intel_device_info.h
> b/drivers/gpu/drm/i915/intel_device_info.h
> index 047d10bdd455..2e6f2de6c2fa 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.h
> +++ b/drivers/gpu/drm/i915/intel_device_info.h
> @@ -160,7 +160,7 @@ struct intel_device_info {
>  	intel_engine_mask_t engine_mask; /* Engines supported by the HW
> */
>  
>  	enum intel_platform platform;
> -	u32 platform_mask;
> +	u64 platform_mask;
>  
>  	enum intel_ppgtt ppgtt;
>  	unsigned int page_sizes; /* page sizes supported by the HW */
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 488 bytes
Desc: This is a digitally signed message part
URL: <https://lists.freedesktop.org/archives/intel-gfx/attachments/20190315/bf586559/attachment.sig>