diff options
author | Christian König <christian.koenig@amd.com> | 2016-02-03 09:12:58 -0500 |
---|---|---|
committer | Alex Deucher <alexander.deucher@amd.com> | 2016-02-10 14:17:17 -0500 |
commit | 867d0517c705d9ae5a21f566ffe2308f5c070c6c (patch) | |
tree | 0f804300707d9a18a625746d307f4f0bae190ba7 /drivers/gpu/drm/amd/amdgpu | |
parent | 8a8f0b48a0162c449481ae91ba2ef51b6539f41c (diff) |
drm/amdgpu: remove AMDGPU_NUM_SYNCS
Just a leftover from semaphores.
Signed-off-by: Christian König <christian.koenig@amd.com>
Reviewed-by: Alex Deucher <alexander.deucer@amd.com>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Diffstat (limited to 'drivers/gpu/drm/amd/amdgpu')
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h index 6eb5550a6f16..935b9aa08474 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h | |||
@@ -104,9 +104,6 @@ extern int amdgpu_powerplay; | |||
104 | /* max number of IP instances */ | 104 | /* max number of IP instances */ |
105 | #define AMDGPU_MAX_SDMA_INSTANCES 2 | 105 | #define AMDGPU_MAX_SDMA_INSTANCES 2 |
106 | 106 | ||
107 | /* number of hw syncs before falling back on blocking */ | ||
108 | #define AMDGPU_NUM_SYNCS 4 | ||
109 | |||
110 | /* hardcode that limit for now */ | 107 | /* hardcode that limit for now */ |
111 | #define AMDGPU_VA_RESERVED_SIZE (8 << 20) | 108 | #define AMDGPU_VA_RESERVED_SIZE (8 << 20) |
112 | 109 | ||
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c index d7cd408f7b66..b6737707eda2 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | |||
@@ -147,7 +147,7 @@ int amdgpu_ib_schedule(struct amdgpu_device *adev, unsigned num_ibs, | |||
147 | return -EINVAL; | 147 | return -EINVAL; |
148 | } | 148 | } |
149 | 149 | ||
150 | r = amdgpu_ring_alloc(ring, (256 + AMDGPU_NUM_SYNCS * 8) * num_ibs); | 150 | r = amdgpu_ring_alloc(ring, 256 * num_ibs); |
151 | if (r) { | 151 | if (r) { |
152 | dev_err(adev->dev, "scheduling IB failed (%d).\n", r); | 152 | dev_err(adev->dev, "scheduling IB failed (%d).\n", r); |
153 | return r; | 153 | return r; |