From patchwork Thu Jul 15 06:51:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vinod Koul X-Patchwork-Id: 477405 Delivered-To: patch@linaro.org Received: by 2002:a02:c94a:0:0:0:0:0 with SMTP id u10csp1409034jao; Wed, 14 Jul 2021 23:53:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzz57ZlUeCz/Qxjuv5xRf67G5mFbVYImWV0NxjPcJ4kt1KqjNyaBa8zsGQiiPzMopQt2BOO X-Received: by 2002:a17:90a:de15:: with SMTP id m21mr2858551pjv.87.1626331983424; Wed, 14 Jul 2021 23:53:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1626331983; cv=none; d=google.com; s=arc-20160816; b=0E8lXQenVI2zCQyRm80MsaAOEGGrdZLksLYwL9w680iUIkzhz4TCNzIQIBO70gImFB NCm+nc74fOVGXAhnSUiM3uq5dQZ1bExLcFBq0aZab9pcy0qNF1QtFYs5WqITaLTnfXm1 w3546y/hctIaO8ogFIauipwTVi0SfiySphYk5IDNmGhGloWEZHREBHT9vfwe/Iig1Ws8 Zoiqe6untz+ixSOlug+iucIIWu6IPxrax3ss73y30+hUo3o/tbBfIBYrwzc4XZoa3rlc C3O8JKhL1YPla0vo5KC55NBEzGaBHRKTkmVSRzcZYs81lTBdqpf9jtUU5QIkDIzM1Gdx /caw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature:delivered-to; bh=yKhi9Y+j+58vNKs5gdiD4+iMiE1rTHx66dIq7jmxw7s=; b=cWCOhRlyAHIvVxBg48Mqk4QIwqGiogriHxS6Jhqn7vLv5n4jTJN2XgGBopdwgGKkru cRFr5hp9YOu9Heewyp8GJrS+THWTWljvAMGFULMmLWP2WTCdidtzDd18x3gnlIH0wHda eNy18xMoDLu8D7QyHpKs/LdUfRWORj0+QE2GU9GGJ6YpqDFQlYmaWmgXMthY4Gr7TFtn 7TcxEUPYrNYewBTEWu4Eh5Ddu+9o8oxQ46goacSeqh6Dg8qw30q8n1skQa7vKSbtIUzK 2HHenfIptrqjxfRFB3BS7Jqe9BaFm7QS5A70iT+wny8nJPgtEW9fAWcmINwg3ENCbWlU A+9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=W5P9Jpbo; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from gabe.freedesktop.org (gabe.freedesktop.org. [2610:10:20:722:a800:ff:fe36:1795]) by mx.google.com with ESMTPS id y131si6947343pfc.61.2021.07.14.23.53.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 14 Jul 2021 23:53:03 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) client-ip=2610:10:20:722:a800:ff:fe36:1795; Authentication-Results: mx.google.com; dkim=fail header.i=@kernel.org header.s=k20201202 header.b=W5P9Jpbo; spf=pass (google.com: best guess record for domain of dri-devel-bounces@lists.freedesktop.org designates 2610:10:20:722:a800:ff:fe36:1795 as permitted sender) smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F6296E570; Thu, 15 Jul 2021 06:53:02 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1FDB76E560; Thu, 15 Jul 2021 06:53:01 +0000 (UTC) Received: by mail.kernel.org (Postfix) with ESMTPSA id 8FBA661362; Thu, 15 Jul 2021 06:52:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1626331981; bh=CDDjlRWbVZRE4NnRUPDsU2UDqaddBsl69oBwoC4xRSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=W5P9JpboF9bpba3cEqGWx5BcIwUD6QGq4x/N4C5kfcWDiORE07QMLIN0dw4w2FMZs /cGyA7rWLYX0FJ7dd5XFVl+EOtUnP2qM7FQeXqIa/wYdQfXtd5G6yLz+zNn6+A/YuE cwCAFZ/vW4bbD6aXlWoC+WutBsjbzcMPm84J59JO6DWnMnm+poNJ9I5l42UZJFhtRK dJpCiYfvcQpcmnUTm8tRPWuQTB7izk5tYTh2fFT+DyuGiCKzTSDbL0uyPf0SloQEMU HJOBCeDJ6QU8MwPGIFWVHnbDu78V/yp/2r4ccMS2r/JfiQ2T7ll5PyqQ3xGTuEWwXv N4RG/mvatuMuA== From: Vinod Koul To: Rob Clark Subject: [PATCH 07/11] drm/msm/disp/dpu1: Don't use DSC with mode_3d Date: Thu, 15 Jul 2021 12:21:59 +0530 Message-Id: <20210715065203.709914-8-vkoul@kernel.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715065203.709914-1-vkoul@kernel.org> References: <20210715065203.709914-1-vkoul@kernel.org> MIME-Version: 1.0 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: Jonathan Marek , Jeffrey Hugo , David Airlie , linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org, Abhinav Kumar , Bjorn Andersson , Vinod Koul , dri-devel@lists.freedesktop.org, Dmitry Baryshkov , freedreno@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" We cannot enable mode_3d when we are using the DSC. So pass configuration to detect DSC is enabled and not enable mode_3d when we are using DSC We add a helper dpu_encoder_helper_get_dsc_mode() to detect dsc enabled and pass this to .setup_intf_cfg() Signed-off-by: Vinod Koul --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 11 +++++++++++ drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 2 ++ drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 5 +++-- drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 2 ++ 4 files changed, 18 insertions(+), 2 deletions(-) -- 2.31.1 diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h index ecbc4be98980..d43b804528eb 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h @@ -336,6 +336,17 @@ static inline enum dpu_3d_blend_mode dpu_encoder_helper_get_3d_blend_mode( return BLEND_3D_NONE; } +static inline bool dpu_encoder_helper_get_dsc_mode(struct dpu_encoder_phys *phys_enc) +{ + struct drm_encoder *drm_enc = phys_enc->parent; + struct msm_drm_private *priv = drm_enc->dev->dev_private; + + if (priv->dsc) + return true; + + return false; +} + /** * dpu_encoder_helper_split_config - split display configuration helper function * This helper function may be used by physical encoders to configure diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c index b2be39b9144e..5fe87881c30c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c @@ -69,6 +69,8 @@ static void _dpu_encoder_phys_cmd_update_intf_cfg( intf_cfg.intf_mode_sel = DPU_CTL_MODE_SEL_CMD; intf_cfg.stream_sel = cmd_enc->stream_sel; intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); + intf_cfg.dsc = dpu_encoder_helper_get_dsc_mode(phys_enc); + ctl->ops.setup_intf_cfg(ctl, &intf_cfg); } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c index aeea6add61ee..f059416311ee 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c @@ -121,7 +121,7 @@ static u32 dpu_hw_ctl_get_pending_flush(struct dpu_hw_ctl *ctx) return ctx->pending_flush_mask; } -static inline void dpu_hw_ctl_trigger_flush_v1(struct dpu_hw_ctl *ctx) +static void dpu_hw_ctl_trigger_flush_v1(struct dpu_hw_ctl *ctx) { DPU_REG_WRITE(&ctx->hw, CTL_DSC_FLUSH, BIT(0) | BIT(1) | BIT(2) | BIT(3)); @@ -522,7 +522,8 @@ static void dpu_hw_ctl_intf_cfg(struct dpu_hw_ctl *ctx, intf_cfg |= (cfg->intf & 0xF) << 4; - if (cfg->mode_3d) { + /* In DSC we can't set merge, so check for dsc too */ + if (cfg->mode_3d && !cfg->dsc) { intf_cfg |= BIT(19); intf_cfg |= (cfg->mode_3d - 0x1) << 20; } diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h index 806c171e5df2..347a653c1e01 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h @@ -39,6 +39,7 @@ struct dpu_hw_stage_cfg { * @mode_3d: 3d mux configuration * @merge_3d: 3d merge block used * @intf_mode_sel: Interface mode, cmd / vid + * @dsc: DSC is enabled * @stream_sel: Stream selection for multi-stream interfaces */ struct dpu_hw_intf_cfg { @@ -46,6 +47,7 @@ struct dpu_hw_intf_cfg { enum dpu_3d_blend_mode mode_3d; enum dpu_merge_3d merge_3d; enum dpu_ctl_mode_sel intf_mode_sel; + bool dsc; int stream_sel; };