[pull] amdgpu drm-fixes-5.2

[Daniel Vetter]

On Fri, Jun 14, 2019 at 5:49 PM Daniel Vetter <daniel at ffwll.ch> wrote:
>
> On Wed, Jun 12, 2019 at 09:18:56PM -0500, Alex Deucher wrote:
> > Hi Dave, Daniel,
> >
> > Fixes for 5.2:
> > - Extend previous vce fix for resume to uvd and vcn
> > - Fix bounds checking in ras debugfs interface
> > - Fix a regression on SI using amdgpu
> >
> > The following changes since commit 671e2ee5ee2127179ca884b439ab6001a623edd6:
> >
> >   Merge branch 'linux-5.2' of git://github.com/skeggsb/linux into drm-fixes (2019-06-07 17:16:00 +1000)
>
> Somehow missed this one, but just found it before I wanted to push out the
> -fixes pull to Linus ...
>
> > are available in the Git repository at:
> >
> >   git://people.freedesktop.org/~agd5f/linux drm-fixes-5.2
>
> Pulled, thanks.

Was a bit a lie, the script was still running, and complained that I
didn't add a proper merge commit message. Can you pls use annotated
tags, then the tooling we use makes this happen automatically? dim
pull-request for cheatsheet, if you need one.

Cheers, Daniel

> -Daniel
>
> >
> > for you to fetch changes up to f3a5231c8f14acd42845e9e60f506b4e948f0e68:
> >
> >   drm/amdgpu: return 0 by default in amdgpu_pm_load_smu_firmware (2019-06-12 20:39:49 -0500)
> >
> > ----------------------------------------------------------------
> > Alex Deucher (1):
> >       drm/amdgpu: return 0 by default in amdgpu_pm_load_smu_firmware
> >
> > Dan Carpenter (1):
> >       drm/amdgpu: Fix bounds checking in amdgpu_ras_is_supported()
> >
> > Shirish S (1):
> >       drm/amdgpu/{uvd,vcn}: fetch ring's read_ptr after alloc
> >
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_pm.c  | 4 ++--
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 ++
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 +++-
> >  drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c   | 5 ++++-
> >  drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c   | 5 ++++-
> >  5 files changed, 15 insertions(+), 5 deletions(-)
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> http://blog.ffwll.ch



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch