drm/amdgpu: disable user fence interrupt (v2)

amdgpu submits both kernel and user fences, but just need one interrupt,
disable user fence interrupt and don't effect user fence.

v2: fix merge error

Signed-off-by: Chunming Zhou <david1.zhou@amd.com>
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
index c33c1af..37aeed7 100644 (file)
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
@@ -317,7 +317,7 @@ struct amdgpu_ring_funcs {
        void (*emit_ib)(struct amdgpu_ring *ring,
                        struct amdgpu_ib *ib);
        void (*emit_fence)(struct amdgpu_ring *ring, uint64_t addr,
-                          uint64_t seq, bool write64bit);
+                          uint64_t seq, unsigned flags);
        bool (*emit_semaphore)(struct amdgpu_ring *ring,
                               struct amdgpu_semaphore *semaphore,
                               bool emit_wait);
@@ -392,6 +392,9 @@ struct amdgpu_fence_driver {
 #define AMDGPU_FENCE_OWNER_VM          ((void*)1ul)
 #define AMDGPU_FENCE_OWNER_MOVE                ((void*)2ul)
 
+#define AMDGPU_FENCE_FLAG_64BIT         (1 << 0)
+#define AMDGPU_FENCE_FLAG_INT           (1 << 1)
+
 struct amdgpu_fence {
        struct fence base;
 
@@ -2142,7 +2145,7 @@ static inline void amdgpu_ring_write(struct amdgpu_ring *ring, uint32_t v)
 #define amdgpu_ring_set_wptr(r) (r)->funcs->set_wptr((r))
 #define amdgpu_ring_emit_ib(r, ib) (r)->funcs->emit_ib((r), (ib))
 #define amdgpu_ring_emit_vm_flush(r, vmid, addr) (r)->funcs->emit_vm_flush((r), (vmid), (addr))
-#define amdgpu_ring_emit_fence(r, addr, seq, write64bit) (r)->funcs->emit_fence((r), (addr), (seq), (write64bit))
+#define amdgpu_ring_emit_fence(r, addr, seq, flags) (r)->funcs->emit_fence((r), (addr), (seq), (flags))
 #define amdgpu_ring_emit_semaphore(r, semaphore, emit_wait) (r)->funcs->emit_semaphore((r), (semaphore), (emit_wait))
 #define amdgpu_ring_emit_gds_switch(r, v, db, ds, wb, ws, ab, as) (r)->funcs->emit_gds_switch((r), (v), (db), (ds), (wb), (ws), (ab), (as))
 #define amdgpu_ring_emit_hdp_flush(r) (r)->funcs->emit_hdp_flush((r))

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/amdgpu_vce.h
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/cik_sdma.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c
Simple merge

diff --cc drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c
Simple merge