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

Browse source

two suspend/resume regression fixes.

* 'drm-fixes-4.14' of git://people.freedesktop.org/~agd5f/linux:
  drm/amd/amdgpu: Remove workaround check for UVD6 on APUs
  drm/amd/powerplay: fix uninitialized variable

...

This commit is contained in:

Dave Airlie 2017-10-26 05:30:39 +10:00

parent bb176f6709 d3daa2c786

commit 5a28747b4a

2 changed files with 8 additions and 14 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

16

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

View file

6

drivers/gpu/drm/amd/powerplay/hwmgr/smu7_hwmgr.c

View file