linux-next: build failure after merge of the pinctrl-intel tree

linux-next: build failure after merge of the pinctrl-intel tree

[Thierry Reding]

Hi all,

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

  drivers/gpu/drm/bridge/microchip-lvds.c:132:44: error: 'struct drm_atomic_state' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
    132 |                                     struct drm_atomic_state *state)
        |                                            ^~~~~~~~~~~~~~~~
  drivers/gpu/drm/bridge/microchip-lvds.c: In function 'mchp_lvds_atomic_enable':
  drivers/gpu/drm/bridge/microchip-lvds.c:153:62: error: passing argument 1 of 'drm_atomic_get_new_connector_for_encoder' from incompatible pointer type [-Wincompatible-pointer-types]
    153 |         connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder);
        |                                                              ^~~~~
        |                                                              |
        |                                                              struct drm_atomic_state *
  In file included from include/drm/drm_bridge.h:31,
                   from drivers/gpu/drm/bridge/microchip-lvds.c:25:
  include/drm/drm_atomic.h:758:74: note: expected 'const struct drm_atomic_commit *' but argument is of type 'struct drm_atomic_state *'
    758 | drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_commit *state,
        |                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
  drivers/gpu/drm/bridge/microchip-lvds.c: At top level:
  drivers/gpu/drm/bridge/microchip-lvds.c:161:45: error: 'struct drm_atomic_state' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
    161 |                                      struct drm_atomic_state *state)
        |                                             ^~~~~~~~~~~~~~~~
  drivers/gpu/drm/bridge/microchip-lvds.c:171:26: error: initialization of 'void (*)(struct drm_bridge *, struct drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct drm_bridge *, struct drm_atomic_state *)' [-Wincompatible-pointer-types]
    171 |         .atomic_enable = mchp_lvds_atomic_enable,
        |                          ^~~~~~~~~~~~~~~~~~~~~~~
  drivers/gpu/drm/bridge/microchip-lvds.c:171:26: note: (near initialization for 'mchp_lvds_bridge_funcs.atomic_enable')
  drivers/gpu/drm/bridge/microchip-lvds.c:172:27: error: initialization of 'void (*)(struct drm_bridge *, struct drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct drm_bridge *, struct drm_atomic_state *)' [-Wincompatible-pointer-types]
    172 |         .atomic_disable = mchp_lvds_atomic_disable,
        |                           ^~~~~~~~~~~~~~~~~~~~~~~~
  drivers/gpu/drm/bridge/microchip-lvds.c:172:27: note: (near initialization for 'mchp_lvds_bridge_funcs.atomic_disable')

Caused by commit

  c4cbe5d9e87d ("drm/bridge: microchip-lvds: migrate to atomic bridge ops")

from the drm-misc tree interacting badly with commit

  5164f7e7ff8e ("drm: Rename struct drm_atomic_state to drm_atomic_commit")

from the drm tree.

I fixed it up (see below) and can carry the fix for now, but please get
this fixed in the drm-misc tree.

Thanks,
Thierry

diff --git a/drivers/gpu/drm/bridge/microchip-lvds.c b/drivers/gpu/drm/bridge/microchip-lvds.c
index 12fc442f9867..5fb8633f43c5 100644
--- a/drivers/gpu/drm/bridge/microchip-lvds.c
+++ b/drivers/gpu/drm/bridge/microchip-lvds.c
@@ -129,7 +129,7 @@ static int mchp_lvds_attach(struct drm_bridge *bridge,
 }
 
 static void mchp_lvds_atomic_enable(struct drm_bridge *bridge,
-				    struct drm_atomic_state *state)
+				    struct drm_atomic_commit *state)
 {
 	struct mchp_lvds *lvds = bridge_to_lvds(bridge);
 	struct drm_connector *connector;
@@ -158,7 +158,7 @@ static void mchp_lvds_atomic_enable(struct drm_bridge *bridge,
 }
 
 static void mchp_lvds_atomic_disable(struct drm_bridge *bridge,
-				     struct drm_atomic_state *state)
+				     struct drm_atomic_commit *state)
 {
 	struct mchp_lvds *lvds = bridge_to_lvds(bridge);
 
-- 
2.52.0

Re: linux-next: build failure after merge of the pinctrl-intel tree

[Thierry Reding]

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

On Thu, May 07, 2026 at 12:47:48PM +0200, Thierry Reding wrote:
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:

Sorry about the misleading subject. This was indeed introduced after
merging the drm-misc tree, not pinctrl-intel. I need to look closer at
the templates that are generated.

Thierry

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

Re: linux-next: build failure after merge of the pinctrl-intel tree

[Manikandan.M]

Hi Thierry,


Apologize for the build-failure introduced
Thank you for the report - I will fix-up the driver in the drm-misc tree.

On 07/05/26 4:17 pm, Thierry Reding wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
> 
> Hi all,
> 
> After merging the drm-misc tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
>    drivers/gpu/drm/bridge/microchip-lvds.c:132:44: error: 'struct drm_atomic_state' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>      132 |                                     struct drm_atomic_state *state)
>          |                                            ^~~~~~~~~~~~~~~~
>    drivers/gpu/drm/bridge/microchip-lvds.c: In function 'mchp_lvds_atomic_enable':
>    drivers/gpu/drm/bridge/microchip-lvds.c:153:62: error: passing argument 1 of 'drm_atomic_get_new_connector_for_encoder' from incompatible pointer type [-Wincompatible-pointer-types]
>      153 |         connector = drm_atomic_get_new_connector_for_encoder(state, bridge->encoder);
>          |                                                              ^~~~~
>          |                                                              |
>          |                                                              struct drm_atomic_state *
>    In file included from include/drm/drm_bridge.h:31,
>                     from drivers/gpu/drm/bridge/microchip-lvds.c:25:
>    include/drm/drm_atomic.h:758:74: note: expected 'const struct drm_atomic_commit *' but argument is of type 'struct drm_atomic_state *'
>      758 | drm_atomic_get_new_connector_for_encoder(const struct drm_atomic_commit *state,
>          |                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
>    drivers/gpu/drm/bridge/microchip-lvds.c: At top level:
>    drivers/gpu/drm/bridge/microchip-lvds.c:161:45: error: 'struct drm_atomic_state' declared inside parameter list will not be visible outside of this definition or declaration [-Werror]
>      161 |                                      struct drm_atomic_state *state)
>          |                                             ^~~~~~~~~~~~~~~~
>    drivers/gpu/drm/bridge/microchip-lvds.c:171:26: error: initialization of 'void (*)(struct drm_bridge *, struct drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct drm_bridge *, struct drm_atomic_state *)' [-Wincompatible-pointer-types]
>      171 |         .atomic_enable = mchp_lvds_atomic_enable,
>          |                          ^~~~~~~~~~~~~~~~~~~~~~~
>    drivers/gpu/drm/bridge/microchip-lvds.c:171:26: note: (near initialization for 'mchp_lvds_bridge_funcs.atomic_enable')
>    drivers/gpu/drm/bridge/microchip-lvds.c:172:27: error: initialization of 'void (*)(struct drm_bridge *, struct drm_atomic_commit *)' from incompatible pointer type 'void (*)(struct drm_bridge *, struct drm_atomic_state *)' [-Wincompatible-pointer-types]
>      172 |         .atomic_disable = mchp_lvds_atomic_disable,
>          |                           ^~~~~~~~~~~~~~~~~~~~~~~~
>    drivers/gpu/drm/bridge/microchip-lvds.c:172:27: note: (near initialization for 'mchp_lvds_bridge_funcs.atomic_disable')
> 
> Caused by commit
> 
>    c4cbe5d9e87d ("drm/bridge: microchip-lvds: migrate to atomic bridge ops")
> 
> from the drm-misc tree interacting badly with commit
> 
>    5164f7e7ff8e ("drm: Rename struct drm_atomic_state to drm_atomic_commit")
> 
> from the drm tree.
> 
> I fixed it up (see below) and can carry the fix for now, but please get
> this fixed in the drm-misc tree.
> 
> Thanks,
> Thierry
> 
> diff --git a/drivers/gpu/drm/bridge/microchip-lvds.c b/drivers/gpu/drm/bridge/microchip-lvds.c
> index 12fc442f9867..5fb8633f43c5 100644
> --- a/drivers/gpu/drm/bridge/microchip-lvds.c
> +++ b/drivers/gpu/drm/bridge/microchip-lvds.c
> @@ -129,7 +129,7 @@ static int mchp_lvds_attach(struct drm_bridge *bridge,
>   }
> 
>   static void mchp_lvds_atomic_enable(struct drm_bridge *bridge,
> -                                   struct drm_atomic_state *state)
> +                                   struct drm_atomic_commit *state)
>   {
>          struct mchp_lvds *lvds = bridge_to_lvds(bridge);
>          struct drm_connector *connector;
> @@ -158,7 +158,7 @@ static void mchp_lvds_atomic_enable(struct drm_bridge *bridge,
>   }
> 
>   static void mchp_lvds_atomic_disable(struct drm_bridge *bridge,
> -                                    struct drm_atomic_state *state)
> +                                    struct drm_atomic_commit *state)
>   {
>          struct mchp_lvds *lvds = bridge_to_lvds(bridge);
> 
> --
> 2.52.0

-- 
Thanks and Regards,
Manikandan M.

linux-next: build failure after merge of the pinctrl-intel tree

[Stephen Rothwell]

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

Hi all,

After merging the pinctrl-intel tree, today's linux-next build (arm64
defconfig) failed like this:


Presumably caused by commit

  e6b665a1c9ae ("pinctrl: Clean up headers")

I have applied the following patch for today.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Tue, 18 Oct 2022 13:06:39 +1100
Subject: [PATCH] fix up for "pinctrl: Clean up headers"

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
---
 drivers/pinctrl/pinctrl-zynqmp.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/pinctrl/pinctrl-zynqmp.c b/drivers/pinctrl/pinctrl-zynqmp.c
index 1a94db1ffa4f..f2be341f73e1 100644
--- a/drivers/pinctrl/pinctrl-zynqmp.c
+++ b/drivers/pinctrl/pinctrl-zynqmp.c
@@ -18,6 +18,7 @@
 #include <linux/firmware/xlnx-zynqmp.h>
 
 #include <linux/pinctrl/pinconf-generic.h>
+#include <linux/pinctrl/pinconf.h>
 #include <linux/pinctrl/pinctrl.h>
 #include <linux/pinctrl/pinmux.h>
 
-- 
2.35.1

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the pinctrl-intel tree

[Stephen Rothwell]

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

Hi all,

On Tue, 18 Oct 2022 13:13:30 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>
> After merging the pinctrl-intel tree, today's linux-next build (arm64
> defconfig) failed like this:

drivers/pinctrl/pinctrl-zynqmp.c:483:21: error: variable 'zynqmp_pinconf_ops' has initializer but incomplete type
  483 | static const struct pinconf_ops zynqmp_pinconf_ops = {
      |                     ^~~~~~~~~~~
drivers/pinctrl/pinctrl-zynqmp.c:484:10: error: 'const struct pinconf_ops' has no member named 'is_generic'
  484 |         .is_generic = true,
      |          ^~~~~~~~~~
drivers/pinctrl/pinctrl-zynqmp.c:484:23: warning: excess elements in struct initializer
  484 |         .is_generic = true,
      |                       ^~~~
drivers/pinctrl/pinctrl-zynqmp.c:484:23: note: (near initialization for 'zynqmp_pinconf_ops')
drivers/pinctrl/pinctrl-zynqmp.c:485:10: error: 'const struct pinconf_ops' has no member named 'pin_config_get'
  485 |         .pin_config_get = zynqmp_pinconf_cfg_get,
      |          ^~~~~~~~~~~~~~
drivers/pinctrl/pinctrl-zynqmp.c:485:27: warning: excess elements in struct initializer
  485 |         .pin_config_get = zynqmp_pinconf_cfg_get,
      |                           ^~~~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/pinctrl-zynqmp.c:485:27: note: (near initialization for 'zynqmp_pinconf_ops')
drivers/pinctrl/pinctrl-zynqmp.c:486:10: error: 'const struct pinconf_ops' has no member named 'pin_config_set'
  486 |         .pin_config_set = zynqmp_pinconf_cfg_set,
      |          ^~~~~~~~~~~~~~
drivers/pinctrl/pinctrl-zynqmp.c:486:27: warning: excess elements in struct initializer
  486 |         .pin_config_set = zynqmp_pinconf_cfg_set,
      |                           ^~~~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/pinctrl-zynqmp.c:486:27: note: (near initialization for 'zynqmp_pinconf_ops')
drivers/pinctrl/pinctrl-zynqmp.c:487:10: error: 'const struct pinconf_ops' has no member named 'pin_config_group_set'
  487 |         .pin_config_group_set = zynqmp_pinconf_group_set,
      |          ^~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/pinctrl-zynqmp.c:487:33: warning: excess elements in struct initializer
  487 |         .pin_config_group_set = zynqmp_pinconf_group_set,
      |                                 ^~~~~~~~~~~~~~~~~~~~~~~~
drivers/pinctrl/pinctrl-zynqmp.c:487:33: note: (near initialization for 'zynqmp_pinconf_ops')
drivers/pinctrl/pinctrl-zynqmp.c:483:33: error: storage size of 'zynqmp_pinconf_ops' isn't known
  483 | static const struct pinconf_ops zynqmp_pinconf_ops = {
      |                                 ^~~~~~~~~~~~~~~~~~

> Presumably caused by commit
> 
>   e6b665a1c9ae ("pinctrl: Clean up headers")
> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 18 Oct 2022 13:06:39 +1100
> Subject: [PATCH] fix up for "pinctrl: Clean up headers"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pinctrl/pinctrl-zynqmp.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/pinctrl/pinctrl-zynqmp.c b/drivers/pinctrl/pinctrl-zynqmp.c
> index 1a94db1ffa4f..f2be341f73e1 100644
> --- a/drivers/pinctrl/pinctrl-zynqmp.c
> +++ b/drivers/pinctrl/pinctrl-zynqmp.c
> @@ -18,6 +18,7 @@
>  #include <linux/firmware/xlnx-zynqmp.h>
>  
>  #include <linux/pinctrl/pinconf-generic.h>
> +#include <linux/pinctrl/pinconf.h>
>  #include <linux/pinctrl/pinctrl.h>
>  #include <linux/pinctrl/pinmux.h>

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the pinctrl-intel tree

[Andy Shevchenko]

On Tue, Oct 18, 2022 at 01:13:30PM +1100, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the pinctrl-intel tree, today's linux-next build (arm64
> defconfig) failed like this:
> 
> 
> Presumably caused by commit
> 
>   e6b665a1c9ae ("pinctrl: Clean up headers")
> 
> I have applied the following patch for today.
> 
> From: Stephen Rothwell <sfr@canb.auug.org.au>
> Date: Tue, 18 Oct 2022 13:06:39 +1100
> Subject: [PATCH] fix up for "pinctrl: Clean up headers"
> 
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
> ---
>  drivers/pinctrl/pinctrl-zynqmp.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/drivers/pinctrl/pinctrl-zynqmp.c b/drivers/pinctrl/pinctrl-zynqmp.c
> index 1a94db1ffa4f..f2be341f73e1 100644
> --- a/drivers/pinctrl/pinctrl-zynqmp.c
> +++ b/drivers/pinctrl/pinctrl-zynqmp.c
> @@ -18,6 +18,7 @@
>  #include <linux/firmware/xlnx-zynqmp.h>
>  
>  #include <linux/pinctrl/pinconf-generic.h>
> +#include <linux/pinctrl/pinconf.h>
>  #include <linux/pinctrl/pinctrl.h>
>  #include <linux/pinctrl/pinmux.h>

Right, thank you for the fix, I'll incorporate it into the original patch.


-- 
With Best Regards,
Andy Shevchenko

linux-next: build failure after merge of the pinctrl-intel tree

[Stephen Rothwell]

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

Hi all,

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

x86_64-linux-gnu-ld: drivers/pinctrl/intel/pinctrl-baytrail.o: in function `byt_pinctrl_probe':
pinctrl-baytrail.c:(.text+0x12bf): undefined reference to `intel_pinctrl_get_soc_data'

Caused by commit

  2db97df9f29d ("pinctrl: baytrail: Switch to use intel_pinctrl_get_soc_data()")

CONFIG_PINCTRL_BAYTRAIL=y
CONFIG_PINCTRL_INTEL=m

I have ised the pinctrl-intel tree from next-20200819 for today.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the pinctrl-intel tree

[Andy Shevchenko]

On Thu, Aug 20, 2020 at 11:30:39AM +1000, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the pinctrl-intel tree, today's linux-next build (x86_64
> allmodconfig) failed like this:
> 
> x86_64-linux-gnu-ld: drivers/pinctrl/intel/pinctrl-baytrail.o: in function `byt_pinctrl_probe':
> pinctrl-baytrail.c:(.text+0x12bf): undefined reference to `intel_pinctrl_get_soc_data'
> 
> Caused by commit
> 
>   2db97df9f29d ("pinctrl: baytrail: Switch to use intel_pinctrl_get_soc_data()")

Right, I have updated it. Shouldn't be issues now.

> CONFIG_PINCTRL_BAYTRAIL=y
> CONFIG_PINCTRL_INTEL=m
> 
> I have ised the pinctrl-intel tree from next-20200819 for today.

Thanks!

-- 
With Best Regards,
Andy Shevchenko