diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-01-27 09:48:33 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-01-27 09:48:33 +1000 |
| commit | db9098ba1b51995c0518a621f58efd41bfeb4bfc (patch) | |
| tree | dd37528ea35d1fdda061bb9f00724ac8d5fab2fa /drivers/ide/ide-dma.c | |
| parent | 22cbbceff65cb03ee37495b52f360809fa439293 (diff) | |
| parent | 9fa843e76d9092e5348aac7252cbb71f09902507 (diff) | |
| download | blackbird-op-linux-db9098ba1b51995c0518a621f58efd41bfeb4bfc.tar.gz blackbird-op-linux-db9098ba1b51995c0518a621f58efd41bfeb4bfc.zip | |
Merge tag 'drm-amdkfd-fixes-2015-01-26' of git://people.freedesktop.org/~gabbayo/linux into drm-fixes
A couple of fixes for -rc7 in amdkfd:
- Forgot to free resources when creation of queue has failed
- Initialization of pipelines was incorrect (3 patches)
In addition, The patch "drm/amdkfd: Allow user to limit only queues per device"
is not a fix, but I would like to push it for 3.19 as it changes the ABI
between amdkfd and userspace (by changing the module parameters). I would
prefer *not* to support the two deprecated module parameters if I don't have
too, as amdkfd hasn't been released yet.
* tag 'drm-amdkfd-fixes-2015-01-26' of git://people.freedesktop.org/~gabbayo/linux:
drm/amdkfd: Fix bug in call to init_pipelines()
drm/amdkfd: Fix bug in pipelines initialization
drm/radeon: Don't increment pipe_id in kgd_init_pipeline
drm/amdkfd: Allow user to limit only queues per device
drm/amdkfd: PQM handle queue creation fault
Diffstat (limited to 'drivers/ide/ide-dma.c')
0 files changed, 0 insertions, 0 deletions
