From: Dave Airlie <airlied@redhat.com>
Date: Thu, 5 Feb 2015 00:40:10 +0000 (+1000)
Subject: Merge tag 'drm-amdkfd-next-fixes-2015-02-03' of git://people.freedesktop.org/~gabbayo... 
X-Git-Tag: firefly_0821_release~176^2~2312^2~7
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2f8997902e64951228385ca1cebb0d2f16f99a23;p=firefly-linux-kernel-4.4.55.git

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
---

2f8997902e64951228385ca1cebb0d2f16f99a23