From patchwork Mon Mar 29 12:00:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dmitry Baryshkov X-Patchwork-Id: 410835 Delivered-To: patch@linaro.org Received: by 2002:a02:8562:0:0:0:0:0 with SMTP id g89csp3558822jai; Mon, 29 Mar 2021 05:01:10 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy4ezjg7xiFKBUyIV3XjunQQiYlWw+KnKxhvSMmkW2DPZ7SxhCsaAlLQp/VP76XloF4701L X-Received: by 2002:a17:90a:eb0b:: with SMTP id j11mr25364245pjz.62.1617019270672; Mon, 29 Mar 2021 05:01:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617019270; cv=none; d=google.com; s=arc-20160816; b=WBjvbMH47vJcutZj3n/efRjaZszc/Q38V2MjnI2bHKJYUFc3rFDVB0vjuwo1FGI70X z9xGZC/7kGIm9VXEYow230VYN1CLqZD/ZbqHyo4VEOeRgHyqRrqlkUdGasNPbtfCRv4m BubVLQHZfCNOmXo97K1P88uenAtj44N9MwmZISSD6HE6OZkA6yqp8+59IDXXO58Ia3QU Vv2D3NJcZjM/yKaqeUCiT53fxIUjasU+Et0lMYgqaPqk5Uts2Mmj9BF1Ci4gF3NS0Q5P AebYu1xCwNGyS6XLSZCTtR9H2DwKLJgupmQfHbxHhrQNkm9cZp8VrQavUQBuIzzzPw8V RWYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:mime-version:references:in-reply-to:message-id:date :subject:to:from:dkim-signature:delivered-to; bh=RZKaygMq/dew19WhdycXtQUZBIRwrwVJDJxGN8nsZvU=; b=hvpsmQOeMJjhyCpUF3HraCdcRuZTO35hopqWotrTERreo3Xuep8Kped3A7cvDhNkba K1X8iU2vf37GUFTgK4q1UFKvhDvfHmjg3P0+VO/nCa8syfG5fScUaE1LkzTlTwaDtY+v 0/wHUIL1gY6MQgobdwZyNcCeProF0aQ6xamwNSREZE/zsbfBVnIboGrkkypzzCudIuiY 95Ek9x0z8GMdYOOvhzO+9rgLal4KUw41eJy6rTKWwYn2vzR0t6KMmqGYyGDbbopYdtQU ZuLviYi2vTp9CA5Um+KKzCklMrgkKJDR7mcBSZhIXdEC2yyG5RqyilAEclgdDjOZcecj hjKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dCytlg3N; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [131.252.210.177]) by mx.google.com with ESMTPS id z12si9678434pfn.87.2021.03.29.05.01.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 05:01:10 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) client-ip=131.252.210.177; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org header.s=google header.b=dCytlg3N; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 131.252.210.177 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8142B6E415; Mon, 29 Mar 2021 12:01:05 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-lf1-x12b.google.com (mail-lf1-x12b.google.com [IPv6:2a00:1450:4864:20::12b]) by gabe.freedesktop.org (Postfix) with ESMTPS id 770846E40B for ; Mon, 29 Mar 2021 12:01:02 +0000 (UTC) Received: by mail-lf1-x12b.google.com with SMTP id a198so18011018lfd.7 for ; Mon, 29 Mar 2021 05:01:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=P9Nv+6xnEu0zvg+j8CWyLr5RnYQX009vcZ1IcsZuglc=; b=dCytlg3NJtzf0BpAz8mXT7plQHDmHXz1C4hl6Y9i80ei+NgRYcYg/f90iCRvocOt90 URY/Gh6xzPVyPKLt5MtLKD+GW7kdG8L/gHbj11PSOd/+t46LYRn7rSyDunXVkVBhAo4x UdcdGJ3MJAxSPb3uhpn2m99OmglOQ0seBL2B8dHvKWQ7hJHkSs8PzWgMC245xOEBB+Ij 66J+ILAqnnW660AjnKTLgti1Zm18RaeRrtQ/NUvF209pPf0KQdAwFEq30Dj71jFVgdGX 1+Ih90QSivp1dEnvC0jhXtr9/NXpBHyNImI+ufcE6ej8wWtRkYlM6tey8IhQj9mxj1Er IBig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=P9Nv+6xnEu0zvg+j8CWyLr5RnYQX009vcZ1IcsZuglc=; b=FHG1W3kQJeM+lvjeGAXUXMh0RVkMUjKAdoKiEGQFOzyJLw4KCuhWaKuwNEL0kcKFUX zOsW5d1y+sNMEF5MLFZIgfBajf71bPrEgbtFptqny7Ks0A16T72eZafGQeR+Oe1qx/VZ Ppo0/NzmrdudMvyCXxWJQSjiImItGw+fytowzj+w+q6bXK4rdKFCt88drG8Ew8nyUkVq AqLTAdOWKfShfFKnz2Ed9NijwddINdvcc6fUusehKf7v9k7yM7PywpZomorU7gaeioSL 9eKA605P0APtlcjrKmcyPXiJ+baUfoeyrNlZIT4vt+OuqfjtLIkJ1w+oULdzGJFoF7Sk RGGg== X-Gm-Message-State: AOAM531ASbV2i7yEty/iotiqaOCPr1IVouFQPjsx1x2x7PYcMEW3WwhH qXqYoHZriLoPelTNrH4KW9P+nw== X-Received: by 2002:a19:c14a:: with SMTP id r71mr15979614lff.358.1617019260867; Mon, 29 Mar 2021 05:01:00 -0700 (PDT) Received: from eriador.lan ([37.153.55.125]) by smtp.gmail.com with ESMTPSA id d8sm2415240ljc.129.2021.03.29.05.01.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 29 Mar 2021 05:01:00 -0700 (PDT) From: Dmitry Baryshkov To: Andy Gross , Bjorn Andersson , Rob Clark , Sean Paul , Rob Herring Subject: [PATCH v4 3/4] drm/msm: add compatibles for sm8150/sm8250 display Date: Mon, 29 Mar 2021 15:00:50 +0300 Message-Id: <20210329120051.3401567-4-dmitry.baryshkov@linaro.org> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210329120051.3401567-1-dmitry.baryshkov@linaro.org> References: <20210329120051.3401567-1-dmitry.baryshkov@linaro.org> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: devicetree@vger.kernel.org, Jonathan Marek , David Airlie , linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Jonathan Marek The driver already has support for sm8150/sm8250, but the compatibles were never added. Also inverse the non-mdp4 condition in add_display_components() to avoid having to check every new compatible in the condition. Signed-off-by: Jonathan Marek Signed-off-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 ++ drivers/gpu/drm/msm/msm_drv.c | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) -- 2.30.2 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel Reviewed-by: Stephen Boyd Reviewed-by: Bjorn Andersson diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 5a8e3e1fc48c..fff12a4c8bfc 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -1219,6 +1219,8 @@ static const struct dev_pm_ops dpu_pm_ops = { static const struct of_device_id dpu_dt_match[] = { { .compatible = "qcom,sdm845-dpu", }, { .compatible = "qcom,sc7180-dpu", }, + { .compatible = "qcom,sm8150-dpu", }, + { .compatible = "qcom,sm8250-dpu", }, {} }; MODULE_DEVICE_TABLE(of, dpu_dt_match); diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index 94525ac76d4e..928f13d4bfbc 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c @@ -1185,9 +1185,7 @@ static int add_display_components(struct device *dev, * Populate the children devices, find the MDP5/DPU node, and then add * 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,sc7180-mdss")) { + if (!of_device_is_compatible(dev->of_node, "qcom,mdp4")) { ret = of_platform_populate(dev->of_node, NULL, NULL, dev); if (ret) { DRM_DEV_ERROR(dev, "failed to populate children devices\n"); @@ -1320,6 +1318,8 @@ static const struct of_device_id dt_match[] = { { .compatible = "qcom,mdss", .data = (void *)KMS_MDP5 }, { .compatible = "qcom,sdm845-mdss", .data = (void *)KMS_DPU }, { .compatible = "qcom,sc7180-mdss", .data = (void *)KMS_DPU }, + { .compatible = "qcom,sm8150-mdss", .data = (void *)KMS_DPU }, + { .compatible = "qcom,sm8250-mdss", .data = (void *)KMS_DPU }, {} }; MODULE_DEVICE_TABLE(of, dt_match);