From patchwork Wed Jun 21 16:18:17 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuogee Hsieh X-Patchwork-Id: 111179 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4497208vqr; Wed, 21 Jun 2023 09:39:22 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7BDyd3TeXB6Tuujh4RUHiNBNW02L5FUnZTgTbTyDGlSeXZnXjZkIi1EfNFCNf32NZpFXMb X-Received: by 2002:a05:6a21:118c:b0:119:5af7:7cd2 with SMTP id oj12-20020a056a21118c00b001195af77cd2mr5218176pzb.24.1687365562547; Wed, 21 Jun 2023 09:39:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687365562; cv=none; d=google.com; s=arc-20160816; b=cKKgOcRJkYybsH12az7eFX6qttfPTyoFY18+5E6SbJEPAAa04LM5rUI/LCKR0Q+VM5 ZaNRjizLSikYvuPT5aIv9tjC0dNXabHV6s4Gq/aWRUkAQ0kQo6UL7G+NJ6+QdrcEq2lB nsTeHFuuFR4CfSAX4Ei3n7+J1vS34nm1KHuwtPk5/42Noqtkm3oZ43CPwJt4DDGCGAOW o0Fp+lN2Ob+ZSw/SXK/F0EThwyrwuQYvqSLoU4Ft7XI/t+rCsnoGxOulMa8cHJxtyIHJ RQbQmwWRcMCfRGvsFNu8DWYPFHKMFlPAHFGGHf8+A7sAW6PNKp5Zxgjq4LGmZI63aflz uciw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=iqtkAwvDCbWBA5edxtCHmZqTGJT6c+wSzqnyC0bQvg0=; b=Fod/RZMnBjFt7va1n2YalgRbdY0s975Ig+cI+UbzXpiUtfvaukio82uN0RbNxuGjkq dkgXqxNtKhbHWPLRgOB6e+L9y3X4RzeM0Q/MAN/zpqM/Lb07HbNVZmw6JvCkTpKHKwm9 o24X074c1yO851+EQ1K7sVUQXziMZ2ctbIvf7HiHfF3I9JWFuS/SyqZWtu7FDtiqlHda n/36ddEL5/OF6wpyI2W0oeXHQXK71pzAgcwmIFhV7iA9tpa1OTFZF5YxqbCi2BDc6miM vYFfDslC6aH0vo7KbgRvLLbRSesWzmKG1fWquW2hpwzVkjTZk5KRkSlTWP1G9aOQ4+lR qGbw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=U2tII5OI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id g28-20020aa79f1c000000b0065bbe39e1b3si730429pfr.146.2023.06.21.09.39.10; Wed, 21 Jun 2023 09:39:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=U2tII5OI; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231789AbjFUQTD (ORCPT + 99 others); Wed, 21 Jun 2023 12:19:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45024 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231936AbjFUQSw (ORCPT ); Wed, 21 Jun 2023 12:18:52 -0400 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 41F8E1995; Wed, 21 Jun 2023 09:18:45 -0700 (PDT) Received: from pps.filterd (m0279869.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35L98COq001260; Wed, 21 Jun 2023 16:18:36 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=iqtkAwvDCbWBA5edxtCHmZqTGJT6c+wSzqnyC0bQvg0=; b=U2tII5OIOdZbPgmSS+ArhdDLHAZPR8cvumMqgFEhbTQk9RSxYGS9UJY3aanEo6wxFq/m PaYUx2Li0VOCkkifQwpSRlgxCrUvCiDo64zYqEc8fmVHRZ6mlA7LDxj3RVlhuH6OJV5p UY0JCrPo8n0Dl4UGJ4sT5VYTFex1uK4ogXpGyfc35Oi6v57JFESmFdA00sqWWcDpHD5P 8WvFZNQnNBVOfYsfzJkIV511GklgOjahVwB7y6740sMUnxT7qKcggRIFiNwSyKtI8zBN W5HA4pKmZBijaTRPHt8+ZR9GySumFK5D+zet8tGS4hfrjtlxekyaGI5uJPzdr1dNh+lt Vg== Received: from nalasppmta04.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3rbwvm9325-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Jun 2023 16:18:36 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA04.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 35LGIZDS003093 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Jun 2023 16:18:35 GMT Received: from khsieh-linux1.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Wed, 21 Jun 2023 09:18:34 -0700 From: Kuogee Hsieh To: , , , , , , , , , , CC: Kuogee Hsieh , , , , , , , Subject: [PATCH v4 1/2] drm/msm/dpu: retrieve DSI DSC struct through priv->dsi[0] Date: Wed, 21 Jun 2023 09:18:17 -0700 Message-ID: <1687364298-29430-2-git-send-email-quic_khsieh@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1687364298-29430-1-git-send-email-quic_khsieh@quicinc.com> References: <1687364298-29430-1-git-send-email-quic_khsieh@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: OnCnWuacwiOzEYkEenrGVIel2maB-vGk X-Proofpoint-GUID: OnCnWuacwiOzEYkEenrGVIel2maB-vGk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-21_09,2023-06-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 suspectscore=0 adultscore=0 mlxlogscore=828 malwarescore=0 spamscore=0 mlxscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 clxscore=1015 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306210137 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769331032401480442?= X-GMAIL-MSGID: =?utf-8?q?1769331032401480442?= Currently DSI DSC struct is populated at display setup during system bootup. This mechanism works fine with embedded display but not for pluggable displays as the DSC struct will become stale once external display unplugged. Move storing of DSI DSC struct to both atomic_mode_set() and atomic_enable() so that same mechanism will work for both embedded display and pluggable displays. Changes in v4: -- fix checkpatch.pl warning Signed-off-by: Kuogee Hsieh --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 30 +++++++++++++++++++++++++---- 1 file changed, 26 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 2e1873d..367d374 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -543,11 +543,24 @@ bool dpu_encoder_use_dsc_merge(struct drm_encoder *drm_enc) return (num_dsc > 0) && (num_dsc > intf_count); } +static struct drm_dsc_config *dpu_encoder_get_dsc_config(struct drm_encoder *drm_enc) +{ + struct msm_drm_private *priv = drm_enc->dev->dev_private; + struct dpu_encoder_virt *dpu_enc = to_dpu_encoder_virt(drm_enc); + int index = dpu_enc->disp_info.h_tile_instance[0]; + + if (dpu_enc->disp_info.intf_type == INTF_DSI) + return msm_dsi_get_dsc_config(priv->dsi[index]); + + return NULL; +} + static struct msm_display_topology dpu_encoder_get_topology( struct dpu_encoder_virt *dpu_enc, struct dpu_kms *dpu_kms, struct drm_display_mode *mode, - struct drm_crtc_state *crtc_state) + struct drm_crtc_state *crtc_state, + struct drm_dsc_config *dsc) { struct msm_display_topology topology = {0}; int i, intf_count = 0; @@ -579,7 +592,7 @@ static struct msm_display_topology dpu_encoder_get_topology( topology.num_intf = intf_count; - if (dpu_enc->dsc) { + if (dsc) { /* * In case of Display Stream Compression (DSC), we would use * 2 DSC encoders, 2 layer mixers and 1 interface @@ -605,6 +618,7 @@ static int dpu_encoder_virt_atomic_check( struct drm_display_mode *adj_mode; struct msm_display_topology topology; struct dpu_global_state *global_state; + struct drm_dsc_config *dsc; int i = 0; int ret = 0; @@ -640,7 +654,9 @@ static int dpu_encoder_virt_atomic_check( } } - topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode, crtc_state); + dsc = dpu_encoder_get_dsc_config(drm_enc); + + topology = dpu_encoder_get_topology(dpu_enc, dpu_kms, adj_mode, crtc_state, dsc); /* * Release and Allocate resources on every modeset @@ -1056,6 +1072,8 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, trace_dpu_enc_mode_set(DRMID(drm_enc)); + dpu_enc->dsc = dpu_encoder_get_dsc_config(drm_enc); + /* Query resource that have been reserved in atomic check step. */ num_pp = dpu_rm_get_assigned_resources(&dpu_kms->rm, global_state, drm_enc->base.id, DPU_HW_BLK_PINGPONG, hw_pp, @@ -1187,6 +1205,8 @@ static void dpu_encoder_virt_atomic_enable(struct drm_encoder *drm_enc, dpu_enc = to_dpu_encoder_virt(drm_enc); + dpu_enc->dsc = dpu_encoder_get_dsc_config(drm_enc); + mutex_lock(&dpu_enc->enc_lock); cur_mode = &dpu_enc->base.crtc->state->adjusted_mode; @@ -2109,8 +2129,10 @@ void dpu_encoder_helper_phys_cleanup(struct dpu_encoder_phys *phys_enc) phys_enc->hw_pp->merge_3d->idx); } - if (dpu_enc->dsc) + if (dpu_enc->dsc) { dpu_encoder_unprep_dsc(dpu_enc); + dpu_enc->dsc = NULL; + } intf_cfg.stream_sel = 0; /* Don't care value for video mode */ intf_cfg.mode_3d = dpu_encoder_helper_get_3d_blend_mode(phys_enc); From patchwork Wed Jun 21 16:18:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuogee Hsieh X-Patchwork-Id: 111192 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp4503791vqr; Wed, 21 Jun 2023 09:51:49 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ7s0/U0toG7t1uSPfc1PdtAG+hvbOv3nsMWOFKTfSbhlSR+y1RXqnq7YtuoYgZaZgw3nxYa X-Received: by 2002:a05:6a20:1614:b0:116:fd37:c924 with SMTP id l20-20020a056a20161400b00116fd37c924mr20220264pzj.5.1687366309105; Wed, 21 Jun 2023 09:51:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687366309; cv=none; d=google.com; s=arc-20160816; b=hjJ9SUyUkbOBmauBdt9DY5/Q9qqlvHPL+vyu4mAzh9E5RtfbhKKTvP+iAQBjyMUts8 kSay0Fm6NX+yNWCtW8S2iOvh5iQ19TFAFrh3LSSblGSKkmL2FKD9kz7KYJKB+aoB7Vw0 vfq0LrCKNAkh5Oj8yAz02bnIJ7bw73pAJe1h1k6VBag7bTbyjv8Fo1cqpxGkkU563bm2 xHiHQqSO8mFzfzLIAIKJRqHBrdwhaXZWdd/KffSA8brtih6BNdxpBwP0QVDcTm8SNfd2 pglYqE/lpapWu6CtRIMlLfNvuzUBQGQcWHn4qOrnqxzV5gz+IocX8dhvQhytcL20bZF4 +kDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=N+ogiUao7Bp/W8lNJcM4un6D3KVQmus59zlHkCPdW6Y=; b=UmGj06dRlX7eybU/XyYGjmkZbR5wbDvf3pxeeBz9++uzaErcTjaN+0pA7mgtM0Rzrl FBJ4HRICQ/UjGdOiU4CzzrEtlcChZuXpf9nq5/xae9jH8hsIN8WtgCQ9aXssX3yUyxYE aol5JgFZneW4fsF94rAqOVYxsQGusxLMnZR/Oa7reQAk1ltbL6118KUeoyYL2X4R511v GCsuk9HLNCcn5CWKiBI3iTBT2fSeyGpAWJN1OaAD9uc/T45pRxyWKP/lcdQTA5l2I+UE D9vX4nd+ROrqkDBFEln5Y/wr/tVD/VaVooND6lE+JJNt4jDcjNgVR2hMBNT4YKKpRi70 nMWg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=ASs9LFHq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id l76-20020a633e4f000000b0053fb768afc8si1005694pga.748.2023.06.21.09.51.36; Wed, 21 Jun 2023 09:51:49 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@quicinc.com header.s=qcppdkim1 header.b=ASs9LFHq; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=quicinc.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231800AbjFUQTI (ORCPT + 99 others); Wed, 21 Jun 2023 12:19:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45206 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232052AbjFUQTA (ORCPT ); Wed, 21 Jun 2023 12:19:00 -0400 Received: from mx0a-0031df01.pphosted.com (mx0a-0031df01.pphosted.com [205.220.168.131]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 2C1A1198B; Wed, 21 Jun 2023 09:18:55 -0700 (PDT) Received: from pps.filterd (m0279862.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 35LG5U4T024001; Wed, 21 Jun 2023 16:18:37 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=quicinc.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=qcppdkim1; bh=N+ogiUao7Bp/W8lNJcM4un6D3KVQmus59zlHkCPdW6Y=; b=ASs9LFHq3w3pR4QEMe82rqKUkvXA7FG8GrASj7OtekPcQpVFvEJp2UHqk5ps4YLrDqjQ eS3zeqof6yLAdnG5xS+tgYnpbIsw3pFBWE7yPEjgChD3kthQG0z+n7TC6Q1P/adFrciC fRbDMh7HQ6F4sd3K/WnwmsPYw4fOthebXdT5Hv3/FfRCe/JHSP7zWWum6kxv+1Y2rMBw ydNfmbfSng1N/JGT7kS6GpOFexSRtBTEtJJL8quTVPS525Yz9g94jYNAjGJzPY8dyV4k cYvbUaJNSVMRg1pubkjXwzSk9tBlz0Yr0hyQEdB9u0C+NPfcxde8IuHVsmj0Ts0l6ISx ug== Received: from nalasppmta03.qualcomm.com (Global_NAT1.qualcomm.com [129.46.96.20]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 3rc2rcgbbt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Jun 2023 16:18:37 +0000 Received: from nalasex01a.na.qualcomm.com (nalasex01a.na.qualcomm.com [10.47.209.196]) by NALASPPMTA03.qualcomm.com (8.17.1.5/8.17.1.5) with ESMTPS id 35LGIaKB020268 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 21 Jun 2023 16:18:36 GMT Received: from khsieh-linux1.qualcomm.com (10.80.80.8) by nalasex01a.na.qualcomm.com (10.47.209.196) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.42; Wed, 21 Jun 2023 09:18:36 -0700 From: Kuogee Hsieh To: , , , , , , , , , , CC: Kuogee Hsieh , , , , , , , Subject: [PATCH v4 2/2] drm/msm/dpu: remove struct drm_dsc_config from struct msm_display_info Date: Wed, 21 Jun 2023 09:18:18 -0700 Message-ID: <1687364298-29430-3-git-send-email-quic_khsieh@quicinc.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1687364298-29430-1-git-send-email-quic_khsieh@quicinc.com> References: <1687364298-29430-1-git-send-email-quic_khsieh@quicinc.com> MIME-Version: 1.0 X-Originating-IP: [10.80.80.8] X-ClientProxiedBy: nasanex01b.na.qualcomm.com (10.46.141.250) To nalasex01a.na.qualcomm.com (10.47.209.196) X-QCInternal: smtphost X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=5800 signatures=585085 X-Proofpoint-ORIG-GUID: P3opeti0G4I8030bFPK9uxA15vRyjozw X-Proofpoint-GUID: P3opeti0G4I8030bFPK9uxA15vRyjozw X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.591,FMLib:17.11.176.26 definitions=2023-06-21_09,2023-06-16_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 bulkscore=0 priorityscore=1501 mlxscore=0 spamscore=0 impostorscore=0 adultscore=0 suspectscore=0 clxscore=1015 lowpriorityscore=0 mlxlogscore=999 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2305260000 definitions=main-2306210137 X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE, SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769331814747779501?= X-GMAIL-MSGID: =?utf-8?q?1769331814747779501?= Since struct drm_dsc_config is stored at atomic_mode_set() instead of display setup time during bootup, saving struct drm_dsc_config at struct msm_display_info is not necessary. Lets drop the dsc member from struct msm_display_info. Changes in v4: -- fix "Since" at commit text Signed-off-by: Kuogee Hsieh Reviewed-by: Dmitry Baryshkov --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 2 -- drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 2 -- 3 files changed, 6 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c index 367d374..b68610e 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -2313,8 +2313,6 @@ 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; - 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 90e1925..4c05fd5 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h @@ -28,7 +28,6 @@ * @is_cmd_mode Boolean to indicate if the CMD mode is requested * @is_te_using_watchdog_timer: Boolean to indicate watchdog TE is * used instead of panel TE in cmd mode panels - * @dsc: DSC configuration data for DSC-enabled displays */ struct msm_display_info { enum dpu_intf_type intf_type; @@ -36,7 +35,6 @@ 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; }; /** diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c index 613384b..5e77e09 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c @@ -544,8 +544,6 @@ static int _dpu_kms_initialize_dsi(struct drm_device *dev, info.is_cmd_mode = msm_dsi_is_cmd_mode(priv->dsi[i]); - info.dsc = msm_dsi_get_dsc_config(priv->dsi[i]); - encoder = dpu_encoder_init(dev, DRM_MODE_ENCODER_DSI, &info); if (IS_ERR(encoder)) { DPU_ERROR("encoder init failed for dsi display\n");