[pull v2] amdgpu pre-reqs for stoney ACP audio support

Alex Deucher alexdeucher at gmail.com
Wed Oct 18 15:53:46 UTC 2017


Hi Dave, Mark,

This branch against Linus' 4.14-rc4 contains the 3 pre-requisite patches
for Stoney ACP audio.  Mark needs these patches to apply the rest of the
Stoney ACP patch set on the audio side.  I'll resend the stony audio patches
shortly, but there are no differences from the last version I send out.  Note
that depending on when these changes end up in drm-next, there may be a conflict
due to f674bd28146045 (drm/amdgpu Moving amdgpu asic types to a separate file).
If you end up with a conflict, please take the changes in f674bd28146045,
otherwise, you'll end up with the enum defined twice.

Please pull.

Thanks!

The following changes since commit 8a5776a5f49812d29fe4b2d0a2d71675c3facf3f:

  Linux 4.14-rc4 (2017-10-08 20:53:29 -0700)

are available in the git repository at:

  git://people.freedesktop.org/~agd5f/linux linus-4.14-rc4-acp-prereq

for you to fetch changes up to f674bd281460451e8784f3bc917a650e8937a8ed:

  drm/amdgpu Moving amdgpu asic types to a separate file (2017-10-18 10:56:27 -0400)

----------------------------------------------------------------
Akshu Agrawal (1):
      drm/amdgpu Moving amdgpu asic types to a separate file

Vijendar Mukunda (2):
      drm/amd/amdgpu: Added asic_type as ACP DMA driver platform data
      ASoC: AMD: Added asic_type as ACP DMA driver platform data

 drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c  |  2 ++
 drivers/gpu/drm/amd/include/amd_shared.h | 29 ++----------------
 include/drm/amd_asic_type.h              | 52 ++++++++++++++++++++++++++++++++
 sound/soc/amd/acp-pcm-dma.c              |  8 ++---
 sound/soc/amd/acp.h                      |  7 +++++
 5 files changed, 65 insertions(+), 33 deletions(-)
 create mode 100644 include/drm/amd_asic_type.h


More information about the amd-gfx mailing list