> -----Original Message-----
> From: Stephen Rothwell [mailto:sfr@canb.auug.org.au]
> Sent: Tuesday, June 09, 2015 9:43 AM
> To: Dave Airlie
> Cc: linux-next@vger.kernel.org; linux-kernel@vger.kernel.org; Deucher,
> Alexander
> Subject: linux-next: build failure after merge of the drm tree
> 
> Hi Dave,
> 
> After merging the drm tree, today's linux-next build (powerpc
> allyesconfig) failed like this:
> 
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c: In function
> 'gfx_v7_0_cp_gfx_resume':
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2879:9: error: 'BUF_SWAP_32BIT'
> undeclared (first use in this function)
>   tmp |= BUF_SWAP_32BIT;
>          ^
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:2879:9: note: each undeclared
> identifier is reported only once for each function it appears in
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c: In function
> 'gfx_v7_0_cp_compute_resume':
> drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c:3398:41: error:
> 'BUF_SWAP_32BIT' undeclared (first use in this function)
>    mqd->queue_state.cp_hqd_pq_control |= BUF_SWAP_32BIT;
>                                          ^
> drivers/gpu/drm/amd/amdgpu/cik_sdma.c: In function
> 'cik_sdma_gfx_resume':
> drivers/gpu/drm/amd/amdgpu/cik_sdma.c:413:14: error:
> 'SDMA_RB_SWAP_ENABLE' undeclared (first use in this function)
>    rb_cntl |= SDMA_RB_SWAP_ENABLE |
> SDMA_RPTR_WRITEBACK_SWAP_ENABLE;
>               ^
> drivers/gpu/drm/amd/amdgpu/cik_sdma.c:413:14: note: each undeclared
> identifier is reported only once for each function it appears in
> drivers/gpu/drm/amd/amdgpu/cik_sdma.c:413:36: error:
> 'SDMA_RPTR_WRITEBACK_SWAP_ENABLE' undeclared (first use in this
> function)
>    rb_cntl |= SDMA_RB_SWAP_ENABLE |
> SDMA_RPTR_WRITEBACK_SWAP_ENABLE;
>                                     ^
> 
> Caused by commit a2e73f56fa62 ("drm/amdgpu: Add support for CIK parts").
> 

Should be fixed with this patch.  Sorry for the breakage.

Alex


> I added the following patch to disable this code for today:
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 9 Jun 2015 23:38:30 +1000
> Subject: [PATCH] drm/amdgpu: disable CIK parts for now
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/gpu/drm/amd/amdgpu/Kconfig | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/gpu/drm/amd/amdgpu/Kconfig
> b/drivers/gpu/drm/amd/amdgpu/Kconfig
> index b30fcfa4b1f2..8da6bf7f39c8 100644
> --- a/drivers/gpu/drm/amd/amdgpu/Kconfig
> +++ b/drivers/gpu/drm/amd/amdgpu/Kconfig
> @@ -1,6 +1,7 @@
>  config DRM_AMDGPU_CIK
>  	bool "Enable amdgpu support for CIK parts"
>  	depends on DRM_AMDGPU
> +	depends on BROKEN
>  	help
>  	  Choose this option if you want to enable experimental support
>  	  for CIK asics.
> --
> 2.1.4
> 
> --
> Cheers,
> Stephen Rothwell                    sfr@canb.auug.org.au