Hi all,
After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:
In file included from drivers/gpu/drm/arm/display/komeda/komeda_drv.c:13:
drivers/gpu/drm/arm/display/komeda/komeda_kms.h:87:20: error: field 'base' has incomplete type
struct drm_device base;
^~~~
drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_parse_pipe_dt':
drivers/gpu/drm/arm/display/komeda/komeda_dev.c:27:3: error: implicit declaration of function 'DRM_ERROR'; did you mean 'DRM_IOR'? [-Werror=implicit-function-declaration]
DRM_ERROR("get aclk for pipeline %d failed!\n", pipe_id);
^~~~~~~~~
DRM_IOR
drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_create':
drivers/gpu/drm/arm/display/komeda/komeda_dev.c:127:2: error: implicit declaration of function 'DRM_INFO'; did you mean 'DRM_IO'? [-Werror=implicit-function-declaration]
DRM_INFO("Found ARM Mali-D%x version r%dp%d\n",
^~~~~~~~
DRM_IO
drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_destroy':
drivers/gpu/drm/arm/display/komeda/komeda_dev.c:170:3: error: implicit declaration of function 'devm_iounmap'; did you mean 'pci_iounmap'? [-Werror=implicit-function-declaration]
devm_iounmap(dev, mdev->reg_base);
^~~~~~~~~~~~
pci_iounmap
and lots more ...
Probably caused by commit
e3b01f0d576a ("drm: remove drmP.h from drm_modeset_helper.h")
I have used the drm-misc tree from next-20190207 for today.
--
Cheers,
Stephen Rothwell
On Fri, Feb 8, 2019 at 2:38 AM Stephen Rothwell <[email protected]> wrote:
>
> Hi all,
>
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
>
> In file included from drivers/gpu/drm/arm/display/komeda/komeda_drv.c:13:
> drivers/gpu/drm/arm/display/komeda/komeda_kms.h:87:20: error: field 'base' has incomplete type
> struct drm_device base;
> ^~~~
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_parse_pipe_dt':
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c:27:3: error: implicit declaration of function 'DRM_ERROR'; did you mean 'DRM_IOR'? [-Werror=implicit-function-declaration]
> DRM_ERROR("get aclk for pipeline %d failed!\n", pipe_id);
> ^~~~~~~~~
> DRM_IOR
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_create':
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c:127:2: error: implicit declaration of function 'DRM_INFO'; did you mean 'DRM_IO'? [-Werror=implicit-function-declaration]
> DRM_INFO("Found ARM Mali-D%x version r%dp%d\n",
> ^~~~~~~~
> DRM_IO
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c: In function 'komeda_dev_destroy':
> drivers/gpu/drm/arm/display/komeda/komeda_dev.c:170:3: error: implicit declaration of function 'devm_iounmap'; did you mean 'pci_iounmap'? [-Werror=implicit-function-declaration]
> devm_iounmap(dev, mdev->reg_base);
> ^~~~~~~~~~~~
> pci_iounmap
>
> and lots more ...
>
> Probably caused by commit
>
> e3b01f0d576a ("drm: remove drmP.h from drm_modeset_helper.h")
>
> I have used the drm-misc tree from next-20190207 for today.
Yup.
Sam, can you pls take a look at what komeda needs? you need to
manually merge together drm-misc-next and drm-next first I think.
Dave, Maxime, Liviu: Heads up, drm-misc-next + drm-next will colide.
-Daniel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
Hi Daniel/Stephen
Thanks for the report and the hints how to move forward to fix it.
> Sam, can you pls take a look at what komeda needs? you need to
> manually merge together drm-misc-next and drm-next first I think.
Merged the two tree and fixed build.
Undid the merge and checked that the build was still OK.
Patch sent to dri-devel:
https://lists.freedesktop.org/archives/dri-devel/2019-February/206662.html
> Dave, Maxime, Liviu: Heads up, drm-misc-next + drm-next will colide.
There was a trivial conflict when I merged, but in i915 so I just fixed
it up and kept focus on komeda.
So in other words, yes there is a conflict.
Sam