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,URIBL_BLOCKED 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 AA870C47076 for ; Fri, 21 May 2021 17:39: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 7264D613EC for ; Fri, 21 May 2021 17:39:43 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7264D613EC 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 CD8646E1F9; Fri, 21 May 2021 17:39:42 +0000 (UTC) Received: from mail-wm1-x32f.google.com (mail-wm1-x32f.google.com [IPv6:2a00:1450:4864:20::32f]) by gabe.freedesktop.org (Postfix) with ESMTPS id 9B0A36E1F9 for ; Fri, 21 May 2021 17:39:41 +0000 (UTC) Received: by mail-wm1-x32f.google.com with SMTP id z19-20020a7bc7d30000b029017521c1fb75so7866599wmk.0 for ; Fri, 21 May 2021 10:39:41 -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=/PGMSdzY46rRUuH9CGjzhpvBKwl08kAKQs9u+i9AHgw=; b=Nn/JXXpzFSUUF64vgcRuuSVXe/enfhqmlOCjKV5fks10W3PXjnVsUKNxAZt2HMHBNP wp1MYjFhmTKcFLOLG8SjGSwkRr/JmWL2ygPv97tNoCrECDCzHaxms1bNUwOc2dBrG3yA dwrN2LsP9pod4hYOFhawoiW8PNKgurFDMx3m+vJCAciOjFkSzs4QR1/8Ao6FKSuR9VnQ hT/AQU6r8/9UNqBRPIJW4Wp+Oomm9NrER4XqbAOs4p2GLScxEUkSP1OvV8S1qMHAW1nX AuOzbK/cC9MOhbsgp6XnaF1p//DBJAUkCQvlZY6Wca1KMeo0SOwrWrmiKl8kT0lp9JG9 J35w== 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=/PGMSdzY46rRUuH9CGjzhpvBKwl08kAKQs9u+i9AHgw=; b=RrN/65AP13mu1D2a6y81R5GFwcan8MNLTl+CBFfnjavpOeaW9nnfZrF27a8LHKNK9t V5y7eoLCGuiexTjscvll4dYARI8pA7t+iCZU6fxNImK4jp95obRUNhM63wB/ZXSfg1GZ XmvdtiHg9QFRYiORmWEjh9acEEpVZjdH99pfwxq4xUGrnuCB9UScO6PpQrRInMIOQggb gT0O/1kqvriwZKuw553AJEs81IQeLViMDhjI5PWGi3Ek6kTYtl2qPo4kQMrWVAyPGbHH PBB2jCzSSjW7omfYiyQL2dFawRJVOd3ZF+Bj0itsc6M/iEY7/18L2HgAmrZFCit+PnMe irlQ== X-Gm-Message-State: AOAM532OqMQq2iThWnB3tsoZF9CE70LT51L3WxpWs54vjb6x9Q+9HEpy QFHdd4oMOzqbqjt3Y51ErkWaGPx5x8Qv+t8Z5Xv4Ag== X-Google-Smtp-Source: ABdhPJwke9Zo9x6GRI6kIxAFqdYIOumj7qPq/rLlobM00C2kSpIwb3CzB9F4uxA+c0nJd0BrRD2oN1At/JeLDi7s6FA= X-Received: by 2002:a7b:cbc2:: with SMTP id n2mr10189003wmi.116.1621618780301; Fri, 21 May 2021 10:39:40 -0700 (PDT) MIME-Version: 1.0 References: <20210507150515.257424-1-maxime@cerno.tech> <20210507150515.257424-11-maxime@cerno.tech> In-Reply-To: <20210507150515.257424-11-maxime@cerno.tech> From: Dave Stevenson Date: Fri, 21 May 2021 18:39:24 +0100 Message-ID: Subject: Re: [PATCH v4 10/12] drm/vc4: hdmi: Enable the scrambler To: Maxime Ripard 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: , Cc: Nicolas Saenz Julienne , Dom Cobley , Tim Gover , David Airlie , LKML , DRI Development , bcm-kernel-feedback-list@broadcom.com, linux-rpi-kernel@lists.infradead.org, Thomas Zimmermann , Daniel Vetter , Phil Elwell Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Hi Maxime On Fri, 7 May 2021 at 16:06, Maxime Ripard wrote: > > The HDMI controller on the BCM2711 includes a scrambler in order to > reach the HDMI 2.0 modes that require it. Let's add the support for it. > > Acked-by: Thomas Zimmermann > Signed-off-by: Maxime Ripard Reviewed-by: Dave Stevenson > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 64 +++++++++++++++++++++++++++++ > drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 3 ++ > 2 files changed, 67 insertions(+) > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index 01d24ce8a795..bda12fea0dce 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -35,6 +35,7 @@ > #include > #include > #include > +#include > #include > #include > #include > @@ -76,6 +77,8 @@ > #define VC5_HDMI_VERTB_VSPO_SHIFT 16 > #define VC5_HDMI_VERTB_VSPO_MASK VC4_MASK(29, 16) > > +#define VC5_HDMI_SCRAMBLER_CTL_ENABLE BIT(0) > + > #define VC5_HDMI_DEEP_COLOR_CONFIG_1_INIT_PACK_PHASE_SHIFT 8 > #define VC5_HDMI_DEEP_COLOR_CONFIG_1_INIT_PACK_PHASE_MASK VC4_MASK(10, 8) > > @@ -462,6 +465,64 @@ static void vc4_hdmi_set_infoframes(struct drm_encoder *encoder) > vc4_hdmi_set_audio_infoframe(encoder); > } > > +static bool vc4_hdmi_supports_scrambling(struct drm_encoder *encoder, > + struct drm_display_mode *mode) > +{ > + struct vc4_hdmi_encoder *vc4_encoder = to_vc4_hdmi_encoder(encoder); > + struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); > + struct drm_display_info *display = &vc4_hdmi->connector.display_info; > + > + if (!vc4_encoder->hdmi_monitor) > + return false; > + > + if (!display->hdmi.scdc.supported || > + !display->hdmi.scdc.scrambling.supported) > + return false; > + > + return true; > +} > + > +static void vc4_hdmi_enable_scrambling(struct drm_encoder *encoder) > +{ > + struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > + struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); > + > + if (!vc4_hdmi_supports_scrambling(encoder, mode)) > + return; > + > + if (!vc4_hdmi_mode_needs_scrambling(mode)) > + return; > + > + drm_scdc_set_high_tmds_clock_ratio(vc4_hdmi->ddc, true); > + drm_scdc_set_scrambling(vc4_hdmi->ddc, true); > + > + HDMI_WRITE(HDMI_SCRAMBLER_CTL, HDMI_READ(HDMI_SCRAMBLER_CTL) | > + VC5_HDMI_SCRAMBLER_CTL_ENABLE); > +} > + > +static void vc4_hdmi_disable_scrambling(struct drm_encoder *encoder) > +{ > + struct vc4_hdmi *vc4_hdmi = encoder_to_vc4_hdmi(encoder); > + struct drm_crtc *crtc = encoder->crtc; > + > + /* > + * At boot, encoder->crtc will be NULL. Since we don't know the > + * state of the scrambler and in order to avoid any > + * inconsistency, let's disable it all the time. > + */ > + if (crtc && !vc4_hdmi_supports_scrambling(encoder, &crtc->mode)) > + return; > + > + if (crtc && !vc4_hdmi_mode_needs_scrambling(&crtc->mode)) > + return; > + > + HDMI_WRITE(HDMI_SCRAMBLER_CTL, HDMI_READ(HDMI_SCRAMBLER_CTL) & > + ~VC5_HDMI_SCRAMBLER_CTL_ENABLE); > + > + drm_scdc_set_scrambling(vc4_hdmi->ddc, false); > + drm_scdc_set_high_tmds_clock_ratio(vc4_hdmi->ddc, false); > +} > + > static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder, > struct drm_atomic_state *state) > { > @@ -474,6 +535,8 @@ static void vc4_hdmi_encoder_post_crtc_disable(struct drm_encoder *encoder, > > HDMI_WRITE(HDMI_VID_CTL, > HDMI_READ(HDMI_VID_CTL) | VC4_HD_VID_CTL_BLANKPIX); > + > + vc4_hdmi_disable_scrambling(encoder); > } > > static void vc4_hdmi_encoder_post_crtc_powerdown(struct drm_encoder *encoder, > @@ -924,6 +987,7 @@ static void vc4_hdmi_encoder_post_crtc_enable(struct drm_encoder *encoder, > } > > vc4_hdmi_recenter_fifo(vc4_hdmi); > + vc4_hdmi_enable_scrambling(encoder); > } > > static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h > index e1b58eac766f..19d2fdc446bc 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi_regs.h > +++ b/drivers/gpu/drm/vc4/vc4_hdmi_regs.h > @@ -100,6 +100,7 @@ enum vc4_hdmi_field { > HDMI_RM_FORMAT, > HDMI_RM_OFFSET, > HDMI_SCHEDULER_CONTROL, > + HDMI_SCRAMBLER_CTL, > HDMI_SW_RESET_CONTROL, > HDMI_TX_PHY_CHANNEL_SWAP, > HDMI_TX_PHY_CLK_DIV, > @@ -238,6 +239,7 @@ static const struct vc4_hdmi_register __maybe_unused vc5_hdmi_hdmi0_fields[] = { > VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x178), > VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x17c), > VC4_HDMI_REG(HDMI_HOTPLUG, 0x1a8), > + VC4_HDMI_REG(HDMI_SCRAMBLER_CTL, 0x1c4), > > VC5_DVP_REG(HDMI_CLOCK_STOP, 0x0bc), > VC5_DVP_REG(HDMI_VEC_INTERFACE_XBAR, 0x0f0), > @@ -317,6 +319,7 @@ static const struct vc4_hdmi_register __maybe_unused vc5_hdmi_hdmi1_fields[] = { > VC4_HDMI_REG(HDMI_GCP_CONFIG, 0x178), > VC4_HDMI_REG(HDMI_GCP_WORD_1, 0x17c), > VC4_HDMI_REG(HDMI_HOTPLUG, 0x1a8), > + VC4_HDMI_REG(HDMI_SCRAMBLER_CTL, 0x1c4), > > VC5_DVP_REG(HDMI_CLOCK_STOP, 0x0bc), > VC5_DVP_REG(HDMI_VEC_INTERFACE_XBAR, 0x0f0), > -- > 2.31.1 >