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 C6117C433FB for ; Mon, 20 Jul 2020 12:53:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A5BA022D0A for ; Mon, 20 Jul 2020 12:53:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="XMr3JBFS" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728739AbgGTMxk (ORCPT ); Mon, 20 Jul 2020 08:53:40 -0400 Received: from m43-7.mailgun.net ([69.72.43.7]:46880 "EHLO m43-7.mailgun.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728937AbgGTMxj (ORCPT ); Mon, 20 Jul 2020 08:53:39 -0400 DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1595249618; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=v+0tMXMjPF0v6Zo7fVwuealkongPDcDk/5yQe/+UCM4=; b=XMr3JBFSHe/0MGQffIZnZ9WKnEigMWJiH72TavdVV/ZAv7PaDYfpxZmtuj1/exnlJXbdK/Q/ +7CuD1FPp+M/0NfiYibOtfqRsXz18ts+pPu/RKzY7nkL+vdoE2vOsuv6lSEHwJRl36ZhXpPl S62k++RSPQqOpUXzvh9jSRcIpyg= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyI1MzIzYiIsICJsaW51eC1hcm0tbXNtQHZnZXIua2VybmVsLm9yZyIsICJiZTllNGEiXQ== Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n14.prod.us-east-1.postgun.com with SMTP id 5f1593d265270fa595b961d5 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 20 Jul 2020 12:53:38 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id DF7DAC43395; Mon, 20 Jul 2020 12:53:36 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: kalyan_t) by smtp.codeaurora.org (Postfix) with ESMTPSA id E8144C433C9; Mon, 20 Jul 2020 12:53:35 +0000 (UTC) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit Date: Mon, 20 Jul 2020 18:23:35 +0530 From: kalyan_t@codeaurora.org To: Rob Clark Cc: dri-devel@lists.freedesktop.org, Rob Clark , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Sam Ravnborg , David Airlie , Steev Klimaszewski , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Doug Anderson , Stephen Boyd , Zheng Bin , Daniel Vetter , Drew Davenport , Sean Paul , open list Subject: Re: [Freedreno] [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm In-Reply-To: <20200715221955.3209856-1-robdclark@gmail.com> References: <20200715221955.3209856-1-robdclark@gmail.com> Message-ID: <92c9e9d08dfa014f1589186a68902de7@codeaurora.org> X-Sender: kalyan_t@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 Sender: linux-arm-msm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-arm-msm@vger.kernel.org On 2020-07-16 03:49, Rob Clark wrote: > From: Rob Clark > > If split-lm is used (for ex, on sdm845), we can have multiple ping- > pongs, but only a single phys encoder. We need to configure dithering > on each of them. > > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 22 ++++++++++--------- > .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +-- > 2 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > index 46df0ff75b85..9b98b63c77fb 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -212,14 +212,14 @@ static u32 dither_matrix[DITHER_MATRIX_SZ] = { > 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10 > }; > > -static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys) > +static void _dpu_encoder_setup_dither(struct dpu_hw_pingpong *hw_pp, > unsigned bpc) > { > struct dpu_hw_dither_cfg dither_cfg = { 0 }; > > - if (!phys->hw_pp || !phys->hw_pp->ops.setup_dither) > + if (!hw_pp->ops.setup_dither) > return; > > - switch (phys->connector->display_info.bpc) { > + switch (bpc) { > case 6: > dither_cfg.c0_bitdepth = 6; > dither_cfg.c1_bitdepth = 6; > @@ -228,14 +228,14 @@ static void _dpu_encoder_setup_dither(struct > dpu_encoder_phys *phys) > dither_cfg.temporal_en = 0; > break; > default: > - phys->hw_pp->ops.setup_dither(phys->hw_pp, NULL); > + hw_pp->ops.setup_dither(hw_pp, NULL); > return; > } > > memcpy(&dither_cfg.matrix, dither_matrix, > sizeof(u32) * DITHER_MATRIX_SZ); > > - phys->hw_pp->ops.setup_dither(phys->hw_pp, &dither_cfg); > + hw_pp->ops.setup_dither(hw_pp, &dither_cfg); > } > > void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys > *phys_enc, > @@ -1132,11 +1132,13 @@ static void > _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc) > > _dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info); > > - if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) { > - for (i = 0; i < dpu_enc->num_phys_encs; i++) { > - struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; > - > - _dpu_encoder_setup_dither(phys); > + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI && > + !WARN_ON(dpu_enc->num_phys_encs == 0)) { > + unsigned bpc = dpu_enc->phys_encs[0]->connector->display_info.bpc; > + for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) { > + if (!dpu_enc->hw_pp[i]) > + continue; > + _dpu_encoder_setup_dither(dpu_enc->hw_pp[i], bpc); > } > } > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > index 7411ab6bf6af..bea4ab5c58c5 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > @@ -231,8 +231,7 @@ static void _setup_pingpong_ops(struct > dpu_hw_pingpong *c, > c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr; > c->ops.get_line_count = dpu_hw_pp_get_line_count; > > - if (test_bit(DPU_PINGPONG_DITHER, &features) && > - IS_SC7180_TARGET(c->hw.hwversion)) > + if (test_bit(DPU_PINGPONG_DITHER, &features)) > c->ops.setup_dither = dpu_hw_pp_setup_dither; > }; Change looks good to me - Kalyan 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 EC98AC433E7 for ; Tue, 21 Jul 2020 08:18:49 +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 C348320720 for ; Tue, 21 Jul 2020 08:18:49 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg.codeaurora.org header.i=@mg.codeaurora.org header.b="fsPWC471" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C348320720 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=codeaurora.org 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 60D946E434; Tue, 21 Jul 2020 08:18:37 +0000 (UTC) Received: from m43-7.mailgun.net (m43-7.mailgun.net [69.72.43.7]) by gabe.freedesktop.org (Postfix) with ESMTPS id 49428892FD for ; Mon, 20 Jul 2020 12:53:39 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=mg.codeaurora.org; q=dns/txt; s=smtp; t=1595249619; h=Message-ID: References: In-Reply-To: Subject: Cc: To: From: Date: Content-Transfer-Encoding: Content-Type: MIME-Version: Sender; bh=v+0tMXMjPF0v6Zo7fVwuealkongPDcDk/5yQe/+UCM4=; b=fsPWC471Gox4uRiaqC5YLZXE5xqKrNIJH5xFhcf794qvc2vw3fJ046ySA0y0TGHwTvk/9Whb gQs4+FE1zwqZgkFPujS3ReaFl5PQ/aNJLkT1XM5JBUqpDPDejdA+bpccvGgJuj4kLI//3Z53 GsHCX+/4cMwiLE8U7BxkMagzQQU= X-Mailgun-Sending-Ip: 69.72.43.7 X-Mailgun-Sid: WyJkOTU5ZSIsICJkcmktZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnIiwgImJlOWU0YSJd Received: from smtp.codeaurora.org (ec2-35-166-182-171.us-west-2.compute.amazonaws.com [35.166.182.171]) by smtp-out-n20.prod.us-east-1.postgun.com with SMTP id 5f1593d2427cd55766151d27 (version=TLS1.2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256); Mon, 20 Jul 2020 12:53:38 GMT Received: by smtp.codeaurora.org (Postfix, from userid 1001) id CD3E8C433C6; Mon, 20 Jul 2020 12:53:37 +0000 (UTC) Received: from mail.codeaurora.org (localhost.localdomain [127.0.0.1]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: kalyan_t) by smtp.codeaurora.org (Postfix) with ESMTPSA id E8144C433C9; Mon, 20 Jul 2020 12:53:35 +0000 (UTC) MIME-Version: 1.0 Date: Mon, 20 Jul 2020 18:23:35 +0530 From: kalyan_t@codeaurora.org To: Rob Clark Subject: Re: [Freedreno] [PATCH] drm/msm/dpu: fix/enable 6bpc dither with split-lm In-Reply-To: <20200715221955.3209856-1-robdclark@gmail.com> References: <20200715221955.3209856-1-robdclark@gmail.com> Message-ID: <92c9e9d08dfa014f1589186a68902de7@codeaurora.org> X-Sender: kalyan_t@codeaurora.org User-Agent: Roundcube Webmail/1.3.9 X-Mailman-Approved-At: Tue, 21 Jul 2020 08:18:03 +0000 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: Rob Clark , David Airlie , "open list:DRM DRIVER FOR MSM ADRENO GPU" , "open list:DRM DRIVER FOR MSM ADRENO GPU" , Doug Anderson , dri-devel@lists.freedesktop.org, Stephen Boyd , Zheng Bin , Sean Paul , Steev Klimaszewski , Drew Davenport , Sam Ravnborg , open list Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 2020-07-16 03:49, Rob Clark wrote: > From: Rob Clark > > If split-lm is used (for ex, on sdm845), we can have multiple ping- > pongs, but only a single phys encoder. We need to configure dithering > on each of them. > > Signed-off-by: Rob Clark > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 22 ++++++++++--------- > .../gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 3 +-- > 2 files changed, 13 insertions(+), 12 deletions(-) > > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > index 46df0ff75b85..9b98b63c77fb 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -212,14 +212,14 @@ static u32 dither_matrix[DITHER_MATRIX_SZ] = { > 15, 7, 13, 5, 3, 11, 1, 9, 12, 4, 14, 6, 0, 8, 2, 10 > }; > > -static void _dpu_encoder_setup_dither(struct dpu_encoder_phys *phys) > +static void _dpu_encoder_setup_dither(struct dpu_hw_pingpong *hw_pp, > unsigned bpc) > { > struct dpu_hw_dither_cfg dither_cfg = { 0 }; > > - if (!phys->hw_pp || !phys->hw_pp->ops.setup_dither) > + if (!hw_pp->ops.setup_dither) > return; > > - switch (phys->connector->display_info.bpc) { > + switch (bpc) { > case 6: > dither_cfg.c0_bitdepth = 6; > dither_cfg.c1_bitdepth = 6; > @@ -228,14 +228,14 @@ static void _dpu_encoder_setup_dither(struct > dpu_encoder_phys *phys) > dither_cfg.temporal_en = 0; > break; > default: > - phys->hw_pp->ops.setup_dither(phys->hw_pp, NULL); > + hw_pp->ops.setup_dither(hw_pp, NULL); > return; > } > > memcpy(&dither_cfg.matrix, dither_matrix, > sizeof(u32) * DITHER_MATRIX_SZ); > > - phys->hw_pp->ops.setup_dither(phys->hw_pp, &dither_cfg); > + hw_pp->ops.setup_dither(hw_pp, &dither_cfg); > } > > void dpu_encoder_helper_report_irq_timeout(struct dpu_encoder_phys > *phys_enc, > @@ -1132,11 +1132,13 @@ static void > _dpu_encoder_virt_enable_helper(struct drm_encoder *drm_enc) > > _dpu_encoder_update_vsync_source(dpu_enc, &dpu_enc->disp_info); > > - if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI) { > - for (i = 0; i < dpu_enc->num_phys_encs; i++) { > - struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; > - > - _dpu_encoder_setup_dither(phys); > + if (dpu_enc->disp_info.intf_type == DRM_MODE_ENCODER_DSI && > + !WARN_ON(dpu_enc->num_phys_encs == 0)) { > + unsigned bpc = dpu_enc->phys_encs[0]->connector->display_info.bpc; > + for (i = 0; i < MAX_CHANNELS_PER_ENC; i++) { > + if (!dpu_enc->hw_pp[i]) > + continue; > + _dpu_encoder_setup_dither(dpu_enc->hw_pp[i], bpc); > } > } > } > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > index 7411ab6bf6af..bea4ab5c58c5 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c > @@ -231,8 +231,7 @@ static void _setup_pingpong_ops(struct > dpu_hw_pingpong *c, > c->ops.poll_timeout_wr_ptr = dpu_hw_pp_poll_timeout_wr_ptr; > c->ops.get_line_count = dpu_hw_pp_get_line_count; > > - if (test_bit(DPU_PINGPONG_DITHER, &features) && > - IS_SC7180_TARGET(c->hw.hwversion)) > + if (test_bit(DPU_PINGPONG_DITHER, &features)) > c->ops.setup_dither = dpu_hw_pp_setup_dither; > }; Change looks good to me - Kalyan _______________________________________________ dri-devel mailing list dri-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/dri-devel