From: Dave Airlie <airlied@redhat.com>
Date: Mon, 13 Nov 2017 19:53:39 +0000 (+1000)
Subject: Merge branch 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux... 
X-Git-Tag: v4.15-rc1~19^2~11
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=fc150d6bba8f446f77732cf27b09a7e646c25771;p=linux-block.git

Merge branch 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux into drm-next

This is a shared tree between drm and audio for some amd bits.

* 'linus-4.14-rc4-acp-prereq' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu Moving amdgpu asic types to a separate file
  ASoC: AMD: Added asic_type as ACP DMA driver platform data
  drm/amd/amdgpu: Added asic_type as ACP DMA driver platform data
---

fc150d6bba8f446f77732cf27b09a7e646c25771
diff --cc drivers/gpu/drm/amd/include/amd_shared.h
index de6fc2731b98,3a49fbd8baf8..b72f8a43d86b
--- a/drivers/gpu/drm/amd/include/amd_shared.h
+++ b/drivers/gpu/drm/amd/include/amd_shared.h
@@@ -23,36 -23,9 +23,11 @@@
  #ifndef __AMD_SHARED_H__
  #define __AMD_SHARED_H__
  
- #define AMD_MAX_USEC_TIMEOUT		200000  /* 200 ms */
+ #include <drm/amd_asic_type.h>
  
 +struct seq_file;
 +
- /*
-  * Supported ASIC types
-  */
- enum amd_asic_type {
- 	CHIP_TAHITI = 0,
- 	CHIP_PITCAIRN,
- 	CHIP_VERDE,
- 	CHIP_OLAND,
- 	CHIP_HAINAN,
- 	CHIP_BONAIRE,
- 	CHIP_KAVERI,
- 	CHIP_KABINI,
- 	CHIP_HAWAII,
- 	CHIP_MULLINS,
- 	CHIP_TOPAZ,
- 	CHIP_TONGA,
- 	CHIP_FIJI,
- 	CHIP_CARRIZO,
- 	CHIP_STONEY,
- 	CHIP_POLARIS10,
- 	CHIP_POLARIS11,
- 	CHIP_POLARIS12,
- 	CHIP_VEGA10,
- 	CHIP_RAVEN,
- 	CHIP_LAST,
- };
+ #define AMD_MAX_USEC_TIMEOUT		200000  /* 200 ms */
  
  /*
   * Chip flags