| Message ID | 20230802011845.4176631-4-dmitry.baryshkov@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | drm/display: simplify support for transparent DRM bridges | expand |
On Wed, Aug 02, 2023 at 04:18:45AM +0300, Dmitry Baryshkov wrote: > Switch to using the new DRM_SIMPLE_BRIDGE helper to create the > transparent DRM bridge device instead of handcoding corresponding > functionality. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> Reviewed-by: Heikki Krogerus <heikki.krogerus@linux.intel.com> > --- > drivers/usb/typec/mux/Kconfig | 2 +- > drivers/usb/typec/mux/nb7vpq904m.c | 44 ++---------------------------- > 2 files changed, 3 insertions(+), 43 deletions(-) > > diff --git a/drivers/usb/typec/mux/Kconfig b/drivers/usb/typec/mux/Kconfig > index 784b9d8107e9..350a7ffce67e 100644 > --- a/drivers/usb/typec/mux/Kconfig > +++ b/drivers/usb/typec/mux/Kconfig > @@ -39,7 +39,7 @@ config TYPEC_MUX_NB7VPQ904M > tristate "On Semiconductor NB7VPQ904M Type-C redriver driver" > depends on I2C > depends on DRM || DRM=n > - select DRM_PANEL_BRIDGE if DRM > + select DRM_SIMPLE_BRIDGE if DRM > select REGMAP_I2C > help > Say Y or M if your system has a On Semiconductor NB7VPQ904M Type-C > diff --git a/drivers/usb/typec/mux/nb7vpq904m.c b/drivers/usb/typec/mux/nb7vpq904m.c > index 9360b65e8b06..c89a956412ea 100644 > --- a/drivers/usb/typec/mux/nb7vpq904m.c > +++ b/drivers/usb/typec/mux/nb7vpq904m.c > @@ -11,7 +11,7 @@ > #include <linux/regmap.h> > #include <linux/bitfield.h> > #include <linux/of_graph.h> > -#include <drm/drm_bridge.h> > +#include <drm/display/drm_simple_bridge.h> > #include <linux/usb/typec_dp.h> > #include <linux/usb/typec_mux.h> > #include <linux/usb/typec_retimer.h> > @@ -70,8 +70,6 @@ struct nb7vpq904m { > bool swap_data_lanes; > struct typec_switch *typec_switch; > > - struct drm_bridge bridge; > - > struct mutex lock; /* protect non-concurrent retimer & switch */ > > enum typec_orientation orientation; > @@ -297,44 +295,6 @@ static int nb7vpq904m_retimer_set(struct typec_retimer *retimer, struct typec_re > return ret; > } > > -#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_DRM_PANEL_BRIDGE) > -static int nb7vpq904m_bridge_attach(struct drm_bridge *bridge, > - enum drm_bridge_attach_flags flags) > -{ > - struct nb7vpq904m *nb7 = container_of(bridge, struct nb7vpq904m, bridge); > - struct drm_bridge *next_bridge; > - > - if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) > - return -EINVAL; > - > - next_bridge = devm_drm_of_get_bridge(&nb7->client->dev, nb7->client->dev.of_node, 0, 0); > - if (IS_ERR(next_bridge)) { > - dev_err(&nb7->client->dev, "failed to acquire drm_bridge: %pe\n", next_bridge); > - return PTR_ERR(next_bridge); > - } > - > - return drm_bridge_attach(bridge->encoder, next_bridge, bridge, > - DRM_BRIDGE_ATTACH_NO_CONNECTOR); > -} > - > -static const struct drm_bridge_funcs nb7vpq904m_bridge_funcs = { > - .attach = nb7vpq904m_bridge_attach, > -}; > - > -static int nb7vpq904m_register_bridge(struct nb7vpq904m *nb7) > -{ > - nb7->bridge.funcs = &nb7vpq904m_bridge_funcs; > - nb7->bridge.of_node = nb7->client->dev.of_node; > - > - return devm_drm_bridge_add(&nb7->client->dev, &nb7->bridge); > -} > -#else > -static int nb7vpq904m_register_bridge(struct nb7vpq904m *nb7) > -{ > - return 0; > -} > -#endif > - > static const struct regmap_config nb7_regmap = { > .max_register = 0x1f, > .reg_bits = 8, > @@ -461,7 +421,7 @@ static int nb7vpq904m_probe(struct i2c_client *client) > > gpiod_set_value(nb7->enable_gpio, 1); > > - ret = nb7vpq904m_register_bridge(nb7); > + ret = drm_simple_bridge_register(dev); > if (ret) > return ret; > > -- > 2.39.2
Hi Dmitry,
kernel test robot noticed the following build errors:
[auto build test ERROR on drm-misc/drm-misc-next]
[also build test ERROR on usb/usb-testing usb/usb-next usb/usb-linus drm-intel/for-linux-next drm-intel/for-linux-next-fixes drm-tip/drm-tip linus/master v6.5-rc5 next-20230808]
[If your patch is applied to the wrong git tree, kindly drop us a note.
And when submitting patch, we suggest to use '--base' as documented in
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Dmitry-Baryshkov/drm-display-add-transparent-bridge-helper/20230802-091932
base: git://anongit.freedesktop.org/drm/drm-misc drm-misc-next
patch link: https://lore.kernel.org/r/20230802011845.4176631-4-dmitry.baryshkov%40linaro.org
patch subject: [PATCH v3 3/3] usb: typec: nb7vpq904m: switch to DRM_SIMPLE_BRIDGE
config: s390-randconfig-r033-20230808 (https://download.01.org/0day-ci/archive/20230809/202308090347.sZtwmCUB-lkp@intel.com/config)
compiler: clang version 15.0.7 (https://github.com/llvm/llvm-project.git 8dfdcc7b7bf66834a761bd8de445840ef68e4d1a)
reproduce: (https://download.01.org/0day-ci/archive/20230809/202308090347.sZtwmCUB-lkp@intel.com/reproduce)
If you fix the issue in a separate patch/commit (i.e. not just a new version of
the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <lkp@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202308090347.sZtwmCUB-lkp@intel.com/
All errors (new ones prefixed by >>):
>> drivers/gpu/drm/bridge/simple-bridge.c:212:18: error: no member named 'of_node' in 'struct drm_bridge'
sbridge->bridge.of_node = pdev->dev.of_node;
~~~~~~~~~~~~~~~ ^
1 error generated.
vim +212 drivers/gpu/drm/bridge/simple-bridge.c
56fe8b6f499167 drivers/gpu/drm/bridge/dumb-vga-dac.c Maxime Ripard 2016-09-30 168
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 169 static int simple_bridge_probe(struct platform_device *pdev)
56fe8b6f499167 drivers/gpu/drm/bridge/dumb-vga-dac.c Maxime Ripard 2016-09-30 170 {
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 171 struct simple_bridge *sbridge;
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 172 struct device_node *remote;
56fe8b6f499167 drivers/gpu/drm/bridge/dumb-vga-dac.c Maxime Ripard 2016-09-30 173
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 174 sbridge = devm_kzalloc(&pdev->dev, sizeof(*sbridge), GFP_KERNEL);
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 175 if (!sbridge)
56fe8b6f499167 drivers/gpu/drm/bridge/dumb-vga-dac.c Maxime Ripard 2016-09-30 176 return -ENOMEM;
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 177 platform_set_drvdata(pdev, sbridge);
56fe8b6f499167 drivers/gpu/drm/bridge/dumb-vga-dac.c Maxime Ripard 2016-09-30 178
272378ec0eb972 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-02-26 179 sbridge->info = of_device_get_match_data(&pdev->dev);
272378ec0eb972 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-02-26 180
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 181 /* Get the next bridge in the pipeline. */
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 182 remote = of_graph_get_remote_node(pdev->dev.of_node, 1, -1);
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 183 if (!remote)
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 184 return -EINVAL;
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 185
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 186 sbridge->next_bridge = of_drm_find_bridge(remote);
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 187 of_node_put(remote);
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 188
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 189 if (!sbridge->next_bridge) {
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 190 dev_dbg(&pdev->dev, "Next bridge not found, deferring probe\n");
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 191 return -EPROBE_DEFER;
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 192 }
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 193
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 194 /* Get the regulator and GPIO resources. */
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 195 sbridge->vdd = devm_regulator_get_optional(&pdev->dev, "vdd");
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 196 if (IS_ERR(sbridge->vdd)) {
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 197 int ret = PTR_ERR(sbridge->vdd);
af948a25ecb214 drivers/gpu/drm/bridge/dumb-vga-dac.c Chen-Yu Tsai 2016-11-16 198 if (ret == -EPROBE_DEFER)
af948a25ecb214 drivers/gpu/drm/bridge/dumb-vga-dac.c Chen-Yu Tsai 2016-11-16 199 return -EPROBE_DEFER;
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 200 sbridge->vdd = NULL;
af948a25ecb214 drivers/gpu/drm/bridge/dumb-vga-dac.c Chen-Yu Tsai 2016-11-16 201 dev_dbg(&pdev->dev, "No vdd regulator found: %d\n", ret);
af948a25ecb214 drivers/gpu/drm/bridge/dumb-vga-dac.c Chen-Yu Tsai 2016-11-16 202 }
af948a25ecb214 drivers/gpu/drm/bridge/dumb-vga-dac.c Chen-Yu Tsai 2016-11-16 203
2df6428e290a61 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-02-26 204 sbridge->enable = devm_gpiod_get_optional(&pdev->dev, "enable",
2df6428e290a61 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-02-26 205 GPIOD_OUT_LOW);
db8496d0b50519 drivers/gpu/drm/bridge/simple-bridge.c Ye Xingchen 2023-03-22 206 if (IS_ERR(sbridge->enable))
db8496d0b50519 drivers/gpu/drm/bridge/simple-bridge.c Ye Xingchen 2023-03-22 207 return dev_err_probe(&pdev->dev, PTR_ERR(sbridge->enable),
db8496d0b50519 drivers/gpu/drm/bridge/simple-bridge.c Ye Xingchen 2023-03-22 208 "Unable to retrieve enable GPIO\n");
2df6428e290a61 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-02-26 209
00686ac55d0a21 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-05-26 210 /* Register the bridge. */
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 211 sbridge->bridge.funcs = &simple_bridge_bridge_funcs;
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 @212 sbridge->bridge.of_node = pdev->dev.of_node;
272378ec0eb972 drivers/gpu/drm/bridge/simple-bridge.c Laurent Pinchart 2020-02-26 213 sbridge->bridge.timings = sbridge->info->timings;
56fe8b6f499167 drivers/gpu/drm/bridge/dumb-vga-dac.c Maxime Ripard 2016-09-30 214
94ded532ffdb42 drivers/gpu/drm/bridge/dumb-vga-dac.c Laurent Pinchart 2020-02-26 215 drm_bridge_add(&sbridge->bridge);
56fe8b6f499167 drivers/gpu/drm/bridge/dumb-vga-dac.c Maxime Ripard 2016-09-30 216
47e34278549ca4 drivers/gpu/drm/bridge/dumb-vga-dac.c Inki Dae 2017-07-03 217 return 0;
56fe8b6f499167 drivers/gpu/drm/bridge/dumb-vga-dac.c Maxime Ripard 2016-09-30 218 }
56fe8b6f499167 drivers/gpu/drm/bridge/dumb-vga-dac.c Maxime Ripard 2016-09-30 219
diff --git a/drivers/usb/typec/mux/Kconfig b/drivers/usb/typec/mux/Kconfig index 784b9d8107e9..350a7ffce67e 100644 --- a/drivers/usb/typec/mux/Kconfig +++ b/drivers/usb/typec/mux/Kconfig @@ -39,7 +39,7 @@ config TYPEC_MUX_NB7VPQ904M tristate "On Semiconductor NB7VPQ904M Type-C redriver driver" depends on I2C depends on DRM || DRM=n - select DRM_PANEL_BRIDGE if DRM + select DRM_SIMPLE_BRIDGE if DRM select REGMAP_I2C help Say Y or M if your system has a On Semiconductor NB7VPQ904M Type-C diff --git a/drivers/usb/typec/mux/nb7vpq904m.c b/drivers/usb/typec/mux/nb7vpq904m.c index 9360b65e8b06..c89a956412ea 100644 --- a/drivers/usb/typec/mux/nb7vpq904m.c +++ b/drivers/usb/typec/mux/nb7vpq904m.c @@ -11,7 +11,7 @@ #include <linux/regmap.h> #include <linux/bitfield.h> #include <linux/of_graph.h> -#include <drm/drm_bridge.h> +#include <drm/display/drm_simple_bridge.h> #include <linux/usb/typec_dp.h> #include <linux/usb/typec_mux.h> #include <linux/usb/typec_retimer.h> @@ -70,8 +70,6 @@ struct nb7vpq904m { bool swap_data_lanes; struct typec_switch *typec_switch; - struct drm_bridge bridge; - struct mutex lock; /* protect non-concurrent retimer & switch */ enum typec_orientation orientation; @@ -297,44 +295,6 @@ static int nb7vpq904m_retimer_set(struct typec_retimer *retimer, struct typec_re return ret; } -#if IS_ENABLED(CONFIG_OF) && IS_ENABLED(CONFIG_DRM_PANEL_BRIDGE) -static int nb7vpq904m_bridge_attach(struct drm_bridge *bridge, - enum drm_bridge_attach_flags flags) -{ - struct nb7vpq904m *nb7 = container_of(bridge, struct nb7vpq904m, bridge); - struct drm_bridge *next_bridge; - - if (!(flags & DRM_BRIDGE_ATTACH_NO_CONNECTOR)) - return -EINVAL; - - next_bridge = devm_drm_of_get_bridge(&nb7->client->dev, nb7->client->dev.of_node, 0, 0); - if (IS_ERR(next_bridge)) { - dev_err(&nb7->client->dev, "failed to acquire drm_bridge: %pe\n", next_bridge); - return PTR_ERR(next_bridge); - } - - return drm_bridge_attach(bridge->encoder, next_bridge, bridge, - DRM_BRIDGE_ATTACH_NO_CONNECTOR); -} - -static const struct drm_bridge_funcs nb7vpq904m_bridge_funcs = { - .attach = nb7vpq904m_bridge_attach, -}; - -static int nb7vpq904m_register_bridge(struct nb7vpq904m *nb7) -{ - nb7->bridge.funcs = &nb7vpq904m_bridge_funcs; - nb7->bridge.of_node = nb7->client->dev.of_node; - - return devm_drm_bridge_add(&nb7->client->dev, &nb7->bridge); -} -#else -static int nb7vpq904m_register_bridge(struct nb7vpq904m *nb7) -{ - return 0; -} -#endif - static const struct regmap_config nb7_regmap = { .max_register = 0x1f, .reg_bits = 8, @@ -461,7 +421,7 @@ static int nb7vpq904m_probe(struct i2c_client *client) gpiod_set_value(nb7->enable_gpio, 1); - ret = nb7vpq904m_register_bridge(nb7); + ret = drm_simple_bridge_register(dev); if (ret) return ret;
Switch to using the new DRM_SIMPLE_BRIDGE helper to create the transparent DRM bridge device instead of handcoding corresponding functionality. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- drivers/usb/typec/mux/Kconfig | 2 +- drivers/usb/typec/mux/nb7vpq904m.c | 44 ++---------------------------- 2 files changed, 3 insertions(+), 43 deletions(-)