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=-9.8 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED 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 30878C433E1 for ; Tue, 28 Jul 2020 13:03:20 +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 03E8820663 for ; Tue, 28 Jul 2020 13:03:20 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="Cw/Vz4YG" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 03E8820663 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=raspberrypi.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 82B93897D0; Tue, 28 Jul 2020 13:03:19 +0000 (UTC) Received: from mail-wm1-x342.google.com (mail-wm1-x342.google.com [IPv6:2a00:1450:4864:20::342]) by gabe.freedesktop.org (Postfix) with ESMTPS id 32388892C1 for ; Tue, 28 Jul 2020 13:03:18 +0000 (UTC) Received: by mail-wm1-x342.google.com with SMTP id p14so16892084wmg.1 for ; Tue, 28 Jul 2020 06:03:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=Wv84ulHBLNw4Uf5oxYsoMX+Mv7LdyizqK6mgHY/q9Lg=; b=Cw/Vz4YG3V+q9BXCM+dRF8Bf1+qaTvaVBLZtNXFHMhI+iwRPIr1VMt0h31PKFR1K3w +KsWrczwug5KX/BqsyIEzuvdM1keRi8mGc/8LbBrbfWJjGGSKN5PfJggpJOFmzc8L5CB PSQILgbHeYV22T6xLuO7xDwIpu4iOT7pgifyK3xBoLmvUkLYykrw4ZAbjQ7OAUlogwDz PkOelni0f1GB8DCgyZuITXzIjke8GqIjkEAvSBOA/3TYq2ry+qxyvO1jQMvO1wqn8q6L BewuijkFBtR61aW6Z/VxiNfUu9+tu9kfUHbqz2RTBcFiF6m4HQB8aLRJVGjY9a/o1Udw J0pQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=Wv84ulHBLNw4Uf5oxYsoMX+Mv7LdyizqK6mgHY/q9Lg=; b=WQeXGqTULwO6iLrk2C8Cdtd+rreD+i+EVTj3QPYpQEKM49soPiLlPjJUwcoi96zvJ9 mpN7r6bzz4JlZyxSFRT0ns/lyxmgXyy/ccI9AemRYONO1jNP5NGyyOer4OqrwH/VA390 9RnGHxLV3F2hxCiGdxJxmVh7H+BgoUjNNlJJJbrbuvcUFzPiy3nakg5gaXgsmzM3iABP S5gJmmTYEHliWQmH446YaYDi5y40D79SQFdiEdRQwZRLRnmP3p4jjcolujRSyl3GAreG VvUoxU6PBc2GDvQFt1+cKgGW6aQLoRQav+GlVDzJkdb4xCcMxeIpyfi+OXc3If2xPZmX WxrA== X-Gm-Message-State: AOAM532mALDjH/xn6c6gBaG7qX3fHRA1hv2X5Gz31li4x7UhRMHdkKwS 9aYmcOVpcborn3qhjwRZEeSu1Tz1mMpwmAqgZb4yDQ== X-Google-Smtp-Source: ABdhPJwdB7oDA/Uqj1bSF0wZ3zvwcMHPhTJTdpSbPzhoZ35h4LBovlO0Tm+FCn284QnywH5X/aUMaAJcxfFfhuNcVeE= X-Received: by 2002:a1c:e382:: with SMTP id a124mr3687596wmh.96.1595941396813; Tue, 28 Jul 2020 06:03:16 -0700 (PDT) MIME-Version: 1.0 References: <9ac309938e18a55c1c48d3520fe51a61f3c09b1f.1594230107.git-series.maxime@cerno.tech> In-Reply-To: <9ac309938e18a55c1c48d3520fe51a61f3c09b1f.1594230107.git-series.maxime@cerno.tech> From: Dave Stevenson Date: Tue, 28 Jul 2020 14:03:00 +0100 Message-ID: Subject: Re: [PATCH v4 53/78] drm/vc4: hdmi: Add PHY init and disable function To: Maxime Ripard 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: Tim Gover , LKML , DRI Development , bcm-kernel-feedback-list@broadcom.com, Nicolas Saenz Julienne , Phil Elwell , linux-arm-kernel@lists.infradead.org, linux-rpi-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Maxime On Wed, 8 Jul 2020 at 18:43, Maxime Ripard wrote: > > The HDMI PHY in the BCM2711 HDMI controller is significantly more > complicated to setup than in the older BCM283x SoCs. > > Let's add hooks to enable and disable the PHY. > > Signed-off-by: Maxime Ripard Reviewed-by: Dave Stevenson > --- > drivers/gpu/drm/vc4/Makefile | 1 + > drivers/gpu/drm/vc4/vc4_hdmi.c | 14 +++++++------- > drivers/gpu/drm/vc4/vc4_hdmi.h | 13 +++++++++++++ > drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 25 +++++++++++++++++++++++++ > 4 files changed, 46 insertions(+), 7 deletions(-) > create mode 100644 drivers/gpu/drm/vc4/vc4_hdmi_phy.c > > diff --git a/drivers/gpu/drm/vc4/Makefile b/drivers/gpu/drm/vc4/Makefile > index b303703bc7f3..d0163e18e9ca 100644 > --- a/drivers/gpu/drm/vc4/Makefile > +++ b/drivers/gpu/drm/vc4/Makefile > @@ -12,6 +12,7 @@ vc4-y := \ > vc4_kms.o \ > vc4_gem.o \ > vc4_hdmi.o \ > + vc4_hdmi_phy.o \ > vc4_vec.o \ > vc4_hvs.o \ > vc4_irq.o \ > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index 80bc3dd9d4a8..068041145d1c 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -321,7 +321,9 @@ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder) > > HDMI_WRITE(HDMI_RAM_PACKET_CONFIG, 0); > > - HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0xf << 16); > + if (vc4_hdmi->variant->phy_disable) > + vc4_hdmi->variant->phy_disable(vc4_hdmi); > + > HDMI_WRITE(HDMI_VID_CTL, > HDMI_READ(HDMI_VID_CTL) & ~VC4_HD_VID_CTL_ENABLE); > > @@ -381,12 +383,8 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) > if (vc4_hdmi->variant->reset) > vc4_hdmi->variant->reset(vc4_hdmi); > > - /* PHY should be in reset, like > - * vc4_hdmi_encoder_disable() does. > - */ > - HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0xf << 16); > - > - HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0); > + if (vc4_hdmi->variant->phy_init) > + vc4_hdmi->variant->phy_init(vc4_hdmi, mode); > > if (debug_dump_regs) { > struct drm_printer p = drm_info_printer(&vc4_hdmi->pdev->dev); > @@ -1433,6 +1431,8 @@ static const struct vc4_hdmi_variant bcm2835_variant = { > > .init_resources = vc4_hdmi_init_resources, > .reset = vc4_hdmi_reset, > + .phy_init = vc4_hdmi_phy_init, > + .phy_disable = vc4_hdmi_phy_disable, > }; > > static const struct of_device_id vc4_hdmi_dt_match[] = { > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h > index 17a30589f39c..32c80161c786 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.h > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h > @@ -21,6 +21,8 @@ to_vc4_hdmi_encoder(struct drm_encoder *encoder) > return container_of(encoder, struct vc4_hdmi_encoder, base.base); > } > > +struct drm_display_mode; > + > struct vc4_hdmi; > struct vc4_hdmi_register; > > @@ -38,6 +40,13 @@ struct vc4_hdmi_variant { > > /* Callback to reset the HDMI block */ > void (*reset)(struct vc4_hdmi *vc4_hdmi); > + > + /* Callback to initialize the PHY according to the mode */ > + void (*phy_init)(struct vc4_hdmi *vc4_hdmi, > + struct drm_display_mode *mode); > + > + /* Callback to disable the PHY */ > + void (*phy_disable)(struct vc4_hdmi *vc4_hdmi); > }; > > /* HDMI audio information */ > @@ -95,4 +104,8 @@ encoder_to_vc4_hdmi(struct drm_encoder *encoder) > return container_of(_encoder, struct vc4_hdmi, encoder); > } > > +void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi, > + struct drm_display_mode *mode); > +void vc4_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi); > + > #endif /* _VC4_HDMI_H_ */ > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_phy.c b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c > new file mode 100644 > index 000000000000..5a1746877bb5 > --- /dev/null > +++ b/drivers/gpu/drm/vc4/vc4_hdmi_phy.c > @@ -0,0 +1,25 @@ > +// SPDX-License-Identifier: GPL-2.0 > +/* > + * Copyright (C) 2015 Broadcom > + * Copyright (c) 2014 The Linux Foundation. All rights reserved. > + * Copyright (C) 2013 Red Hat > + * Author: Rob Clark > + */ > + > +#include "vc4_hdmi.h" > +#include "vc4_hdmi_regs.h" > + > +void vc4_hdmi_phy_init(struct vc4_hdmi *vc4_hdmi, struct drm_display_mode *mode) > +{ > + /* PHY should be in reset, like > + * vc4_hdmi_encoder_disable() does. > + */ > + > + HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0xf << 16); > + HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0); > +} > + > +void vc4_hdmi_phy_disable(struct vc4_hdmi *vc4_hdmi) > +{ > + HDMI_WRITE(HDMI_TX_PHY_RESET_CTL, 0xf << 16); > +} > -- > git-series 0.9.1 _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel