Merge branch 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux

Browse source

Pull amd drm fixes from Alex Deucher:
 "Dave is on vacation at the moment, so please pull these radeon and
  amdgpu fixes directly.

  Just a few minor things for 4.2:

   - add a new radeon pci id
   - fix a power management regression in amdgpu
   - fix HEVC command buffer validation in amdgpu"

* 'drm-fixes-4.2' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon: add new OLAND pci id
  Revert "drm/amdgpu: Configure doorbell to maximum slots"
  drm/amdgpu: add context buffer size check for HEVC

...

This commit is contained in:

Linus Torvalds 2015-08-12 11:13:54 -07:00

parent cec45d901e e037239e5e

commit 04da002d98

3 changed files with 16 additions and 4 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

17

drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c

View file

2

drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c

View file

1

include/drm/drm_pciids.h

View file