[Intel-gfx] [PATCH 03/10] drm/i915: Use local variable for subslice_mask on HSW

[Chris Wilson]

Quoting Stuart Summers (2019-08-02 21:51:27)
> Instead of assuming a single slice on HSW when defining
> subslices for the platform, use a local variable to set
> the maximum subslices per slice.
> 
> Signed-off-by: Stuart Summers <stuart.summers at intel.com>
> ---
>  drivers/gpu/drm/i915/intel_device_info.c | 11 ++++++-----
>  1 file changed, 6 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_device_info.c b/drivers/gpu/drm/i915/intel_device_info.c
> index 9a79d9d547c5..2b81cc731fa2 100644
> --- a/drivers/gpu/drm/i915/intel_device_info.c
> +++ b/drivers/gpu/drm/i915/intel_device_info.c
> @@ -541,6 +541,7 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)
>  {
>         struct sseu_dev_info *sseu = &RUNTIME_INFO(dev_priv)->sseu;
>         u32 fuse1;
> +       u8 subslice_mask;
>         int s, ss;
>  
>         /*
> @@ -553,16 +554,16 @@ static void haswell_sseu_info_init(struct drm_i915_private *dev_priv)
>                 /* fall through */
>         case 1:
>                 sseu->slice_mask = BIT(0);
> -               sseu->subslice_mask[0] = BIT(0);
> +               subslice_mask = BIT(0);
>                 break;
>         case 2:
>                 sseu->slice_mask = BIT(0);
> -               sseu->subslice_mask[0] = BIT(0) | BIT(1);
> +               subslice_mask = BIT(0) | BIT(1);
>                 break;
>         case 3:
>                 sseu->slice_mask = BIT(0) | BIT(1);
> -               sseu->subslice_mask[0] = BIT(0) | BIT(1);
> -               sseu->subslice_mask[1] = BIT(0) | BIT(1);
> +               subslice_mask = BIT(0) | BIT(1);
> +               subslice_mask = BIT(0) | BIT(1);

This is definitely not a single slice.
-Chris