diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-18 17:47:07 +0200 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2022-02-18 17:47:07 +0200 |
| commit | 7ec6a8dab8b257943b7711e8e87b8a8830b4f59e (patch) | |
| tree | 4c3c3a180f656fe32786a39ca7ac256141c2c874 /drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | |
| parent | e1ab74623721da21eee91cb22b5824aa7d0c0d5b (diff) | |
| parent | a874aba8bbc529517ed154d88b08e3c437564c88 (diff) | |
Merge remote-tracking branch 'drm_misc_push/drm-misc-next' into drm-tip
# Conflicts:
# drivers/gpu/drm/amd/amdgpu/amdgpu.h
# drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c
# drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h
# drivers/gpu/drm/drm_gem.c
# include/drm/ttm/ttm_resource.h
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c')
| -rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c index ab2351ba9574..35bcb6dc1816 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c @@ -191,8 +191,9 @@ int amdgpu_ring_init(struct amdgpu_device *adev, struct amdgpu_ring *ring, ring->adev = adev; ring->idx = adev->num_rings++; adev->rings[ring->idx] = ring; - r = amdgpu_fence_driver_init_ring(ring, sched_hw_submission, - sched_score); + ring->num_hw_submission = sched_hw_submission; + ring->sched_score = sched_score; + r = amdgpu_fence_driver_init_ring(ring); if (r) return r; } |