linux-next: build failure after merge of the drm tree

From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Dave Airlie <airlied@linux.ie>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Oded Gabbay <oded.gabbay@amd.com>, Ben Goz <ben.goz@amd.com>
Subject: linux-next: build failure after merge of the drm tree
Date: Thu, 29 Jan 2015 13:38:57 +1100	[thread overview]
Message-ID: <20150129133857.2bdbb86d@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1981 bytes --]

Hi Dave,

After merging the drm tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/gpu/drm/amd/amdkfd/kfd_device.c: In function 'kgd2kfd_device_init':
drivers/gpu/drm/amd/amdkfd/kfd_device.c:193:11: error: 'max_num_of_processes' undeclared (first use in this function)
  size += (max_num_of_processes * sizeof(struct pm4_map_process) +
           ^
drivers/gpu/drm/amd/amdkfd/kfd_device.c:193:11: note: each undeclared identifier is reported only once for each function it appears in
drivers/gpu/drm/amd/amdkfd/kfd_device.c:194:26: error: 'max_num_of_queues_per_process' undeclared (first use in this function)
   max_num_of_processes * max_num_of_queues_per_process *
                          ^

Caused by commit b8cbab042cd6 ("drm/amdkfd: Allow user to limit only
queues per device") from Linus' tree interacting with commit
e18e794e6ba0 ("drm/amdkfd: Fixed calculation of gart buffer size") from
the drm tree.

I couldn't easily figure out how to fix this, so I just disabled the
driver using the patch below.  Please let me know when it is fixed, or
provide me with a merge fix patch.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 29 Jan 2015 13:34:22 +1100
Subject: [PATCH] drm/amdkfd: disable driver due to interaction with a bug fix

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/gpu/drm/amd/amdkfd/Kconfig | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/gpu/drm/amd/amdkfd/Kconfig b/drivers/gpu/drm/amd/amdkfd/Kconfig
index 8dfac37ff327..e96b4d6e3567 100644
--- a/drivers/gpu/drm/amd/amdkfd/Kconfig
+++ b/drivers/gpu/drm/amd/amdkfd/Kconfig
@@ -5,5 +5,6 @@
 config HSA_AMD
 	tristate "HSA kernel driver for AMD GPU devices"
 	depends on DRM_RADEON && AMD_IOMMU_V2 && X86_64
+	depends on BROKEN
 	help
 	  Enable this if you want to use HSA features on AMD GPU devices.
-- 
2.1.4

-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
