Merge tag 'drm-amdkfd-next-fixes-2015-02-03' of git://people.freedesktop.org/~gabbayo...
authorDave Airlie <airlied@redhat.com>
Thu, 5 Feb 2015 00:40:10 +0000 (10:40 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 5 Feb 2015 00:40:10 +0000 (10:40 +1000)
commit2f8997902e64951228385ca1cebb0d2f16f99a23
treede702f568b47e64b80422bf2c54736243cb41a3e
parent225963dd3eb71357b086bc091a5594d0fa2ac783
parentd752f95e55ed36648fc2bcbca348f5113920c357
Merge tag 'drm-amdkfd-next-fixes-2015-02-03' of git://people.freedesktop.org/~gabbayo/linux into drm-next

- Fixing accounting of active queues
- Preserving a register internal state

* tag 'drm-amdkfd-next-fixes-2015-02-03' of git://people.freedesktop.org/~gabbayo/linux:
  drm/amdkfd: Preserve CP_MQD_IQ_RPTR internal state
  drm/amdkfd: Fix dqm->queue_count tracking