diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-10-05 16:10:11 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-10-05 16:10:11 -0700 |
| commit | 120b98faf4d50883f00d2ee91db597ca78240aba (patch) | |
| tree | 101cee4be13c9dffaa73e9ae5021e65353750b81 /drivers | |
| parent | 85efa92bb8f2576dadcd7721bc90a6899eb31b1b (diff) | |
| parent | c38bb7f0882b47f9c2ae39ba71382a0432ac4227 (diff) | |
Merge "drm/msm: avoid loading gpu components if qcom_kgsl present"
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 27aca55d0e8e..82f62f015c41 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -2151,7 +2151,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 |