From nobody Thu Sep 4 20:44:04 2025 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1032E267B01 for ; Mon, 28 Jul 2025 13:15:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753708536; cv=none; b=qXobmSIpNpVQktLoO0VGDgXhyswWBdu5Jhr0f5t58zNm+pFbdP8zdtAAr+yM3CNErd27v2Ja0oXg0BkXrSAs6zX75nVd50F3Bh0ROcCVOxLsmyz//3q9zHa8/kwwcgWIAdW5a/Ujt/ZzNcsFSUAFH3ymTDJOqvtBvAkYJFgzRMM= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1753708536; c=relaxed/simple; bh=EMexKmSgbyJrNm4fgVgmbAaex5tIopqSAoqfoqK2ahU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=DNdaRJNY5CrFIvM0+Iibx8tTF+u3efSqLMRcVvmkddnsQX3/iPdWllWQwxqiHrGo7j/Mr26O7vdCRL9+jBwWhtA4OoH9AhSNLczSi51fflqVDRFaM6hCiM+oJP4BIffAJ1pN8d7RJF9LWhgf5/5BWiWunJm6d8gUFYP/XE9tk64= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org; spf=pass smtp.mailfrom=linaro.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b=JtsnJDXz; arc=none smtp.client-ip=209.85.210.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linaro.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linaro.org header.i=@linaro.org header.b="JtsnJDXz" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-748feca4a61so2633162b3a.3 for ; Mon, 28 Jul 2025 06:15:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1753708534; x=1754313334; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=ILXciEgW0I//qoLe7GzIdmNaMHGieJ0bsFVXKGQw/3Y=; b=JtsnJDXzK3DubCNucdEPk0Y7JvNjptojQV0sb5T5T3k9NRqaEwGmJmHGZ2KlFANqLi 85ouy0v8lpsKPc6cnymU2+NGMihLIfXUfI1W1ZkXVvlWUNMBoO1u1yNx23MAHffea4rS 6xTJaoD37cdN9P/Y2284wolh5YD3aO78nzWyTPY7mISZFKIoa4fsl+IUPsSZapHDPsSp VPgkOj51Yc0Rf49P7pTFMM5VGojLoFYfFJnLOd9/vFpzNhwvJvuRwQvaLsBeuz96Skyc 8ssBISwHlkFmYEwOFvfoYDpMB+PfMlbBh+x/VoHrJF7bB/AMojw4/HZ31igfjhbG0WjI sO3Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1753708534; x=1754313334; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ILXciEgW0I//qoLe7GzIdmNaMHGieJ0bsFVXKGQw/3Y=; b=NCTjOc6LKbsPTYeCfULQ1OtLm5c9R3RM0wm8Cm6SY1/Mmxjnn83DznCRycr4X3ljt4 uD4QyPAqPBFp1Wj1kvK5UAQSoA8BP4+KuYm7J6m91pkjaO3YEeISf/tX/ALWuTt+wwdM 1LNgN/F3BS4NaGgeuIZM80ZLfyqM4S5CUsaKKPAXETglEvXRlvFe359jUEmMBO9P4hGo jgf3+PzJh6PQZ48GtcVzltSZbWOATQ9iOo8EKBIVLddFhHn0sU2lVIMrN9z6PbfjbRIv rwZWV3nHOvcCgNdgflgm18ab+s98ad0c3Wi+V1LpIHaJmJTrY7ta2p3WjgaSh0Go21mT C7/g== X-Forwarded-Encrypted: i=1; AJvYcCWivd0t8VYifJYa3ipNxeDeUS9IUYKv8BYdO2N4WdiUJi/9BFNKuERwVgs53CTqpcqYMTLh348+YuUZgLU=@vger.kernel.org X-Gm-Message-State: AOJu0Yy2PGfKrwNT0tKbLg1YYGO396ZQg2Oee7M+7tx6ab7uaL4SYr+Q N3Ba+AltqYIRKDio379Cvc1e1lMVsBgmRXQ4oW5AvFe7ZOTr8uogpDamcFJ5FWILzIc= X-Gm-Gg: ASbGncsIBfVlRahHl8Eb6h19c/O0pCi3GT3P2ulthg/VJoeS4BJ3gOJ/s6X7RUUwpa4 a6mQD9UwuGd7s7YMY3JQ38UVWe38VTOOAx1ehpOUlYPcRXUESwGBKhAmr86p9AHMs1UgsgFSg96 9hl87BMPork4xvx3FjPQySFKfLP+dk+kAEWpaKvr1Xa4Zzu8hcsmh4W+Nf3/qvtxoO9+q6Ec7YQ l3lhr5JzM5UuvUytY1CLMUPDrP1bfuC2Ki3dPSY6zdofyS48hRrGu0iVDdbpK841kX4SV61DzH1 CJF2KeHGcJ3Pk/kAPSE8HWHOjCt2UQwUXWfYX9aG9kbbS5tG1EK79nrwn4ApMh6YR4BR8r+W/3u DpmPUUKdW5Z1JKtnHMg== X-Google-Smtp-Source: AGHT+IElrHLNSRkpp4TakILrjVkGR3hmg5svUQ09qVc4AkdHMg4ce49+EeLlHcIrX1twXM5xf+MZYQ== X-Received: by 2002:a05:6a00:84d:b0:74c:efae:ffae with SMTP id d2e1a72fcca58-763345c684cmr16447602b3a.5.1753708532589; Mon, 28 Jul 2025 06:15:32 -0700 (PDT) Received: from [127.0.1.1] ([112.64.60.64]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-76408c0287fsm5590318b3a.47.2025.07.28.06.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 28 Jul 2025 06:15:32 -0700 (PDT) From: Jun Nie Date: Mon, 28 Jul 2025 21:14:32 +0800 Subject: [PATCH v13 08/12] drm/msm/dpu: Use dedicated WB number definition Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable Message-Id: <20250728-v6-16-rc2-quad-pipe-upstream-v13-8-954e4917fe4f@linaro.org> References: <20250728-v6-16-rc2-quad-pipe-upstream-v13-0-954e4917fe4f@linaro.org> In-Reply-To: <20250728-v6-16-rc2-quad-pipe-upstream-v13-0-954e4917fe4f@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jun Nie , Dmitry Baryshkov X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1753708472; l=1716; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=EMexKmSgbyJrNm4fgVgmbAaex5tIopqSAoqfoqK2ahU=; b=xe1ZNuk2g1U5vK3Ph3VfwdF2b6l7drvSd2mIRWLMeIWDq2L02tMs0TBCIuNmzVK6YMSZ5DLJG 4/13SEi/vvUB+fEMRFsAovtZCSEuvCFTCsIGTdwHQXd/zYCgDuRsLG8 X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= Currently MAX_CHANNELS_PER_ENC is defined as 2, because 2 channels are supported at most in one encoder. The case of 4 channels per encoder is to be added. To avoid breaking current WB usage case, use dedicated WB definition before 4 WB usage case is supported in future. Signed-off-by: Jun Nie Reviewed-by: Dmitry Baryshkov Reviewed-by: Jessica Zhang --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c b/drivers/gpu/drm/= msm/disp/dpu1/dpu_encoder.c index 2d88d9129ec787df6dac70e6f4488ab77c6aeeed..4616b360812491afbe63f8ffd4a= 57bc9604382e7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -56,6 +56,7 @@ (MAX_H_TILES_PER_DISPLAY * NUM_PHYS_ENCODER_TYPES) =20 #define MAX_CHANNELS_PER_ENC 2 +#define MAX_CWB_PER_ENC 2 =20 #define IDLE_SHORT_TIMEOUT 1 =20 @@ -182,7 +183,7 @@ struct dpu_encoder_virt { struct dpu_encoder_phys *cur_master; struct dpu_encoder_phys *cur_slave; struct dpu_hw_pingpong *hw_pp[MAX_CHANNELS_PER_ENC]; - struct dpu_hw_cwb *hw_cwb[MAX_CHANNELS_PER_ENC]; + struct dpu_hw_cwb *hw_cwb[MAX_CWB_PER_ENC]; struct dpu_hw_dsc *hw_dsc[MAX_CHANNELS_PER_ENC]; =20 unsigned int dsc_mask; @@ -2387,7 +2388,7 @@ void dpu_encoder_helper_phys_setup_cwb(struct dpu_enc= oder_phys *phys_enc, */ cwb_cfg.input =3D INPUT_MODE_LM_OUT; =20 - for (int i =3D 0; i < MAX_CHANNELS_PER_ENC; i++) { + for (int i =3D 0; i < MAX_CWB_PER_ENC; i++) { hw_cwb =3D dpu_enc->hw_cwb[i]; if (!hw_cwb) continue; --=20 2.34.1