From c38bb7f0882b47f9c2ae39ba71382a0432ac4227 Mon Sep 17 00:00:00 2001 From: Camus Wong Date: Thu, 27 Jul 2017 15:30:06 -0400 Subject: drm/msm: avoid loading gpu components if qcom_kgsl present Avoid loading gpu components from drm driver if qcom_kgsl driver present. Change-Id: I74c65634ce9260fba5bb871b3a9854d2c8173f4e Signed-off-by: Camus Wong Signed-off-by: Rahul Sharma --- drivers/gpu/drm/msm/msm_drv.c | 2 ++ 1 file changed, 2 insertions(+) (limited to 'drivers') diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 83b34a071ced..ba9130f52188 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -2146,7 +2146,9 @@ static int msm_pdev_probe(struct platform_device *pdev) #ifdef CONFIG_OF add_components(&pdev->dev, &match, "connectors"); +#ifndef CONFIG_QCOM_KGSL add_components(&pdev->dev, &match, "gpus"); +#endif #else /* For non-DT case, it kinda sucks. We don't actually have a way * to know whether or not we are waiting for certain devices (or if -- cgit v1.2.3