diff options
| author | Leon Romanovsky <[email protected]> | 2022-11-11 09:35:12 +0000 |
|---|---|---|
| committer | Leon Romanovsky <[email protected]> | 2022-11-11 09:35:12 +0000 |
| commit | 1ec5617432abc3efeec36c4e584a700f6c7e46f9 (patch) | |
| tree | fc5830462eb3afb740f9ed48052c1a46ff85f2c1 /drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | |
| parent | RDMA/rxe: Replace pr_xxx by rxe_dbg_xxx in rxe_mmap.c (diff) | |
| parent | net: mana: Define data structures for protection domain and memory registration (diff) | |
| download | kernel-1ec5617432abc3efeec36c4e584a700f6c7e46f9.tar.gz kernel-1ec5617432abc3efeec36c4e584a700f6c7e46f9.zip | |
Merge branch 'mana-shared-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma
Long Li says:
====================
Introduce Microsoft Azure Network Adapter (MANA) RDMA driver [netdev prep]
The first 11 patches which modify the MANA Ethernet driver to support
RDMA driver.
* 'mana-shared-6.2' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma:
net: mana: Define data structures for protection domain and memory registration
net: mana: Define data structures for allocating doorbell page from GDMA
net: mana: Define and process GDMA response code GDMA_STATUS_MORE_ENTRIES
net: mana: Define max values for SGL entries
net: mana: Move header files to a common location
net: mana: Record port number in netdev
net: mana: Export Work Queue functions for use by RDMA driver
net: mana: Set the DMA device max segment size
net: mana: Handle vport sharing between devices
net: mana: Record the physical address for doorbell page region
net: mana: Add support for auxiliary device
====================
Link: https://lore.kernel.org/all/[email protected]/
Signed-off-by: Leon Romanovsky <[email protected]>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_job.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c index 46c99331d7f1..cd968e781077 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_job.c @@ -72,7 +72,6 @@ static enum drm_gpu_sched_stat amdgpu_job_timedout(struct drm_sched_job *s_job) reset_context.method = AMD_RESET_METHOD_NONE; reset_context.reset_req_dev = adev; clear_bit(AMDGPU_NEED_FULL_RESET, &reset_context.flags); - clear_bit(AMDGPU_SKIP_MODE2_RESET, &reset_context.flags); r = amdgpu_device_gpu_recover(ring->adev, job, &reset_context); if (r) |