This reverts commit 9d7d7c3c9a191864367b28e05b312ab3ac34ef0a.
The patch causes build errors in our CI. Revert it till a fix is found.
CC [M] drivers/gpu/drm/solomon/ssd130x-spi.o
CC [M] drivers/gpu/drm/panel/panel-auo-a030jtn01.o
drivers/gpu/drm/panel/panel-auo-a030jtn01.c: In function ‘a030jtn01_probe’:
drivers/gpu/drm/panel/panel-auo-a030jtn01.c:203:9: error: ‘panel’ undeclared
(first use in this function)
203 | panel = devm_drm_panel_alloc(dev, struct a030jtn01, panel,
| ^~~~~
drivers/gpu/drm/panel/panel-auo-a030jtn01.c:203:9: note: each undeclared
identifier is reported only once for each function it appears in
make[6]: *** [scripts/Makefile.build:203:
drivers/gpu/drm/panel/panel-auo-a030jtn01.o] Error 1
make[5]: *** [scripts/Makefile.build:461: drivers/gpu/drm/panel] Error 2
make[4]: *** [scripts/Makefile.build:461: drivers/gpu/drm] Error 2
make[3]: *** [scripts/Makefile.build:461: drivers/gpu] Error 2
make[2]: *** [scripts/Makefile.build:461: drivers] Error 2
make[1]: *** [/home/kbuild2/kernel/Makefile:2006: .] Error 2
make: *** [Makefile:248: __sub-make] Error 2
Link: https://lore.kernel.org/all/[email protected]/
References: https://gitlab.freedesktop.org/drm/i915/kernel/-/issues/14039
Signed-off-by: Chaitanya Kumar Borah <[email protected]>
---
drivers/gpu/drm/panel/panel-auo-a030jtn01.c | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/drivers/gpu/drm/panel/panel-auo-a030jtn01.c
b/drivers/gpu/drm/panel/panel-auo-a030jtn01.c
index 83529b1c2bac..77604d6a4e72 100644
--- a/drivers/gpu/drm/panel/panel-auo-a030jtn01.c
+++ b/drivers/gpu/drm/panel/panel-auo-a030jtn01.c
@@ -200,10 +200,9 @@ static int a030jtn01_probe(struct spi_device *spi)
spi->mode |= SPI_MODE_3 | SPI_3WIRE;
- panel = devm_drm_panel_alloc(dev, struct a030jtn01, panel,
- &a030jtn01_funcs, DRM_MODE_CONNECTOR_DPI);
- if (IS_ERR(panel))
- return PTR_ERR(panel);
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
+ if (!priv)
+ return -ENOMEM;
priv->spi = spi;
spi_set_drvdata(spi, priv);
@@ -224,6 +223,9 @@ static int a030jtn01_probe(struct spi_device *spi)
if (IS_ERR(priv->reset_gpio))
return dev_err_probe(dev, PTR_ERR(priv->reset_gpio), "Failed to
get reset GPIO");
+ drm_panel_init(&priv->panel, dev, &a030jtn01_funcs,
+ DRM_MODE_CONNECTOR_DPI);
+
err = drm_panel_of_backlight(&priv->panel);
if (err)
return err;
--
2.25.1
