[PATCH] drm/vc4: drv: Avoid possible NPD when booted without KMS

Stefan Wahren wahrenst at gmx.net
Sat Feb 17 15:07:20 UTC 2024


From: Dom Cobley <popcornmix at gmail.com>

In case there is no matching KMS, the function vc4_match_add_driver
won't change the match pointer which is initialized with NULL.
Since component_master_add_with_match doesn't expected match
to be a NULL pointer, this results into a NPD.

Fixes: c8b75bca92cb ("drm/vc4: Add KMS support for Raspberry Pi.")
Signed-off-by: Dom Cobley <popcornmix at gmail.com>
Signed-off-by: Stefan Wahren <wahrenst at gmx.net>
---
 drivers/gpu/drm/vc4/vc4_drv.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c
index c133e96b8aca..4f17840df9d3 100644
--- a/drivers/gpu/drm/vc4/vc4_drv.c
+++ b/drivers/gpu/drm/vc4/vc4_drv.c
@@ -439,6 +439,8 @@ static int vc4_platform_drm_probe(struct platform_device *pdev)

 	vc4_match_add_drivers(dev, &match,
 			      component_drivers, ARRAY_SIZE(component_drivers));
+	if (!match)
+		return -ENODEV;

 	return component_master_add_with_match(dev, &vc4_drm_ops, match);
 }
--
2.34.1



More information about the dri-devel mailing list