Hi Dave, On Wed, 20 May 2015 15:25:38 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote: > > On Wed, 20 May 2015 05:41:46 +0100 (IST) Dave Airlie <airlied@xxxxxxxx> wrote: > > > > > After merging the drm tree, today's linux-next build (powerpc > > > ppc64_defconfig) failed like this: > > > > > > drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c: In function 'create_queue_cpsch': > > > drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c:888:2: error: implicit declaration of function 'init_sdma_vm' [-Werror=implicit-function-declaration] > > > init_sdma_vm(dqm, q, qpd); > > > ^ > > > > > > Caused by commit 3e3f6e1a90a8 ("drm/amdkfd: make the sdma vm init to be > > > asic specific"). > > > > > > I have used the drm tree from next-20150519 for today. > > > > Okay this looks like a silent conflict, I'll have to pull Linus tree into > > drm-next and fix it up there. > > Yep, against commit 79b066bd76d5 ("drm/amdkfd: Initialize sdma vm when > creating sdma queue") which is in v4.1-rc3. So you could, of course, just merge that commit instead of Linus' tree ... -- Cheers, Stephen Rothwell sfr@xxxxxxxxxxxxxxxx
Attachment:
pgppjxHn0ch0C.pgp
Description: OpenPGP digital signature