diff options
| author | Linux Build Service Account <lnxbuild@quicinc.com> | 2017-05-16 06:49:50 -0700 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2017-05-16 06:49:50 -0700 |
| commit | 211854c904f68128aa506ac2c3be2a7027ab78d3 (patch) | |
| tree | 6cfc2cf55036f82866fe22ca62b78d5d85e492d0 | |
| parent | 6b2b446623f0585432de598ac07ab96a31f7b15c (diff) | |
| parent | a9a4456a1383b72a5722a8ca578dfba9b00c07a8 (diff) | |
Merge "drm/msm: remove mdp node entry"
| -rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 22addb797db3..665f8db0e04f 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -251,17 +251,12 @@ static int msm_unload(struct drm_device *dev) } #define KMS_MDP4 0 -#define KMS_MDP5 1 -#define KMS_SDE 2 +#define KMS_SDE 1 static int get_mdp_ver(struct platform_device *pdev) { #ifdef CONFIG_OF static const struct of_device_id match_types[] = { { - .compatible = "qcom,mdss_mdp", - .data = (void *)KMS_MDP5, - }, - { .compatible = "qcom,sde-kms", .data = (void *)KMS_SDE, /* end node */ @@ -432,9 +427,6 @@ static int msm_load(struct drm_device *dev, unsigned long flags) case KMS_MDP4: kms = mdp4_kms_init(dev); break; - case KMS_MDP5: - kms = mdp5_kms_init(dev); - break; case KMS_SDE: kms = sde_kms_init(dev); break; @@ -1948,7 +1940,6 @@ static const struct platform_device_id msm_id[] = { static const struct of_device_id dt_match[] = { { .compatible = "qcom,mdp" }, /* mdp4 */ - { .compatible = "qcom,mdss_mdp" }, /* mdp5 */ { .compatible = "qcom,sde-kms" }, /* sde */ {} }; |