Re: [PATCH AUTOSEL 5.6 33/50] drm/amdgpu: bump version for invalidate L2 before SDMA IBs

[Sasha Levin]

On Thu, May 07, 2020 at 06:11:17PM +0200, Michel DÃnzer wrote:
> On 2020-05-07 4:27 p.m., Sasha Levin wrote:
> > From: Marek OlÅÃk <marek.olsak@xxxxxxx>
> >
> > [ Upstream commit 9017a4897a20658f010bebea825262963c10afa6 ]
> >
> > This fixes GPU hangs due to cache coherency issues.
> > Bump the driver version. Split out from the original patch.
> >
> > Signed-off-by: Marek OlÅÃk <marek.olsak@xxxxxxx>
> > Reviewed-by: Christian KÃnig <christian.koenig@xxxxxxx>
> > Tested-by: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@xxxxxxx>
> > Signed-off-by: Alex Deucher <alexander.deucher@xxxxxxx>
> > Signed-off-by: Sasha Levin <sashal@xxxxxxxxxx>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 3 ++-
> >  1 file changed, 2 insertions(+), 1 deletion(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > index 42f4febe24c6d..8d45a2b662aeb 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > @@ -85,9 +85,10 @@
> >   * - 3.34.0 - Non-DC can flip correctly between buffers with different pitches
> >   * - 3.35.0 - Add drm_amdgpu_info_device::tcc_disabled_mask
> >   * - 3.36.0 - Allow reading more status registers on si/cik
> > + * - 3.37.0 - L2 is invalidated before SDMA IBs, needed for correctness
> >   */
> >  #define KMS_DRIVER_MAJOR	3
> > -#define KMS_DRIVER_MINOR	36
> > +#define KMS_DRIVER_MINOR	37
> >  #define KMS_DRIVER_PATCHLEVEL	0
> >
> >  int amdgpu_vram_limit = 0;
>
> This requires the parent commit fdf83646c0542ecfb9adc4db8f741a1f43dca058
> "drm/amdgpu: invalidate L2 before SDMA IBs (v2)". KMS_DRIVER_MINOR is
> bumped to signal to userspace the fix in that commit is present.

I've grabbed the commit you've pointed out as well as ce73516d42c9
("drm/amdgpu: simplify padding calculations (v2)") to make the backport
apply cleanly, thank you!

--
Thanks,
Sasha