From: Dave Airlie Date: Sun, 4 Jan 2015 07:44:43 +0000 (+1000) Subject: Merge tag 'amdkfd-fixes-2014-12-30' of git://people.freedesktop.org/~gabbayo/linux... X-Git-Tag: MMI-PSA29.97-13-9~10850^2~3 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=2f6bd4da08b5054ba933be6f7b17ed02ad6c4162;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git Merge tag 'amdkfd-fixes-2014-12-30' of git://people.freedesktop.org/~gabbayo/linux into linus Highlights: - Link order changes in drm/Makefile and drivers/Makefile to fix issue when amdkfd, radeon and amd_iommu_v2 are compiled inside the kernel image. - Consider kernel configuration (using #IFDEFs) when radeon initializes amdkfd, due to a specific configuration that makes symbol_request() return a non-NULL value when a symbol doesn't exists. Rusty Russel is helping me to find the root cause, but it may take a while because of year-end so I'm sending this as a band-aid solution. * tag 'amdkfd-fixes-2014-12-30' of git://people.freedesktop.org/~gabbayo/linux: drm/radeon: Init amdkfd only if it was compiled amdkfd: actually allocate longs for the pasid bitmask drm: Put amdkfd before radeon in drm Makefile drivers: Move iommu/ before gpu/ in Makefile amdkfd: Remove duplicate include amdkfd: Fixing topology bug in building sysfs nodes amdkfd: Fix accounting of device queues --- 2f6bd4da08b5054ba933be6f7b17ed02ad6c4162