[Mesa-stable] [PATCH 1/2] radv: Set the user SGPR MSB for Vega.

[Bas Nieuwenhuizen]

On Wed, Sep 19, 2018 at 1:46 AM Dylan Baker <dylan at pnwbakers.com> wrote:
>
> Quoting Bas Nieuwenhuizen (2018-09-16 03:30:55)
> > Otherwise using 32 user SGPRs would be broken.
> >
> > CC: <mesa-stable at lists.freedesktop.org>
> > ---
> >  src/amd/vulkan/radv_shader.c | 1 +
> >  1 file changed, 1 insertion(+)
> >
> > diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c
> > index e05961339ca..51e0b7d65fc 100644
> > --- a/src/amd/vulkan/radv_shader.c
> > +++ b/src/amd/vulkan/radv_shader.c
> > @@ -408,6 +408,7 @@ radv_fill_shader_variant(struct radv_device *device,
> >
> >         variant->code_size = radv_get_shader_binary_size(binary);
> >         variant->rsrc2 = S_00B12C_USER_SGPR(variant->info.num_user_sgprs) |
> > +                        S_00B12C_USER_SGPR_MSB(variant->info.num_user_sgprs >> 5) |
> >                          S_00B12C_SCRATCH_EN(scratch_enabled);
> >
> >         variant->rsrc1 = S_00B848_VGPRS((variant->config.num_vgprs - 1) / 4) |
> > --
> > 2.19.0
> >
>
> Hi Bas,
>
> both of these had minor merge conflicts going into the staging/18.1 branch.
> Would you mind double checking and making sure that everything looks good for
> me?
It does, thanks!

>
> Thanks,
> Dylan