From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 812B2C433F5 for ; Tue, 14 Sep 2021 01:28:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 5538061130 for ; Tue, 14 Sep 2021 01:28:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230375AbhINB35 (ORCPT ); Mon, 13 Sep 2021 21:29:57 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229825AbhINB35 (ORCPT ); Mon, 13 Sep 2021 21:29:57 -0400 Received: from mail-ot1-x329.google.com (mail-ot1-x329.google.com [IPv6:2607:f8b0:4864:20::329]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1B0E7C061574 for ; Mon, 13 Sep 2021 18:28:41 -0700 (PDT) Received: by mail-ot1-x329.google.com with SMTP id k12-20020a056830150c00b0051abe7f680bso16058621otp.1 for ; Mon, 13 Sep 2021 18:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:in-reply-to:references:from:user-agent:date:message-id :subject:to:cc; bh=1iyEkjOspz1YHSZHaH57x8hyXl0nLGx/16zCo4qzljY=; b=Tul4Quso1sZ207HiO8jFYq9hTqO+BCojLOgrdEXHGGbHVUFXmyNkDGbglwl0FW93zC L+RZ9IiQ8+3BBHc5yuu047ayDXEw05KS4A6NjUoLO2QQAie6moBVa+dr7LR667B4iDzJ pjh80uBN8NZKxP/g2j9hoq7Yki43v2L2hdnYU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from :user-agent:date:message-id:subject:to:cc; bh=1iyEkjOspz1YHSZHaH57x8hyXl0nLGx/16zCo4qzljY=; b=a1U+AmmS2eFnV8C1hVSYs+w8uELQIvV2RboxHAHiMLWdQxFodzDyQzbXJrcFub5cIu jRolrC+ZcRbktSVBijWei4XSM/DioHuwYczQDSEBKnoH7oFpbTBwdWsIwMwfwSQUTuaI JXPIPR/JkMrL8x/7aWBc/44QAD8BwMoqqnSEryip21odblYMFAkPT0AEdBEDY02w8JYu EEu0n6MTPNcW/QWBkVGHG02iNxYkDur7+r8MLADoxFlChEMz7aziiiPUm0A0uEG8UMlG QOW91K6qi9Xc7TNE4MSpgorKHvc+Essy5QdkMOBnJ8uKSMVGrO42DGSqxkyRJz05tKCc palA== X-Gm-Message-State: AOAM5338EMDQO3iPDqeljMlkuF2AC6AJ889OvVlQQ7mmH/WvaNUHblkp yWd00+KNlkMxV6rkXWnK/U/YVoYAJcetwMGFj6h7bw== X-Google-Smtp-Source: ABdhPJxiz7kY7hb1EpH/a+L2f+xpsb4urURtmhr4zIGOU4NpfdsFNt7CDlKp7ojpYl5biW2svbBuKdfBR4HRic5UJvg= X-Received: by 2002:a05:6830:719:: with SMTP id y25mr12267405ots.77.1631582920355; Mon, 13 Sep 2021 18:28:40 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 13 Sep 2021 18:28:39 -0700 MIME-Version: 1.0 In-Reply-To: <20210913175747.47456-14-sean@poorly.run> References: <20210913175747.47456-1-sean@poorly.run> <20210913175747.47456-14-sean@poorly.run> From: Stephen Boyd User-Agent: alot/0.9.1 Date: Mon, 13 Sep 2021 18:28:39 -0700 Message-ID: Subject: Re: [PATCH 13/14] drm/msm: Add hdcp register ranges to sc7180 device tree To: Sean Paul , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Sean Paul , Rob Clark , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org Quoting Sean Paul (2021-09-13 10:57:44) > From: Sean Paul > > This patch adds the register ranges required for HDCP to the sc7180 > device tree. These registers will be used to inject HDCP key as well as > toggle HDCP on and off. It doesn't look to do any of that? > > Signed-off-by: Sean Paul > --- > drivers/gpu/drm/msm/dp/dp_parser.c | 30 +++++++++++++++++++++++++++--- > drivers/gpu/drm/msm/dp/dp_parser.h | 4 ++++ > 2 files changed, 31 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c > index 0519dd3ac3c3..4bbe2485ce3c 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > @@ -20,11 +20,19 @@ static const struct dp_regulator_cfg sdm845_dp_reg_cfg = { > }; > > static int msm_dss_ioremap(struct platform_device *pdev, > - struct dss_io_data *io_data) > + struct dss_io_data *io_data, const char *name, > + int fallback_idx) > { > struct resource *res = NULL; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); > + > + /* Support dts which do not have named resources */ Please no. Just use index and know that 0 is the dp hardware, 1 is the hdcp key and 2 is the tz interaction zone. There is some backwards compat logic to maintain for when it was split out but I hope we can drop that soon. Alternatively we could make a new compatible and then not care about future conflicts. > + if (!res) { > + if (fallback_idx >= 0) > + res = platform_get_resource(pdev, IORESOURCE_MEM, > + fallback_idx); > + } > if (!res) { > DRM_ERROR("%pS->%s: msm_dss_get_res failed\n", > __builtin_return_address(0), __func__); > @@ -55,6 +63,8 @@ static void dp_parser_unmap_io_resources(struct dp_parser *parser) > { > struct dp_io *io = &parser->io; > > + msm_dss_iounmap(&io->hdcp_tz); > + msm_dss_iounmap(&io->hdcp_key); > msm_dss_iounmap(&io->dp_controller); > } > > @@ -64,12 +74,26 @@ static int dp_parser_ctrl_res(struct dp_parser *parser) > struct platform_device *pdev = parser->pdev; > struct dp_io *io = &parser->io; > > - rc = msm_dss_ioremap(pdev, &io->dp_controller); > + rc = msm_dss_ioremap(pdev, &io->dp_controller, "dp_controller", 0); > if (rc) { > DRM_ERROR("unable to remap dp io resources, rc=%d\n", rc); > goto err; > } > > + rc = msm_dss_ioremap(pdev, &io->hdcp_key, "hdcp_key", -1); > + if (rc) { > + DRM_INFO("unable to remap dp hdcp resources, rc=%d\n", rc); > + io->hdcp_key.base = NULL; > + io->hdcp_key.len = 0; > + } > + > + rc = msm_dss_ioremap(pdev, &io->hdcp_tz, "hdcp_tz", -1); > + if (rc) { > + DRM_INFO("unable to remap dp hdcp resources, rc=%d\n", rc); These shouldn't be info messages. Also, the ioremap wrapper already prints the message that it failed so these are redundant. > + io->hdcp_tz.base = NULL; > + io->hdcp_tz.len = 0; > + } > + > io->phy = devm_phy_get(&pdev->dev, "dp"); > if (IS_ERR(io->phy)) { > rc = PTR_ERR(io->phy); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAB52C433EF for ; Tue, 14 Sep 2021 01:28:43 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AD7386112E for ; Tue, 14 Sep 2021 01:28:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org AD7386112E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BB1506E2A3; Tue, 14 Sep 2021 01:28:41 +0000 (UTC) Received: from mail-ot1-x336.google.com (mail-ot1-x336.google.com [IPv6:2607:f8b0:4864:20::336]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2AB876E2A3 for ; Tue, 14 Sep 2021 01:28:41 +0000 (UTC) Received: by mail-ot1-x336.google.com with SMTP id c19-20020a9d6153000000b0051829acbfc7so16075867otk.9 for ; Mon, 13 Sep 2021 18:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:in-reply-to:references:from:user-agent:date:message-id :subject:to:cc; bh=1iyEkjOspz1YHSZHaH57x8hyXl0nLGx/16zCo4qzljY=; b=Tul4Quso1sZ207HiO8jFYq9hTqO+BCojLOgrdEXHGGbHVUFXmyNkDGbglwl0FW93zC L+RZ9IiQ8+3BBHc5yuu047ayDXEw05KS4A6NjUoLO2QQAie6moBVa+dr7LR667B4iDzJ pjh80uBN8NZKxP/g2j9hoq7Yki43v2L2hdnYU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from :user-agent:date:message-id:subject:to:cc; bh=1iyEkjOspz1YHSZHaH57x8hyXl0nLGx/16zCo4qzljY=; b=nYvUPuoxftWI1WMcGrm4wrNgOZPYU7Sa8E+gtVWh2mW8IGe9ncu/DuR8hok83ZTBR9 JzzXa5iIgS3D/9jMZA/yo/KSfzhNozzC5Fr/59OmG8zw8uBb7on2b+z2yFOu2TpnG2Ts czzLfc2VkNBs+nfAacZJ6i78FCwvJSWmHLHc1rYQd17DqpUOQUjYTSYGzWpwI6Iol05t ZMxdQu8yulcLzvsqlsSCkhmaeT4/2dALWHstAtN9hNGiFIsF4orgUAr6AzuXPEtc/cEU N6YtD84r46IDSGV4+2suJA9TCTWSaA9+fHn+RONxmO1dZM3NON/4qoyK4o6i1Dd0qVFD +qCg== X-Gm-Message-State: AOAM531o60mCRqcDNRY+oC/eYwo9SK046Scl4IkHL6VlCitZagJn7y5Y 1q8Lto++meP8InPyrfxFkezPD4rD7PtV4QDlyUc5Bg== X-Google-Smtp-Source: ABdhPJxiz7kY7hb1EpH/a+L2f+xpsb4urURtmhr4zIGOU4NpfdsFNt7CDlKp7ojpYl5biW2svbBuKdfBR4HRic5UJvg= X-Received: by 2002:a05:6830:719:: with SMTP id y25mr12267405ots.77.1631582920355; Mon, 13 Sep 2021 18:28:40 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 13 Sep 2021 18:28:39 -0700 MIME-Version: 1.0 In-Reply-To: <20210913175747.47456-14-sean@poorly.run> References: <20210913175747.47456-1-sean@poorly.run> <20210913175747.47456-14-sean@poorly.run> From: Stephen Boyd User-Agent: alot/0.9.1 Date: Mon, 13 Sep 2021 18:28:39 -0700 Message-ID: Subject: Re: [PATCH 13/14] drm/msm: Add hdcp register ranges to sc7180 device tree To: Sean Paul , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Sean Paul , Rob Clark , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org Content-Type: text/plain; charset="UTF-8" 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: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Quoting Sean Paul (2021-09-13 10:57:44) > From: Sean Paul > > This patch adds the register ranges required for HDCP to the sc7180 > device tree. These registers will be used to inject HDCP key as well as > toggle HDCP on and off. It doesn't look to do any of that? > > Signed-off-by: Sean Paul > --- > drivers/gpu/drm/msm/dp/dp_parser.c | 30 +++++++++++++++++++++++++++--- > drivers/gpu/drm/msm/dp/dp_parser.h | 4 ++++ > 2 files changed, 31 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c > index 0519dd3ac3c3..4bbe2485ce3c 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > @@ -20,11 +20,19 @@ static const struct dp_regulator_cfg sdm845_dp_reg_cfg = { > }; > > static int msm_dss_ioremap(struct platform_device *pdev, > - struct dss_io_data *io_data) > + struct dss_io_data *io_data, const char *name, > + int fallback_idx) > { > struct resource *res = NULL; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); > + > + /* Support dts which do not have named resources */ Please no. Just use index and know that 0 is the dp hardware, 1 is the hdcp key and 2 is the tz interaction zone. There is some backwards compat logic to maintain for when it was split out but I hope we can drop that soon. Alternatively we could make a new compatible and then not care about future conflicts. > + if (!res) { > + if (fallback_idx >= 0) > + res = platform_get_resource(pdev, IORESOURCE_MEM, > + fallback_idx); > + } > if (!res) { > DRM_ERROR("%pS->%s: msm_dss_get_res failed\n", > __builtin_return_address(0), __func__); > @@ -55,6 +63,8 @@ static void dp_parser_unmap_io_resources(struct dp_parser *parser) > { > struct dp_io *io = &parser->io; > > + msm_dss_iounmap(&io->hdcp_tz); > + msm_dss_iounmap(&io->hdcp_key); > msm_dss_iounmap(&io->dp_controller); > } > > @@ -64,12 +74,26 @@ static int dp_parser_ctrl_res(struct dp_parser *parser) > struct platform_device *pdev = parser->pdev; > struct dp_io *io = &parser->io; > > - rc = msm_dss_ioremap(pdev, &io->dp_controller); > + rc = msm_dss_ioremap(pdev, &io->dp_controller, "dp_controller", 0); > if (rc) { > DRM_ERROR("unable to remap dp io resources, rc=%d\n", rc); > goto err; > } > > + rc = msm_dss_ioremap(pdev, &io->hdcp_key, "hdcp_key", -1); > + if (rc) { > + DRM_INFO("unable to remap dp hdcp resources, rc=%d\n", rc); > + io->hdcp_key.base = NULL; > + io->hdcp_key.len = 0; > + } > + > + rc = msm_dss_ioremap(pdev, &io->hdcp_tz, "hdcp_tz", -1); > + if (rc) { > + DRM_INFO("unable to remap dp hdcp resources, rc=%d\n", rc); These shouldn't be info messages. Also, the ioremap wrapper already prints the message that it failed so these are redundant. > + io->hdcp_tz.base = NULL; > + io->hdcp_tz.len = 0; > + } > + > io->phy = devm_phy_get(&pdev->dev, "dp"); > if (IS_ERR(io->phy)) { > rc = PTR_ERR(io->phy); From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 57B54C433F5 for ; Tue, 14 Sep 2021 01:28:50 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 1E40C6112E for ; Tue, 14 Sep 2021 01:28:50 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 1E40C6112E Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=chromium.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id C5FEF6E323; Tue, 14 Sep 2021 01:28:42 +0000 (UTC) Received: from mail-ot1-x334.google.com (mail-ot1-x334.google.com [IPv6:2607:f8b0:4864:20::334]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2C4B86E30F for ; Tue, 14 Sep 2021 01:28:41 +0000 (UTC) Received: by mail-ot1-x334.google.com with SMTP id i3-20020a056830210300b0051af5666070so16087980otc.4 for ; Mon, 13 Sep 2021 18:28:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=mime-version:in-reply-to:references:from:user-agent:date:message-id :subject:to:cc; bh=1iyEkjOspz1YHSZHaH57x8hyXl0nLGx/16zCo4qzljY=; b=Tul4Quso1sZ207HiO8jFYq9hTqO+BCojLOgrdEXHGGbHVUFXmyNkDGbglwl0FW93zC L+RZ9IiQ8+3BBHc5yuu047ayDXEw05KS4A6NjUoLO2QQAie6moBVa+dr7LR667B4iDzJ pjh80uBN8NZKxP/g2j9hoq7Yki43v2L2hdnYU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:in-reply-to:references:from :user-agent:date:message-id:subject:to:cc; bh=1iyEkjOspz1YHSZHaH57x8hyXl0nLGx/16zCo4qzljY=; b=7AvdZIleCRrdzDXY+JXvcit2D5grts+eVIbnBttlW0fqer8uvTSgOvPabBaTONYV8E 0vvGkxXe8z7/unt/KWcaGoXC4PbEf/gVdos4rFwHQul8fUeVEXoZpJM8pu4jEPxuogNV On2ch3Ap0n/bKpuHUkf6Luva1pZY5Hw9WsI3mtFBZ5q7z6sAbOKEWHz3kWeRNElJeaf2 7Ok84Z+/qe7mO/F1aHJssOCAnWWci1vWkNX1sPuspEzHc6hpRy0N81sX9PZtETSrLvQi zkJ8wBmHzw8BWIe8tXk73DjFG9QBw3JCnE1Roh63auN1BzC5wWo6zffQdyMLilMKRaJm L1Qw== X-Gm-Message-State: AOAM530s+/uzupScRccEnyI6SI3a0tW7rBaXZVumhYsKzzYGiqCneSsH TCaFCht00m8K45G0FExfN3qrAR4O/jWWGH+Fv9jZfg== X-Google-Smtp-Source: ABdhPJxiz7kY7hb1EpH/a+L2f+xpsb4urURtmhr4zIGOU4NpfdsFNt7CDlKp7ojpYl5biW2svbBuKdfBR4HRic5UJvg= X-Received: by 2002:a05:6830:719:: with SMTP id y25mr12267405ots.77.1631582920355; Mon, 13 Sep 2021 18:28:40 -0700 (PDT) Received: from 753933720722 named unknown by gmailapi.google.com with HTTPREST; Mon, 13 Sep 2021 18:28:39 -0700 MIME-Version: 1.0 In-Reply-To: <20210913175747.47456-14-sean@poorly.run> References: <20210913175747.47456-1-sean@poorly.run> <20210913175747.47456-14-sean@poorly.run> From: Stephen Boyd User-Agent: alot/0.9.1 Date: Mon, 13 Sep 2021 18:28:39 -0700 Message-ID: To: Sean Paul , dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, intel-gfx@lists.freedesktop.org Cc: Sean Paul , Rob Clark , David Airlie , Daniel Vetter , linux-arm-msm@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Subject: Re: [Intel-gfx] [PATCH 13/14] drm/msm: Add hdcp register ranges to sc7180 device tree X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" Quoting Sean Paul (2021-09-13 10:57:44) > From: Sean Paul > > This patch adds the register ranges required for HDCP to the sc7180 > device tree. These registers will be used to inject HDCP key as well as > toggle HDCP on and off. It doesn't look to do any of that? > > Signed-off-by: Sean Paul > --- > drivers/gpu/drm/msm/dp/dp_parser.c | 30 +++++++++++++++++++++++++++--- > drivers/gpu/drm/msm/dp/dp_parser.h | 4 ++++ > 2 files changed, 31 insertions(+), 3 deletions(-) > > diff --git a/drivers/gpu/drm/msm/dp/dp_parser.c b/drivers/gpu/drm/msm/dp/dp_parser.c > index 0519dd3ac3c3..4bbe2485ce3c 100644 > --- a/drivers/gpu/drm/msm/dp/dp_parser.c > +++ b/drivers/gpu/drm/msm/dp/dp_parser.c > @@ -20,11 +20,19 @@ static const struct dp_regulator_cfg sdm845_dp_reg_cfg = { > }; > > static int msm_dss_ioremap(struct platform_device *pdev, > - struct dss_io_data *io_data) > + struct dss_io_data *io_data, const char *name, > + int fallback_idx) > { > struct resource *res = NULL; > > - res = platform_get_resource(pdev, IORESOURCE_MEM, 0); > + res = platform_get_resource_byname(pdev, IORESOURCE_MEM, name); > + > + /* Support dts which do not have named resources */ Please no. Just use index and know that 0 is the dp hardware, 1 is the hdcp key and 2 is the tz interaction zone. There is some backwards compat logic to maintain for when it was split out but I hope we can drop that soon. Alternatively we could make a new compatible and then not care about future conflicts. > + if (!res) { > + if (fallback_idx >= 0) > + res = platform_get_resource(pdev, IORESOURCE_MEM, > + fallback_idx); > + } > if (!res) { > DRM_ERROR("%pS->%s: msm_dss_get_res failed\n", > __builtin_return_address(0), __func__); > @@ -55,6 +63,8 @@ static void dp_parser_unmap_io_resources(struct dp_parser *parser) > { > struct dp_io *io = &parser->io; > > + msm_dss_iounmap(&io->hdcp_tz); > + msm_dss_iounmap(&io->hdcp_key); > msm_dss_iounmap(&io->dp_controller); > } > > @@ -64,12 +74,26 @@ static int dp_parser_ctrl_res(struct dp_parser *parser) > struct platform_device *pdev = parser->pdev; > struct dp_io *io = &parser->io; > > - rc = msm_dss_ioremap(pdev, &io->dp_controller); > + rc = msm_dss_ioremap(pdev, &io->dp_controller, "dp_controller", 0); > if (rc) { > DRM_ERROR("unable to remap dp io resources, rc=%d\n", rc); > goto err; > } > > + rc = msm_dss_ioremap(pdev, &io->hdcp_key, "hdcp_key", -1); > + if (rc) { > + DRM_INFO("unable to remap dp hdcp resources, rc=%d\n", rc); > + io->hdcp_key.base = NULL; > + io->hdcp_key.len = 0; > + } > + > + rc = msm_dss_ioremap(pdev, &io->hdcp_tz, "hdcp_tz", -1); > + if (rc) { > + DRM_INFO("unable to remap dp hdcp resources, rc=%d\n", rc); These shouldn't be info messages. Also, the ioremap wrapper already prints the message that it failed so these are redundant. > + io->hdcp_tz.base = NULL; > + io->hdcp_tz.len = 0; > + } > + > io->phy = devm_phy_get(&pdev->dev, "dp"); > if (IS_ERR(io->phy)) { > rc = PTR_ERR(io->phy);