diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-09-03 23:06:29 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-09-03 23:06:29 -0400 |
| commit | 99495589aa4de7166af254bc497cdbe133fc24bb (patch) | |
| tree | d525e957854064f2492976e9beb8a04dddc28143 /drivers/gpu/drm/amd/amdgpu/cikd.h | |
| parent | 879a37d00f1882b1e56a66e626af4194d592d257 (diff) | |
| parent | bddf8026386927985ef6d0d11c3ba78f70b76bad (diff) | |
Merge branch 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux into drm-next
More fixes for radeon and amdgpu for 4.3:
- Send full DP aux address fixes for radeon and amdgpu
- Fix an HDMI display regression for pre-DCE5 parts
- UVD suspend fixes for amdgpu
- Add an rs480 suspend quirk
- Fix bo reserve handling in amdgpu GEM_OP ioctl
- GPU scheduler fixes
- SDMA optimizations
- MEC fix for Fiji
* 'drm-next-4.3' of git://people.freedesktop.org/~agd5f/linux: (21 commits)
drm/amdgpu: set MEC doorbell range for Fiji
drm/amdgpu: implement burst NOP for SDMA
drm/amdgpu: add insert_nop ring func and default implementation
drm/amdgpu: add amdgpu_get_sdma_instance helper function
drm/amdgpu: add AMDGPU_MAX_SDMA_INSTANCES
drm/amdgpu: add burst_nop flag for sdma
drm/amdgpu: add count field for the SDMA NOP packet v2
drm/amdgpu: use PT for VM sync on unmap
drm/amdgpu: make wait_event uninterruptible in push_job
drm/amdgpu: fix amdgpu_bo_unreserve order in GEM_OP IOCTL v2
drm/amdgpu: partially revert "modify amdgpu_fence_wait_any() to amdgpu_fence_wait_multiple()" v2
Add radeon suspend/resume quirk for HP Compaq dc5750.
drm/amdgpu: re-work sync_resv
drm/amdgpu/atom: Send out the full AUX address
drm/radeon/native: Send out the full AUX address
drm/radeon/atom: Send out the full AUX address
drm/amdgpu: use IB for fill_buffer instead of direct command
drm/amdgpu: stop trying to suspend UVD sessions v2
drm/amdgpu: add scheduler dependency callback v2
drm/amdgpu: let the scheduler work more with jobs v2
...
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/cikd.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/cikd.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/cikd.h b/drivers/gpu/drm/amd/amdgpu/cikd.h index a3e3dfaa01a4..7f6d457f250a 100644 --- a/drivers/gpu/drm/amd/amdgpu/cikd.h +++ b/drivers/gpu/drm/amd/amdgpu/cikd.h | |||
| @@ -487,6 +487,7 @@ | |||
| 487 | (((op) & 0xFF) << 0)) | 487 | (((op) & 0xFF) << 0)) |
| 488 | /* sDMA opcodes */ | 488 | /* sDMA opcodes */ |
| 489 | #define SDMA_OPCODE_NOP 0 | 489 | #define SDMA_OPCODE_NOP 0 |
| 490 | # define SDMA_NOP_COUNT(x) (((x) & 0x3FFF) << 16) | ||
| 490 | #define SDMA_OPCODE_COPY 1 | 491 | #define SDMA_OPCODE_COPY 1 |
| 491 | # define SDMA_COPY_SUB_OPCODE_LINEAR 0 | 492 | # define SDMA_COPY_SUB_OPCODE_LINEAR 0 |
| 492 | # define SDMA_COPY_SUB_OPCODE_TILED 1 | 493 | # define SDMA_COPY_SUB_OPCODE_TILED 1 |