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

Browse source

Fixes for 4.18.  The ACP patch is a bit bigger than I would like
at this point, but it should have gone in long ago, it just fell
through the cracks.  The others are pretty small and straight-forward.
- ACP fix for boards with 2 I2S instances
- DP fix for CZ, vega
- Fix for a hybrid graphics laptop
- Fix a resume regression

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180718162603.2747-1-alexander.deucher@amd.com

...

This commit is contained in:

Dave Airlie 2018-07-20 10:23:37 +10:00

parent bf642e3a19 2d95ceb454

commit b83ce39b92

6 changed files with 47 additions and 15 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

47

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

View file

1

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

View file

3

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

View file

8

drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c

View file

1

drivers/gpu/drm/amd/display/dc/dc.h

View file

2

drivers/gpu/drm/amd/display/dc/dcn10/dcn10_resource.c

View file