Merge tag 'gvt-fixes-2020-02-12' of https://github.com/intel/gvt-linux into drm-intel...

[linux.git] / drivers / gpu / drm / msm / msm_drv.c

diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c
index c84f0a8b3f2cebf76f99a70c01e4377fde610d0e..f50fefb87040976699546a686e5e0163f8ba33a4 100644 (file)
--- a/drivers/gpu/drm/msm/msm_drv.c
+++ b/drivers/gpu/drm/msm/msm_drv.c
@@ -1192,7 +1192,8 @@ static int add_display_components(struct device *dev,
         * the interfaces to our components list.
         */
        if (of_device_is_compatible(dev->of_node, "qcom,mdss") ||
-           of_device_is_compatible(dev->of_node, "qcom,sdm845-mdss")) {
+           of_device_is_compatible(dev->of_node, "qcom,sdm845-mdss") ||
+           of_device_is_compatible(dev->of_node, "qcom,sc7180-mdss")) {
                ret = of_platform_populate(dev->of_node, NULL, NULL, dev);
                if (ret) {
                        DRM_DEV_ERROR(dev, "failed to populate children devices\n");
@@ -1317,6 +1318,7 @@ static const struct of_device_id dt_match[] = {
        { .compatible = "qcom,mdp4", .data = (void *)KMS_MDP4 },
        { .compatible = "qcom,mdss", .data = (void *)KMS_MDP5 },
        { .compatible = "qcom,sdm845-mdss", .data = (void *)KMS_DPU },
+       { .compatible = "qcom,sc7180-mdss", .data = (void *)KMS_DPU },
        {}
 };
 MODULE_DEVICE_TABLE(of, dt_match);