diff options
| author | Dave Airlie <airlied@redhat.com> | 2019-09-26 11:57:53 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2019-09-26 11:59:40 +1000 |
| commit | 3e2cb6d89325dc36a03937a2b82fc7eb902c96b0 (patch) | |
| tree | 2858027da8bf9ff9cd58fb0205327297a38068ef /drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |
| parent | da3fce4af75d4ddeec078b651b1dac80eb2b5e73 (diff) | |
| parent | 104c307147ad379617472dd91a5bcb368d72bd6d (diff) | |
| download | linux-3e2cb6d89325dc36a03937a2b82fc7eb902c96b0.tar.gz linux-3e2cb6d89325dc36a03937a2b82fc7eb902c96b0.tar.bz2 linux-3e2cb6d89325dc36a03937a2b82fc7eb902c96b0.zip | |
Merge tag 'drm-fixes-5.4-2019-09-25' of git://people.freedesktop.org/~agd5f/linux into drm-next
drm-fixes-5.4-2019-09-25:
amdgpu:
- Fix a 64 bit divide
- Prevent a memory leak in a failure case in dc
- Load proper gfx firmware on navi14 variants
drm-fixes-5.4-2019-09-19:
amdgpu:
- Add more navi12 and navi14 PCI ids
- Misc fixes for renoir
- Fix bandwidth issues with multiple displays on vega20
- Support for Dali
- Fix a possible oops with KFD on hawaii
- Fix for backlight level after resume on some APUs
- Other misc fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190925213500.3490-1-alexander.deucher@amd.com
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index 7850084a05e3..60655834d649 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c @@ -143,7 +143,8 @@ int amdgpu_ib_schedule(struct amdgpu_ring *ring, unsigned num_ibs, /* ring tests don't use a job */ if (job) { vm = job->vm; - fence_ctx = job->base.s_fence->scheduled.context; + fence_ctx = job->base.s_fence ? + job->base.s_fence->scheduled.context : 0; } else { vm = NULL; fence_ctx = 0; |