From: Dave Airlie Date: Fri, 14 Aug 2015 00:15:24 +0000 (+1000) Subject: Merge tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/~gabbayo... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8f9cb50789e76f3e224e8861adf650e55c747af4;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/~gabbayo/linux into drm-next Two small bug fixes for the code you pulled for 4.3: - Used a SHIFT define instead of a MASK define to check if a bit is turned on when destroying hqd. Luckily, this is in gfx7 interface file with amdgpu, which was used only for bring-up purposes of amdgpu, so no real effect on a running system - Used a logical AND instead of a bitwise AND operator, when initializing sdma virtual memory when using SDMA queues * tag 'drm-amdkfd-next-fixes-2015-08-05' of git://people.freedesktop.org/~gabbayo/linux: drm/amdkfd: fix bug when initializing sdma vm drm/amdgpu: fix bug when amdkfd destroys hqd --- 8f9cb50789e76f3e224e8861adf650e55c747af4