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=-10.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 8568AC433E2 for ; Fri, 4 Sep 2020 15:47:06 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (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 4EF7A206E7 for ; Fri, 4 Sep 2020 15:47:06 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="PePenJgz"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=raspberrypi.com header.i=@raspberrypi.com header.b="oFrwyne8" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4EF7A206E7 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=raspberrypi.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:To:Subject:Message-ID:Date:From:In-Reply-To: References:MIME-Version:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=JE1wGTU6aVB4lJPpU0oaAJ5bqrvr9hz7pWTAF01cp0I=; b=PePenJgzjgBcSW/5crsmuBjNr b8A8aAa/rYdItybkt2I9ovktjr0O+1suTy8PTdx6khiRnS1lIXb1YYuCA33v1p5+hXoHOsTheOe6U 8WFPOep6fx3IFjPWy/Vt/Rl3vT/SF8J6xx9aLbsqXwBCZGNJQhH0lHEYDf5tR2/fUBpe/NMiG5qcb VueFmPAhys1o07YWWhJMH6hd0qQhQ2pfhdATtVgFb3GBcfZNUHKCMFy+3rjvvGG2ccI4n1eAn5pnJ +EnMdhJM2NpvNNfOr5TaijyjnSEZMkbJwKyROpjMUBw2FFgneMck7vS/EQXjjL6mI/dnURkEDSu3i vtreq18qg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kEDuX-0007f3-Dn; Fri, 04 Sep 2020 15:45:57 +0000 Received: from mail-wm1-x344.google.com ([2a00:1450:4864:20::344]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kEDuS-0007cy-Ls for linux-arm-kernel@lists.infradead.org; Fri, 04 Sep 2020 15:45:53 +0000 Received: by mail-wm1-x344.google.com with SMTP id q9so6496175wmj.2 for ; Fri, 04 Sep 2020 08:45:52 -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=BWAhN7a+4874hzvxevYBZLVV3qk181dMhkmwcopVXuI=; b=oFrwyne8UjE4GXeuhjjOpVE9dYZzB2GlQAZCkFaOP1wA0cXqKCn7uoJJwGDObMHxPc dFLnAam23p6BBsCONYgBCS8Y3VSJ7EySoY4Fq5UoZy/F8Fn2lbfkkqBi1OjU/s5JCuEQ +UHKUniKfnrVglb99KDPOYVPapsE5nuHsbwWDUXY5kMUq5FTRJ89pfRug0hq4ZLwqTag kxJjyxhTh7qRPvOCRVNb+dWojAmEJ2ch1rJknyxyZUNQd2ZIZPR2hKHtF5EnNzeGSe5W 3LkwSplCw1X7pDUYAp/rmsDgjRmrze7FYppzpfhj7RhzMpSAeo+cHJAmHAAMamm/Yicg alXg== 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=BWAhN7a+4874hzvxevYBZLVV3qk181dMhkmwcopVXuI=; b=XOaXlmtK2in0/Ja1QcRM4s8dAVwoldKBZ76JHJqtpen7Kb422A3yJjSAQPWHSnPifF i4+DFH1m69NjVOSElUyp44JX2oCk2qmwT2Be8RkMRqyasga7wqBlUMk87MiOtWzGI4tq nY4e5mtoJjrsLtZS4mJkE6yG35LEX819BNqbYrwEJnJJ4VOQ1dK/znlo0vgz8cg2VXkD JoBuHE/x6Uk6u6294UNiXRUVd6F6nMB6/f3o4ZKU5ruM0LwZLWW5dg3rZ8mn3VFP+Crx lQdI5ZiA45E7BWTX/CiTJS7pti0wUWS+gZihwHPoebCF5hzRRdgFuihukS+b9DzN/6ro 8ixA== X-Gm-Message-State: AOAM530n7U1Fxi3zEK8hltX+eKzUcLmsKtCLUlc5KHI1h4kwfq1EGuqG bD7Xc+HEuwAqtDwqNQAk3xTMrDbMIQnVYkBvAo+flw== X-Google-Smtp-Source: ABdhPJzfjtKP7vZTuEflczNVPJm8Afz2ShaotHKRilLa7ZLCMiX8evx3ILz6Mx8pA1RbRMbqOuiZ+w5nytdpOD6GqG0= X-Received: by 2002:a1c:4303:: with SMTP id q3mr8102774wma.158.1599234351549; Fri, 04 Sep 2020 08:45:51 -0700 (PDT) MIME-Version: 1.0 References: <5c19bbf10153cb42ca0fb67e08606c8295c17236.1599120059.git-series.maxime@cerno.tech> In-Reply-To: <5c19bbf10153cb42ca0fb67e08606c8295c17236.1599120059.git-series.maxime@cerno.tech> From: Dave Stevenson Date: Fri, 4 Sep 2020 16:45:36 +0100 Message-ID: Subject: Re: [PATCH v5 55/80] drm/vc4: hdmi: Add a CSC setup callback To: Maxime Ripard X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200904_114552_769782_2F7373A3 X-CRM114-Status: GOOD ( 24.95 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Stefan Wahren , Tim Gover , Chanwoo Choi , LKML , DRI Development , Hoegeun Kwon , Eric Anholt , 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 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org Hi Maxime On Thu, 3 Sep 2020 at 09:03, Maxime Ripard wrote: > > Similarly to the previous patches, the CSC setup is slightly different in > the BCM2711 than in the previous generations. Let's add a callback for it. > > Tested-by: Chanwoo Choi > Tested-by: Hoegeun Kwon > Tested-by: Stefan Wahren > Signed-off-by: Maxime Ripard Reviewed-by: Dave Stevenson > --- > drivers/gpu/drm/vc4/vc4_hdmi.c | 70 +++++++++++++++++++++-------------- > drivers/gpu/drm/vc4/vc4_hdmi.h | 3 ++- > 2 files changed, 45 insertions(+), 28 deletions(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c > index c29376c3fd8a..532618e02399 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.c > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c > @@ -334,6 +334,41 @@ static void vc4_hdmi_encoder_disable(struct drm_encoder *encoder) > DRM_ERROR("Failed to release power domain: %d\n", ret); > } > > +static void vc4_hdmi_csc_setup(struct vc4_hdmi *vc4_hdmi, bool enable) > +{ > + u32 csc_ctl; > + > + csc_ctl = VC4_SET_FIELD(VC4_HD_CSC_CTL_ORDER_BGR, > + VC4_HD_CSC_CTL_ORDER); > + > + if (enable) { > + /* CEA VICs other than #1 requre limited range RGB > + * output unless overridden by an AVI infoframe. > + * Apply a colorspace conversion to squash 0-255 down > + * to 16-235. The matrix here is: > + * > + * [ 0 0 0.8594 16] > + * [ 0 0.8594 0 16] > + * [ 0.8594 0 0 16] > + * [ 0 0 0 1] > + */ > + csc_ctl |= VC4_HD_CSC_CTL_ENABLE; > + csc_ctl |= VC4_HD_CSC_CTL_RGB2YCC; > + csc_ctl |= VC4_SET_FIELD(VC4_HD_CSC_CTL_MODE_CUSTOM, > + VC4_HD_CSC_CTL_MODE); > + > + HDMI_WRITE(HDMI_CSC_12_11, (0x000 << 16) | 0x000); > + HDMI_WRITE(HDMI_CSC_14_13, (0x100 << 16) | 0x6e0); > + HDMI_WRITE(HDMI_CSC_22_21, (0x6e0 << 16) | 0x000); > + HDMI_WRITE(HDMI_CSC_24_23, (0x100 << 16) | 0x000); > + HDMI_WRITE(HDMI_CSC_32_31, (0x000 << 16) | 0x6e0); > + HDMI_WRITE(HDMI_CSC_34_33, (0x100 << 16) | 0x000); > + } > + > + /* The RGB order applies even when CSC is disabled. */ > + HDMI_WRITE(HDMI_CSC_CTL, csc_ctl); > +} > + > static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) > { > struct drm_display_mode *mode = &encoder->crtc->state->adjusted_mode; > @@ -357,7 +392,6 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) > mode->crtc_vsync_end - > interlaced, > VC4_HDMI_VERTB_VBP)); > - u32 csc_ctl; > int ret; > > ret = pm_runtime_get_sync(&vc4_hdmi->pdev->dev); > @@ -428,41 +462,20 @@ static void vc4_hdmi_encoder_enable(struct drm_encoder *encoder) > (vsync_pos ? 0 : VC4_HD_VID_CTL_VSYNC_LOW) | > (hsync_pos ? 0 : VC4_HD_VID_CTL_HSYNC_LOW)); > > - csc_ctl = VC4_SET_FIELD(VC4_HD_CSC_CTL_ORDER_BGR, > - VC4_HD_CSC_CTL_ORDER); > > if (vc4_encoder->hdmi_monitor && > - drm_default_rgb_quant_range(mode) == > - HDMI_QUANTIZATION_RANGE_LIMITED) { > - /* CEA VICs other than #1 requre limited range RGB > - * output unless overridden by an AVI infoframe. > - * Apply a colorspace conversion to squash 0-255 down > - * to 16-235. The matrix here is: > - * > - * [ 0 0 0.8594 16] > - * [ 0 0.8594 0 16] > - * [ 0.8594 0 0 16] > - * [ 0 0 0 1] > - */ > - csc_ctl |= VC4_HD_CSC_CTL_ENABLE; > - csc_ctl |= VC4_HD_CSC_CTL_RGB2YCC; > - csc_ctl |= VC4_SET_FIELD(VC4_HD_CSC_CTL_MODE_CUSTOM, > - VC4_HD_CSC_CTL_MODE); > + drm_default_rgb_quant_range(mode) == HDMI_QUANTIZATION_RANGE_LIMITED) { > + if (vc4_hdmi->variant->csc_setup) > + vc4_hdmi->variant->csc_setup(vc4_hdmi, true); > > - HDMI_WRITE(HDMI_CSC_12_11, (0x000 << 16) | 0x000); > - HDMI_WRITE(HDMI_CSC_14_13, (0x100 << 16) | 0x6e0); > - HDMI_WRITE(HDMI_CSC_22_21, (0x6e0 << 16) | 0x000); > - HDMI_WRITE(HDMI_CSC_24_23, (0x100 << 16) | 0x000); > - HDMI_WRITE(HDMI_CSC_32_31, (0x000 << 16) | 0x6e0); > - HDMI_WRITE(HDMI_CSC_34_33, (0x100 << 16) | 0x000); > vc4_encoder->limited_rgb_range = true; > } else { > + if (vc4_hdmi->variant->csc_setup) > + vc4_hdmi->variant->csc_setup(vc4_hdmi, false); > + > vc4_encoder->limited_rgb_range = false; > } > > - /* The RGB order applies even when CSC is disabled. */ > - HDMI_WRITE(HDMI_CSC_CTL, csc_ctl); > - > HDMI_WRITE(HDMI_FIFO_CTL, VC4_HDMI_FIFO_CTL_MASTER_SLAVE_N); > > if (debug_dump_regs) { > @@ -1430,6 +1443,7 @@ static const struct vc4_hdmi_variant bcm2835_variant = { > .num_registers = ARRAY_SIZE(vc4_hdmi_fields), > > .init_resources = vc4_hdmi_init_resources, > + .csc_setup = vc4_hdmi_csc_setup, > .reset = vc4_hdmi_reset, > .phy_init = vc4_hdmi_phy_init, > .phy_disable = vc4_hdmi_phy_disable, > diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.h b/drivers/gpu/drm/vc4/vc4_hdmi.h > index 950accbc44e4..c8fd58548ea2 100644 > --- a/drivers/gpu/drm/vc4/vc4_hdmi.h > +++ b/drivers/gpu/drm/vc4/vc4_hdmi.h > @@ -41,6 +41,9 @@ struct vc4_hdmi_variant { > /* Callback to reset the HDMI block */ > void (*reset)(struct vc4_hdmi *vc4_hdmi); > > + /* Callback to enable / disable the CSC */ > + void (*csc_setup)(struct vc4_hdmi *vc4_hdmi, bool enable); > + > /* Callback to initialize the PHY according to the mode */ > void (*phy_init)(struct vc4_hdmi *vc4_hdmi, > struct drm_display_mode *mode); > -- > git-series 0.9.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel