diff options
| author |   jsg <jsg@openbsd.org> | 2020-06-08 04:47:57 +0000 |
|---|---|---|
| committer | jsg <jsg@openbsd.org> | 2020-06-08 04:47:57 +0000 |
| commit | c349dbc7938c71a30e13c1be4acc1976165f4630 (patch) | |
| tree | 8798187dfd7a927a15123e8dad31b782b074baa8 /sys/dev/pci/drm/amd/amdgpu/amdgpu_job.h | |
| parent | The errcheck() function treats an errno of ERANGE or EDOM as something (diff) | |
| download | wireguard-openbsd-c349dbc7938c71a30e13c1be4acc1976165f4630.tar.xz wireguard-openbsd-c349dbc7938c71a30e13c1be4acc1976165f4630.zip | |
update drm to linux 5.7
adds kernel support for
amdgpu: vega20, raven2, renoir, navi10, navi14
inteldrm: icelake, tigerlake
Thanks to the OpenBSD Foundation for sponsoring this work, kettenis@ for
helping, patrick@ for helping adapt rockchip drm and many developers for
testing.
Diffstat (limited to 'sys/dev/pci/drm/amd/amdgpu/amdgpu_job.h')
| -rw-r--r-- | sys/dev/pci/drm/amd/amdgpu/amdgpu_job.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.h b/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.h index 57cfe78a262..3f7b8433d17 100644 --- a/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.h +++ b/sys/dev/pci/drm/amd/amdgpu/amdgpu_job.h @@ -29,10 +29,14 @@ #define AMDGPU_PREAMBLE_IB_PRESENT_FIRST (1 << 1) /* bit set means context switch occured */ #define AMDGPU_HAVE_CTX_SWITCH (1 << 2) +/* bit set means IB is preempted */ +#define AMDGPU_IB_PREEMPTED (1 << 3) #define to_amdgpu_job(sched_job) \ container_of((sched_job), struct amdgpu_job, base) +#define AMDGPU_JOB_GET_VMID(job) ((job) ? (job)->vmid : 0) + struct amdgpu_fence; struct amdgpu_job { @@ -43,8 +47,8 @@ struct amdgpu_job { struct amdgpu_ib *ibs; struct dma_fence *fence; /* the hw fence */ uint32_t preamble_status; + uint32_t preemption_status; uint32_t num_ibs; - void *owner; bool vm_needs_flush; uint64_t vm_pd_addr; unsigned vmid; @@ -71,4 +75,7 @@ int amdgpu_job_submit(struct amdgpu_job *job, struct drm_sched_entity *entity, void *owner, struct dma_fence **f); int amdgpu_job_submit_direct(struct amdgpu_job *job, struct amdgpu_ring *ring, struct dma_fence **fence); + +void amdgpu_job_stop_all_jobs_on_sched(struct drm_gpu_scheduler *sched); + #endif |