From nobody Fri Dec 19 19:32:12 2025 Received: from mail-pf1-f171.google.com (mail-pf1-f171.google.com [209.85.210.171]) (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 EEAAD1F63F9 for ; Mon, 26 May 2025 09:29:26 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748251769; cv=none; b=TRTSWRd5aATWyFHWrgiHk6wVAgobfLgjrP1Uxk0LXO4oki9JVUjv9GJ2duAi/klmrZpyMcuw0irEghvCpTCvf6FADW6Y7dOEtzKbNvxYyV47o2oAXNEEznHz7iNW47v6DjdaUSKhti1aKV7JsJEJJ53Leg1v3eskeyfoY9nSzy0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748251769; c=relaxed/simple; bh=e1upM+aOdYliO/dIh1k3i/FkzXto3qmBjVI/19UomkE=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=h7t2nXBk0QL5PQECOsqIJFSJnQ6z7MPe9NcgudiGDjjQ9wBA+8QH5C+h05qEWI5lgvZJ6sJqj6rOMRsPnKgh7PvJruLL6N6zoAOGoNmNaerQRTXubEgrF0b6W0jaOTidGIy9BARnFkYqLjXqB9vo7E7cleuo6JdqVEL1Iktwqt8= 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=O1DfsBJn; arc=none smtp.client-ip=209.85.210.171 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="O1DfsBJn" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-73bf5aa95e7so1382665b3a.1 for ; Mon, 26 May 2025 02:29:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748251766; x=1748856566; 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=a6pBDEEcTuBgbm817Rj3tBVeinNfrDQuQQunJdnxKqw=; b=O1DfsBJnPWD4QXawsI8/O/oYpg04Wu1owXirz8BgXwUKIFD2WxErfSkC4OA5xfRxGQ XlrtE+gJ0GWWGf+lT+5P+oT2FEQfLERqlEqH3YCxfaarlDfPuMbB+u0HnFAGbOq4kFRh KA5EevM88FKaDX/iXKuDYRHAVRrnJxD+g8DoNT4cbXF9nbIpm4V3deHkFL+2e70HUDGt u38b+bVzJ9GDIs64G1FzV5pTbMKc1lxUqcxaS6xpdxhkrj2NmYzdH9I57+OXzzG5JrsP BWUTp89c71TsQbDWT9wyLs+nkVwtrNgetrEpfHq+Jt56GFKzDbk98/e/vjPAlU56BqMl cLCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748251766; x=1748856566; 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=a6pBDEEcTuBgbm817Rj3tBVeinNfrDQuQQunJdnxKqw=; b=FIPmdxRA1nQXwkWLq6g/8b154qg0QWq7xwsgOFtnJYdPCeBYu2ylM9XvzkhqRvRlad ZUFcKuI5HVI0eg4L+ai7Ptu0SvJelk6ASbbN9T/vvKh1oOfjMK5wPYLjRTK05ZOJAIRB XXESBKq2otNWMPPGQceWY+vkVtbZ9o+2vjdrZT50Jx0JVVDl9gxBSjzW+IqN2OQrYxpo eCSYY1t135amGO5s1YEOzuA5lYitf0iKgL0Ijb7AUtSgUaC/f7HuLzHXkCMyDq9EFM7C teqt6DgJaJE1QJSfNIwVBUmS0mgILmyU6WTvtWPM+xxM53Bz2cj/xzK5CUrXrVfbzLp0 HZnA== X-Forwarded-Encrypted: i=1; AJvYcCVV0W9ldEhuqG8+DgVJKjvNK+XhMRtez7aUbL9F5QJLKKNHx9YiZ4bOU60giumfrJXtV2nk5+IPUVV/c+w=@vger.kernel.org X-Gm-Message-State: AOJu0YyXG5NqV/BrOTZzMcDvs+kzeioRyeNFAPh+Btjgf5BM5LAgjuVL ZV3zHpyrG3+4lNKYnqa2xrFUbJpiv81ahmws6kH67ZZyODrntZI+8FhxzaOTpWcIraE= X-Gm-Gg: ASbGncumK3HVZPs1oviVSb81EqBvaaQuyQepILEDZ1+9pWWZWSIWnPpauY4RQhOHzVr JySnfCtNd8E8NoTKToK8dPXLe4z6hTxfc5powAtCJtXxwwWoT1Mw8+a9JLcI6i3BWKOWI5MP2mz aWdt620o6t+HinVR6Tz2sEMsr0qrWfW/gWBsmLmNY6bcYyX3UPzbqGwhfr9mJaSthGAEkESLTG3 bGZ9CSokY87rziZCyhcMINyVe8X1k8I+PRV3HdnZr8/NOooaPBLLVU5pwNMspWOOlt9Etdd2eZA 147ABiuEN2Oo4D0X34WDuJzTjOWXtJnRuJzTgh/ddDRTRlm2Pg== X-Google-Smtp-Source: AGHT+IGBU2+X9RIttwmFp1d909ftMCV8QM76oVtcLcEN6kaVIzpX9cZHgBQ1cN8l9hiL0Bv/OYUGjQ== X-Received: by 2002:a05:6a00:3e20:b0:740:5977:7efd with SMTP id d2e1a72fcca58-745fe01b292mr10482210b3a.13.1748251766134; Mon, 26 May 2025 02:29:26 -0700 (PDT) Received: from [127.0.1.1] ([104.234.225.11]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-742a9876e62sm17162393b3a.147.2025.05.26.02.29.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 May 2025 02:29:25 -0700 (PDT) From: Jun Nie Date: Mon, 26 May 2025 17:28:26 +0800 Subject: [PATCH v10 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: <20250526-v6-15-quad-pipe-upstream-v10-8-5fed4f8897c4@linaro.org> References: <20250526-v6-15-quad-pipe-upstream-v10-0-5fed4f8897c4@linaro.org> In-Reply-To: <20250526-v6-15-quad-pipe-upstream-v10-0-5fed4f8897c4@linaro.org> To: Rob Clark , Abhinav Kumar , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter , Jessica Zhang , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , Dmitry Baryshkov 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=1748251705; l=1716; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=e1upM+aOdYliO/dIh1k3i/FkzXto3qmBjVI/19UomkE=; b=UpshzwdRDHpc47WYogNvfnNWELf2045T5glAjSaMOQFc1v4LPx/qXu6iDqlflfI4UaZIUNLrf LWewYmH4X4FBtOCHV5q9qhM+SL745aQSzrwfrU/kXib3L9aLVxNH4V+ 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 be8102691b99d3b381476ff844ddfd28fe17dc7c..8b6fa7ef78e2c0fb38daef9090d= bf747c7ba111d 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; @@ -2377,7 +2378,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