From: Dave Airlie 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: v4.0-rc1~74^2~7 X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=2f8997902e64951228385ca1cebb0d2f16f99a23;p=linux.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