From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f182.google.com (mail-pl1-f182.google.com [209.85.214.182]) (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 BBF6D21CC6A for ; Tue, 19 Aug 2025 01:31:33 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.182 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755567095; cv=none; b=VZCwMt+u4X/icXH3f2ai5R4a6ZHOH6Q4MQPg6Eny444iuDphfG+MQ0bpLMKchVBMqkKREd1JUzIc2NqrSE8m2Tuiag0p0u1Hb7U5QWVkOKwlCrrUwJZxus6L2HdT3KMo+wvW48+YKiCbDtw3kqchPQBHUaZEXUGUJjLzLyjavu4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755567095; c=relaxed/simple; bh=flbnou7XSx1ETCmAxdlZnvB3+bqdNxru9LUU48yIE7A=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aTF1VWkjcbly+MnuQoQ2GZaNP7tfWmtv5jfwPbrnIGzFRSXCZAjIFDwmksI92ibzMH7HUo7hzOFa2KexeddrpwiUtxSLvXw4+z/9/FOexjDzNbv9WkHYUBr4zz0RGQbXvvP6IFWuBo+UlM5Q/PIuD06XeoQLJvWPe51Z1Kwr5yE= 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=eVruC54Q; arc=none smtp.client-ip=209.85.214.182 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="eVruC54Q" Received: by mail-pl1-f182.google.com with SMTP id d9443c01a7336-24457f5835dso50493115ad.0 for ; Mon, 18 Aug 2025 18:31:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755567093; x=1756171893; 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=gZKppSrZ04BhPYsPEMDVl7eb2YZ+sFy//28ARL2GCmc=; b=eVruC54QRbAK8emC0NJK7XQ8YBbnG/RjIK6AziZSD0910sRLQqY3NnxvKd0Ove5Zck 5NrfxfP7DGBz2slPexvpcAcQanDM/8ORv//iCxpaX7cOZiudmfxvtMtPex7/2eKTQ2VJ ieKIgE8fNXKYIoVIjaJo7M7h4E8bRJJEQHjKWPorSUKdk/A3iRaoPWTAynakB75JMW3N B8L2NTxUr0afVmVQyjcgz36C9DZpAZf2ONuocovfsAf7WRuDsTPUyCDMVUqqAT+6aw7G jPYRqDZjnnJlGPD1XarmMqKkwH9qUm9aCItWgxNa5Kh4L7JApptXfflbkqlj2D5SaIcU r/5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755567093; x=1756171893; 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=gZKppSrZ04BhPYsPEMDVl7eb2YZ+sFy//28ARL2GCmc=; b=xLYi2LDJZ828Z0Z7+GfU/oUloHs7OvPbWAmaKnifVDvUDHRbq1Lms18wu4TQpfAcLD 11JZTaZj6UXsBAGtp+BUpNlexSDP3xhofuK9gWFAMzZCjPRLpQTmF9s2tkPs+G6LWs2z 1va10Tpd/B4ckj7ThODZYO8bpo+x4KP+OPKi7NdoKmW/4CB+gWouDMyGRGkbM6JKXjA9 gkJ2eXcZ4KcCrA9k7OFhhiYoWx6UvqqsUV6CX6vAl9yVp+05XOvDDX8sDYgOhbIJ0Ysj YYgtinb0SCQ7/eECGtDBcmVomfzIM4k9fJo1qXI8jax3u5LMKGX6MrRIt8wBsudMo5bU azYQ== X-Gm-Message-State: AOJu0Yy7fp2p8UWWXgz0RfyN1W3MkM0S83Ll2l3MqYmIRsADgi+LgGis Sza33utmP4GNJlHb5BWgI3spNToHB2GmRrpqjGGRv8Wbt5QG5XqEC4cXI2RSAex0fjsamyO/YnK zHBWFEPc= X-Gm-Gg: ASbGncseUrWNLpms4GlaNFjEc5h3A2evwxMHsrNaiId19YgZic5LlMMdreXij6/FwXV SYjqMlKMFTLMp13I0j/TX/Ht5CTBeebC4msr/Y63ks5qcGpGmnE0aurTyR93jZB7bMngrhuPDEM gRXc+mOa9enaRDpPvaVKGsyoLxlEKdzO/KgEE1jlW5woIM9tvA576+FxDJYClXJxoc7URLREh6V qOmCVnqqg7za3XeAXuKYvubWgcRD1iVk16ecyUtKFzma/+EFSYiMITwcd+UTq+Km7Ssum8t14r4 0XlhUvsa054rimwP1LXLcTHOKFTqTo8bmv3kHoKvR/gIPzMLYWtALYLhG4CUNLH26uUuNw5kd5Q brGM8ls8zuFhQMZiHHg== X-Google-Smtp-Source: AGHT+IHVbtYW4RYQHQZZskiSfzFwAgdNTCMwz7Kd2QtknRvYYfJid2ZZhGW6Kqr8W4eOUL8j+y1ocw== X-Received: by 2002:a17:902:e5d1:b0:234:ed31:fca7 with SMTP id d9443c01a7336-245e04ca7b3mr10841685ad.48.1755567092833; Mon, 18 Aug 2025 18:31:32 -0700 (PDT) Received: from [127.0.1.1] ([112.64.60.64]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-3245e4faf80sm248637a91.5.2025.08.18.18.31.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Aug 2025 18:31:32 -0700 (PDT) From: Jun Nie Date: Tue, 19 Aug 2025 09:30:59 +0800 Subject: [PATCH v15 05/13] drm/msm/dpu: bind correct pingpong for quad pipe Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20250819-v6-16-rc2-quad-pipe-upstream-v15-5-2c7a85089db8@linaro.org> References: <20250819-v6-16-rc2-quad-pipe-upstream-v15-0-2c7a85089db8@linaro.org> In-Reply-To: <20250819-v6-16-rc2-quad-pipe-upstream-v15-0-2c7a85089db8@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=1755567061; l=1809; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=flbnou7XSx1ETCmAxdlZnvB3+bqdNxru9LUU48yIE7A=; b=tjVmr1icovhUDDSu+7xCILY21LeUOkpXcuU8bCCTs9359a8eqqh7Ucze0DQ59Ne0RsSEPBbFS W+ASKuucYSxDL8++f36loqo0PdDJ1JBQt26jhvadshdJAR+5eZCiEmL X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= There are 2 interfaces and 4 pingpong in quad pipe. Map the 2nd interface to 3rd PP instead of the 2nd PP. Signed-off-by: Jun Nie Reviewed-by: Dmitry Baryshkov Reviewed-by: Jessica Zhang --- drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 10 ++++++++-- 1 file changed, 8 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 b476d3c97ac9b6b4c5ca2963aa4a5805d57c8d7e..2d88d9129ec787df6dac70e6f4488ab77c6aeeed 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1158,7 +1158,7 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, struct dpu_hw_blk *hw_ctl[MAX_CHANNELS_PER_ENC]; struct dpu_hw_blk *hw_dsc[MAX_CHANNELS_PER_ENC]; struct dpu_hw_blk *hw_cwb[MAX_CHANNELS_PER_ENC]; - int num_ctl, num_pp, num_dsc; + int num_ctl, num_pp, num_dsc, num_pp_per_intf; int num_cwb = 0; bool is_cwb_encoder; unsigned int dsc_mask = 0; @@ -1237,10 +1237,16 @@ static void dpu_encoder_virt_atomic_mode_set(struct drm_encoder *drm_enc, dpu_enc->cur_master->hw_cdm = hw_cdm ? to_dpu_hw_cdm(hw_cdm) : NULL; } + /* + * There may be 4 PP and 2 INTF for quad pipe case, so INTF is not + * mapped to PP 1:1. Let's calculate the stride with pipe/INTF + */ + num_pp_per_intf = num_pp / dpu_enc->num_phys_encs; + for (i = 0; i < dpu_enc->num_phys_encs; i++) { struct dpu_encoder_phys *phys = dpu_enc->phys_encs[i]; - phys->hw_pp = dpu_enc->hw_pp[i]; + phys->hw_pp = dpu_enc->hw_pp[num_pp_per_intf * i]; if (!phys->hw_pp) { DPU_ERROR_ENC(dpu_enc, "no pp block assigned at idx: %d\n", i); -- 2.34.1