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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id B1516C54EAA for ; Tue, 24 Jan 2023 15:07:00 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id E2F3F10E080; Tue, 24 Jan 2023 15:06:59 +0000 (UTC) Received: from mail-wm1-x32c.google.com (mail-wm1-x32c.google.com [IPv6:2a00:1450:4864:20::32c]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2A4EB10E080 for ; Tue, 24 Jan 2023 15:06:58 +0000 (UTC) Received: by mail-wm1-x32c.google.com with SMTP id bg13-20020a05600c3c8d00b003d9712b29d2so13053704wmb.2 for ; Tue, 24 Jan 2023 07:06:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:reply-to:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to; bh=7/EYg58ZEi6wo6vHWDJ74Nuw88AJuXUzyRDyPwYpunA=; b=wawGcYyIMtorBdGqsxAaApCCiA/YhFEoe7Sge0UQdtlURJIcyG5JaTKYEOkG7Eulwc JqqlAh77+vcOZSYbqXLJfLNA0rWXmetjECJ2Z832t8fztANv7g5TW+5rcYaVEPi958r0 cO7UYauV/JuesHawrR6ampiSpBfIP4oVUyMCg157BXuQGE1oJuw86qqcoNrPj9aySq3p ezLavg2y32H4+dDLbVj5u2wqRKwE8KapQWWblaApOKG7lHoAfyN73Tq+s0gEUFjzbk6E yR+7IihwWweUOJ30SQOAP8cQH0lqwqOGk7YvuaiRgQK9Hzf2BBfLGHHne+aH/P7krBhx 7TtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:in-reply-to:organization:from:references :cc:to:content-language:subject:reply-to:user-agent:mime-version :date:message-id:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=7/EYg58ZEi6wo6vHWDJ74Nuw88AJuXUzyRDyPwYpunA=; b=PQ9w/tUzEhhxRsno9G4lTn/+PKCUVpZ60d+lTWovUWgy9Yzu3k2RT475nFOKctky+H K0sAhOo5PKDvpoH17Qg4fcu+ZeDqiHRVCX+gYWfkCdFivAyzZjYjcW5YQhibDqHiNuo1 pQQNRivNC5crfQTNaXVTsYpzQdrEXkeK1A1UFvwT8etGs8th5/G9yMJ6hsRja1E8XMEl YsqFR0AQuuM2Vf57PwnxiN4KhBjT9ZMbeeTkdAmFAuuC8C760r0XhDSYOup9GMVz4Rom msPinOUFk7jq9h5McuswMpwAAL2PK94B/20Wyaw+yAVnmQokzidvH8UGzfWf53ad1EX+ nwtg== X-Gm-Message-State: AFqh2koamxZUE9ShWbgFeNdVxnaP2hRlZYSxGlQ3SFRJ3nXR377o4emi LepoXKMKFpPWgvI+/M2zpHIBaw== X-Google-Smtp-Source: AMrXdXvRnlFvQMkb7ZfpLZqBPgyj05m/eyNF8ULcjvlyjPNyNjXfbc5l1/dHhIZA9aTOOWwVKApo6w== X-Received: by 2002:a7b:ce15:0:b0:3da:2932:b61a with SMTP id m21-20020a7bce15000000b003da2932b61amr28118110wmc.18.1674572816066; Tue, 24 Jan 2023 07:06:56 -0800 (PST) Received: from ?IPV6:2a01:e0a:982:cbb0:ebd2:15b:f444:7985? ([2a01:e0a:982:cbb0:ebd2:15b:f444:7985]) by smtp.gmail.com with ESMTPSA id c40-20020a05600c4a2800b003db16770bc5sm13138509wmp.6.2023.01.24.07.06.54 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 24 Jan 2023 07:06:55 -0800 (PST) Message-ID: <986b49bd-6e97-107c-b3de-a04077e12ac4@linaro.org> Date: Tue, 24 Jan 2023 16:06:54 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.6.0 Subject: Re: [PATCH v1 09/14] drm/msm/dsi: export struct msm_compression_info to dpu encoder Content-Language: en-US To: Kuogee Hsieh , dri-devel@lists.freedesktop.org, robdclark@gmail.com, sean@poorly.run, swboyd@chromium.org, dianders@chromium.org, vkoul@kernel.org, daniel@ffwll.ch, airlied@gmail.com, agross@kernel.org, dmitry.baryshkov@linaro.org, andersson@kernel.org References: <1674498274-6010-1-git-send-email-quic_khsieh@quicinc.com> <1674498274-6010-10-git-send-email-quic_khsieh@quicinc.com> From: Neil Armstrong Organization: Linaro Developer Services In-Reply-To: <1674498274-6010-10-git-send-email-quic_khsieh@quicinc.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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: , Reply-To: neil.armstrong@linaro.org Cc: linux-arm-msm@vger.kernel.org, quic_sbillaka@quicinc.com, freedreno@lists.freedesktop.org, quic_abhinavk@quicinc.com, linux-kernel@vger.kernel.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" On 23/01/2023 19:24, Kuogee Hsieh wrote: > struct msm_compression_info is used to support several different > compression mechanisms. It also contains customized info required > to configure DSC encoder engine. This patch also make changes DSI > module to have DSI exports struct msm_compreion_info to dpu encoder > instead of struct drm_dsc_config. > > Signed-off-by: Kuogee Hsieh > --- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 7 +++++-- > drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 4 ++-- > drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 10 ++++++++-- > drivers/gpu/drm/msm/dsi/dsi.c | 3 ++- > drivers/gpu/drm/msm/dsi/dsi.h | 3 ++- > drivers/gpu/drm/msm/dsi/dsi_host.c | 14 ++++++++++++-- > drivers/gpu/drm/msm/msm_drv.h | 4 ++-- > 7 files changed, 33 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 758261e..7f4a439 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c > @@ -2,7 +2,7 @@ > /* > * Copyright (C) 2013 Red Hat > * Copyright (c) 2014-2018, 2020-2021 The Linux Foundation. All rights reserved. > - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. > + * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved. > * > * Author: Rob Clark > */ > @@ -210,6 +210,7 @@ struct dpu_encoder_virt { > > /* DSC configuration */ > struct drm_dsc_config *dsc; > + struct msm_compression_info *comp_info; > }; > > #define to_dpu_encoder_virt(x) container_of(x, struct dpu_encoder_virt, base) > @@ -2275,7 +2276,9 @@ static int dpu_encoder_setup_display(struct dpu_encoder_virt *dpu_enc, > dpu_enc->idle_pc_supported = > dpu_kms->catalog->caps->has_idle_pc; > > - dpu_enc->dsc = disp_info->dsc; > + dpu_enc->comp_info = disp_info->comp_info; > + if (dpu_enc->comp_info) > + dpu_enc->dsc = &dpu_enc->comp_info->msm_dsc_info.drm_dsc; > > mutex_lock(&dpu_enc->enc_lock); > for (i = 0; i < disp_info->num_of_h_tiles && !ret; i++) { > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > index 9e7236e..bd2da5e 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h > @@ -1,6 +1,6 @@ > /* SPDX-License-Identifier: GPL-2.0-only */ > /* > - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. > + * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved. > * Copyright (c) 2015-2018, The Linux Foundation. All rights reserved. > * Copyright (C) 2013 Red Hat > * Author: Rob Clark > @@ -36,7 +36,7 @@ struct msm_display_info { > uint32_t h_tile_instance[MAX_H_TILES_PER_DISPLAY]; > bool is_cmd_mode; > bool is_te_using_watchdog_timer; > - struct drm_dsc_config *dsc; > + struct msm_compression_info *comp_info; > }; > > /** > diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > index d612419..70a74ed 100644 > --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c > @@ -2,7 +2,7 @@ > /* > * Copyright (C) 2013 Red Hat > * Copyright (c) 2014-2018, The Linux Foundation. All rights reserved. > - * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved. > + * Copyright (c) 2022-2023, Qualcomm Innovation Center, Inc. All rights reserved. > * > * Author: Rob Clark > */ > @@ -570,7 +570,7 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, > info.h_tile_instance[info.num_of_h_tiles++] = i; > info.is_cmd_mode = msm_dsi_is_cmd_mode(priv->dsi[i]); > > - info.dsc = msm_dsi_get_dsc_config(priv->dsi[i]); > + info.comp_info = msm_dsi_get_dsc_config(priv->dsi[i]); This breaks DSC on DSI since before we had a pointer of the DSC struct that would be filled by the DSI driver later in pre_enable(), and now we have a copy of it before it is filled. Instead we should keep a pointer of the DSC struct in the comp_info, store the DP dsc struct in the dp panel private and pass the dsc pointer back in dp_panel_dsc_prepare_basic_params(). > > if (msm_dsi_is_bonded_dsi(priv->dsi[i]) && priv->dsi[other]) { > rc = msm_dsi_modeset_init(priv->dsi[other], dev, encoder); > @@ -622,6 +622,8 @@ static int _dpu_kms_initialize_displayport(struct drm_device *dev, > info.num_of_h_tiles = 1; > info.h_tile_instance[0] = i; > info.intf_type = encoder->encoder_type; > + info.is_cmd_mode = 0; /* dp always video mode */ > + info.comp_info = NULL; > rc = dpu_encoder_setup(dev, encoder, &info); > if (rc) { > DPU_ERROR("failed to setup DPU encoder %d: rc:%d\n", > @@ -892,6 +894,10 @@ static void dpu_kms_mdp_snapshot(struct msm_disp_state *disp_state, struct msm_k > > pm_runtime_get_sync(&dpu_kms->pdev->dev); > > + for (i = 0; i < cat->dsc_count; i++) > + msm_disp_snapshot_add_block(disp_state, cat->dsc[i].len, > + dpu_kms->mmio + cat->dsc[i].base, "dsc_%d", i); > + > /* dump CTL sub-blocks HW regs info */ > for (i = 0; i < cat->ctl_count; i++) > msm_disp_snapshot_add_block(disp_state, cat->ctl[i].len, > diff --git a/drivers/gpu/drm/msm/dsi/dsi.c b/drivers/gpu/drm/msm/dsi/dsi.c > index 31fdee2..52b7e33 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi.c > +++ b/drivers/gpu/drm/msm/dsi/dsi.c > @@ -1,6 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2015, The Linux Foundation. All rights reserved. > + * Copyright (c) 2023. Qualcomm Innovation Center, Inc. All rights reserved > */ > > #include "dsi.h" > @@ -13,7 +14,7 @@ bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi) > return !(host_flags & MIPI_DSI_MODE_VIDEO); > } > > -struct drm_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi) > +struct msm_compression_info *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi) > { > return msm_dsi_host_get_dsc_config(msm_dsi->host); > } > diff --git a/drivers/gpu/drm/msm/dsi/dsi.h b/drivers/gpu/drm/msm/dsi/dsi.h > index bd3763a..79ada54 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi.h > +++ b/drivers/gpu/drm/msm/dsi/dsi.h > @@ -1,6 +1,7 @@ > /* SPDX-License-Identifier: GPL-2.0-only */ > /* > * Copyright (c) 2015, The Linux Foundation. All rights reserved. > + * Copyright (c) 2023. Qualcomm Innovation Center, Inc. All rights reserved > */ > > #ifndef __DSI_CONNECTOR_H__ > @@ -133,7 +134,7 @@ int dsi_calc_clk_rate_v2(struct msm_dsi_host *msm_host, bool is_bonded_dsi); > int dsi_calc_clk_rate_6g(struct msm_dsi_host *msm_host, bool is_bonded_dsi); > void msm_dsi_host_snapshot(struct msm_disp_state *disp_state, struct mipi_dsi_host *host); > void msm_dsi_host_test_pattern_en(struct mipi_dsi_host *host); > -struct drm_dsc_config *msm_dsi_host_get_dsc_config(struct mipi_dsi_host *host); > +struct msm_compression_info *msm_dsi_host_get_dsc_config(struct mipi_dsi_host *host); > > /* dsi phy */ > struct msm_dsi_phy; > diff --git a/drivers/gpu/drm/msm/dsi/dsi_host.c b/drivers/gpu/drm/msm/dsi/dsi_host.c > index 18fa30e..6188f4b 100644 > --- a/drivers/gpu/drm/msm/dsi/dsi_host.c > +++ b/drivers/gpu/drm/msm/dsi/dsi_host.c > @@ -1,6 +1,7 @@ > // SPDX-License-Identifier: GPL-2.0-only > /* > * Copyright (c) 2015, The Linux Foundation. All rights reserved. > + * Copyright (c) 2023. Qualcomm Innovation Center, Inc. All rights reserved > */ > > #include > @@ -163,6 +164,7 @@ struct msm_dsi_host { > > struct drm_display_mode *mode; > struct drm_dsc_config *dsc; > + struct msm_compression_info comp_info; > > /* connected device info */ > unsigned int channel; > @@ -2600,9 +2602,17 @@ void msm_dsi_host_test_pattern_en(struct mipi_dsi_host *host) > DSI_TEST_PATTERN_GEN_CMD_STREAM0_TRIGGER_SW_TRIGGER); > } > > -struct drm_dsc_config *msm_dsi_host_get_dsc_config(struct mipi_dsi_host *host) > +struct msm_compression_info *msm_dsi_host_get_dsc_config(struct mipi_dsi_host *host) > { > struct msm_dsi_host *msm_host = to_msm_dsi_host(host); > + struct msm_compression_info *comp_info = NULL; > > - return msm_host->dsc; > + if (msm_host->dsc) { > + comp_info = &msm_host->comp_info; > + comp_info->msm_dsc_info.drm_dsc = *msm_host->dsc; > + comp_info->comp_type = MSM_DISPLAY_COMPRESSION_DSC; > + comp_info->enabled = true; > + } > + > + return comp_info; > } > diff --git a/drivers/gpu/drm/msm/msm_drv.h b/drivers/gpu/drm/msm/msm_drv.h > index 6a46ed7..eab0901 100644 > --- a/drivers/gpu/drm/msm/msm_drv.h > +++ b/drivers/gpu/drm/msm/msm_drv.h > @@ -430,7 +430,7 @@ void msm_dsi_snapshot(struct msm_disp_state *disp_state, struct msm_dsi *msm_dsi > bool msm_dsi_is_cmd_mode(struct msm_dsi *msm_dsi); > bool msm_dsi_is_bonded_dsi(struct msm_dsi *msm_dsi); > bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi); > -struct drm_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi); > +struct msm_compression_info *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi); > #else > static inline void __init msm_dsi_register(void) > { > @@ -460,7 +460,7 @@ static inline bool msm_dsi_is_master_dsi(struct msm_dsi *msm_dsi) > return false; > } > > -static inline struct drm_dsc_config *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi) > +static inline struct msm_compression_info *msm_dsi_get_dsc_config(struct msm_dsi *msm_dsi) > { > return NULL; > }