diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-07-24 07:26:53 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-07-24 07:26:53 +0300 |
| commit | 5da612fa42465c6dda745e1b9fb514a014d23b11 (patch) | |
| tree | 3bee682210dbe7127b84021d8527670aa0a0b071 /drivers/gpu/drm/amd/amdgpu/cikd.h | |
| parent | 52721d9d3334c1cb1f76219a161084094ec634dc (diff) | |
| parent | 7639a8c420f04ca9be87974416efb2848b0962d9 (diff) | |
| download | linux-5da612fa42465c6dda745e1b9fb514a014d23b11.tar.xz | |
Merge tag 'drm-amdkfd-next-2015-07-20' of git://people.freedesktop.org/~gabbayo/linux into drm-next
- Add Carrizo support for amdkfd, using the new amdgpu driver as the relevant
kgd. The support includes interfaces with amdgpu both for gfx7 (Kaveri) and
gfx8 (Carrizo). However, gfx7 interface is used for debugging purposes only,
so amdkfd defaults to using radeon when Kaveri is installed.
I would like to note that no new IOCTLs are being introduced, and there is no
change in the current IOCTLs, as they are suited both for gfx7 and gfx8.
* tag 'drm-amdkfd-next-2015-07-20' of git://people.freedesktop.org/~gabbayo/linux:
drm/amdkfd: Set correct doorbell packet type for Carrizo
drm/amdkfd: Use generic defines in new amd headers
drm/amdkfd: Implement create_map_queues() for Carrizo
drm/amdkfd: fix runlist length calculation
drm/amdkfd: Add support for VI in DQM
drm/amdkfd: add support for VI in MQD manager
drm/amdkfd: add CP HWS packet headers for VI
drm/amdkfd: add supported CZ devices PCI IDs to amdkfd
drm/amdkfd: Add dependency of DRM_AMDGPU to Kconfig
drm/amdgpu: Add amdgpu <--> amdkfd gfx8 interface
drm/amdgpu: add amdgpu <--> amdkfd gfx7 interface
drm/amdgpu: Add H/W agnostic amdgpu <--> amdkfd interface
drm/radeon: Modify kgd_engine_type enum to match CZ
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cikd.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cikd.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cikd.h b/drivers/gpu/drm/amd/amdgpu/cikd.h index d19085a97064..a3e3dfaa01a4 100644 --- a/drivers/gpu/drm/amd/amdgpu/cikd.h +++ b/drivers/gpu/drm/amd/amdgpu/cikd.h @@ -552,6 +552,12 @@ #define VCE_CMD_IB_AUTO 0x00000005 #define VCE_CMD_SEMAPHORE 0x00000006 +/* if PTR32, these are the bases for scratch and lds */ +#define PRIVATE_BASE(x) ((x) << 0) /* scratch */ +#define SHARED_BASE(x) ((x) << 16) /* LDS */ + +#define KFD_CIK_SDMA_QUEUE_OFFSET 0x200 + /* valid for both DEFAULT_MTYPE and APE1_MTYPE */ enum { MTYPE_CACHED = 0, |