diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-03-20 07:32:01 (GMT) |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-03-20 07:32:01 (GMT) |
| commit | f42e2c2429c0a76d99565e20d70d4fbf21c97498 (patch) | |
| tree | e4ca1261c5cc870b8dc229e0e36fcc3e86b7b344 /drivers/gpu/drm/radeon | |
| parent | 4a87b990801a74874ace5b84e5f7563de202c013 (diff) | |
| parent | e405ca3a1bf166f741506c07c2a277b5d48af8f7 (diff) | |
| download | linux-f42e2c2429c0a76d99565e20d70d4fbf21c97498.tar.xz | |
Merge tag 'drm-amdkfd-fixes-2015-03-19' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes
- Fixing SDMA initialization when in non-HWS mode (debug mode)
- Memory leak fix when destroying kernel queue
- Fix number of available compute pipelines according to new firmware
* tag 'drm-amdkfd-fixes-2015-03-19' of git://people.freedesktop.org/~gabbayo/linux:
drm/radeon: Changing number of compute pipe lines
drm/amdkfd: Fix SDMA queue init. in non-HWS mode
drm/amdkfd: destroy mqd when destroying kernel queue
Diffstat (limited to 'drivers/gpu/drm/radeon')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_kfd.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_kfd.c b/drivers/gpu/drm/radeon/radeon_kfd.c index 061eaa9..122eb56 100644 --- a/drivers/gpu/drm/radeon/radeon_kfd.c +++ b/drivers/gpu/drm/radeon/radeon_kfd.c @@ -153,7 +153,7 @@ void radeon_kfd_device_init(struct radeon_device *rdev) .compute_vmid_bitmap = 0xFF00, .first_compute_pipe = 1, - .compute_pipe_count = 8 - 1, + .compute_pipe_count = 4 - 1, }; radeon_doorbell_get_kfd_info(rdev, |