diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-10-08 21:00:16 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-10-08 21:00:16 -0400 |
| commit | bb7a9c8d712f37385a706a594d6edf6e6d2669d0 (patch) | |
| tree | 701a317ca8ecc2bedc40577b657dcdda3e7428c5 /drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | |
| parent | 15438ab06515b093d61e2f35bb27d21e5e7f966e (diff) | |
| parent | d3f04c98ead2b89887e1e3c09b26e4917bacdd9e (diff) | |
Merge branch 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux into drm-next
More new stuff for 4.15. Highlights:
- Add clock query interface for raven
- Add new FENCE_TO_HANDLE ioctl
- UVD video encode ring support on polaris
- transparent huge page DMA support
- deadlock fixes
- compute pipe lru tweaks
- powerplay cleanups and regression fixes
- fix duplicate symbol issue with radeon and amdgpu
- misc bug fixes
* 'drm-next-4.15' of git://people.freedesktop.org/~agd5f/linux: (72 commits)
drm/radeon/dp: make radeon_dp_get_dp_link_config static
drm/radeon: move ci_send_msg_to_smc to where it's used
drm/amd/sched: fix deadlock caused by unsignaled fences of deleted jobs
drm/amd/sched: NULL out the s_fence field after run_job
drm/amd/sched: move adding finish callback to amd_sched_job_begin
drm/amd/sched: fix an outdated comment
drm/amd/sched: rename amd_sched_entity_pop_job
drm/amdgpu: minor coding style fix
drm/ttm: add transparent huge page support for DMA allocations v2
drm/ttm: add support for different pool sizes
drm/ttm: remove unsued options from ttm_mem_global_alloc_page
drm/amdgpu: add uvd enc irq
drm/amdgpu: add uvd enc ib test
drm/amdgpu: add uvd enc ring test
drm/amdgpu: add uvd enc vm functions (v2)
drm/amdgpu: add uvd enc into run queue
drm/amdgpu: add uvd enc rings
drm/amdgpu: add new uvd enc ring methods
drm/amdgpu: add uvd enc command in header
drm/amdgpu: add uvd enc registers in header
...
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h index afcfb8bcfb65..e5fd0ff6b29d 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | |||
| @@ -36,6 +36,18 @@ struct amdgpu_mm_table { | |||
| 36 | uint64_t gpu_addr; | 36 | uint64_t gpu_addr; |
| 37 | }; | 37 | }; |
| 38 | 38 | ||
| 39 | #define AMDGPU_VF_ERROR_ENTRY_SIZE 16 | ||
| 40 | |||
| 41 | /* struct error_entry - amdgpu VF error information. */ | ||
| 42 | struct amdgpu_vf_error_buffer { | ||
| 43 | struct mutex lock; | ||
| 44 | int read_count; | ||
| 45 | int write_count; | ||
| 46 | uint16_t code[AMDGPU_VF_ERROR_ENTRY_SIZE]; | ||
| 47 | uint16_t flags[AMDGPU_VF_ERROR_ENTRY_SIZE]; | ||
| 48 | uint64_t data[AMDGPU_VF_ERROR_ENTRY_SIZE]; | ||
| 49 | }; | ||
| 50 | |||
| 39 | /** | 51 | /** |
| 40 | * struct amdgpu_virt_ops - amdgpu device virt operations | 52 | * struct amdgpu_virt_ops - amdgpu device virt operations |
| 41 | */ | 53 | */ |
| @@ -59,6 +71,7 @@ struct amdgpu_virt { | |||
| 59 | struct work_struct flr_work; | 71 | struct work_struct flr_work; |
| 60 | struct amdgpu_mm_table mm_table; | 72 | struct amdgpu_mm_table mm_table; |
| 61 | const struct amdgpu_virt_ops *ops; | 73 | const struct amdgpu_virt_ops *ops; |
| 74 | struct amdgpu_vf_error_buffer vf_errors; | ||
| 62 | }; | 75 | }; |
| 63 | 76 | ||
| 64 | #define AMDGPU_CSA_SIZE (8 * 1024) | 77 | #define AMDGPU_CSA_SIZE (8 * 1024) |