Hi Dave,
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.
--
Cheers,
Stephen Rothwell [email protected]
> Hi Dave,
>
> 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.
Dave.
Hi Dave,
On Wed, 20 May 2015 05:41:46 +0100 (IST) Dave Airlie <[email protected]> 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.
--
Cheers,
Stephen Rothwell [email protected]
Hi Dave,
On Wed, 20 May 2015 15:25:38 +1000 Stephen Rothwell <[email protected]> wrote:
>
> On Wed, 20 May 2015 05:41:46 +0100 (IST) Dave Airlie <[email protected]> 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 [email protected]
On Wed, May 20, 2015 at 8:31 AM, Stephen Rothwell <[email protected]> wrote:
> Hi Dave,
>
> On Wed, 20 May 2015 15:25:38 +1000 Stephen Rothwell <[email protected]> wrote:
>>
>> On Wed, 20 May 2015 05:41:46 +0100 (IST) Dave Airlie <[email protected]> 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 [email protected]
Hi,
Did I need to do something different in order to prevent this conflict ?
Do some manual merge before sending the pull request ?
Thanks,
Oded
> >> > 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 [email protected]
>
> Hi,
> Did I need to do something different in order to prevent this conflict ?
> Do some manual merge before sending the pull request ?
>
Well this sort of thing is why linux-next exists, you can pull Linus's
tree into yours to see if it builds before pulling, but you can find
yourself fixing conflicts in other parts of the drm stack then.
I'll pull v4.1-rc4 tag in as a nicer merge point that misc Linus master.
Dave.