From nobody Tue Feb 10 17:34:50 2026 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 8E1212690D4 for ; Tue, 3 Jun 2025 07:10:54 +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=1748934656; cv=none; b=r/xmZjCfcwKCMz+KGXdgS0s8UmZ7N45w6HLW4jOcwNnOmdwBSr6s3QQaDWxHegTToJjRWapRCqf2BdAK4V8dU9GqFrhm11nc12ZPjB5ooZ2KXvoSicwbn51FhLzuMcGVmISbkia+qAfVu9dvL41NA6FyAs3R1PJha98M9UVN8Vc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748934656; c=relaxed/simple; bh=uDQ4bz8vnlfaTdZAeHvnaqmYz1iezU6QmXEPd3wO/d8=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=aKzqxThRmNIGA6Ku65YD/YFfJofoUr744/18lvMrb41CQnm+KziavWlFeIYE/8cXb/DS1mz8y+P/D8CXvFw1U/5SHttXqeNgdoPaVwBiw2q2WhSD/EahdO0qDPgfDNfODfkBQI9dVQG6BD0joH8wtAHvJU0m5PdRnoWblTA8/n0= 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=FZoTkVHS; 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="FZoTkVHS" Received: by mail-pf1-f171.google.com with SMTP id d2e1a72fcca58-747fc7506d4so439158b3a.0 for ; Tue, 03 Jun 2025 00:10:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748934654; x=1749539454; 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=wtx+6yP/PZ5J4/5h8BZGfldjHe/UjZ6koSQGv1wSzO0=; b=FZoTkVHS5jxWUu5XqdZP4WwdfJ82YIUIbk4K7mdZqWkVMYu4vUqo/uuTscGvRGqIYb Q52w8ODl8G27vndJ2XaaiXzpzFCGx+xF/Fvay5Ga7wbxh3g3WUVezk/T5W9WDOAYvwEJ C9nrDAE5RuytsDNcPvMBrUtUrcuazDQX9Td0S/0iBeKXybh7t/7k9vCcqi6pfIkSyRPR YBxbS0VT7UjjbS5IMgxtD8BSUKSmfLofR6ou1vlj7UyE8LkvY/zt4jT1v9i0WdKPqC0I 7L3nk7Yi45c/hKk+c87rOyji65fu4/dM1YghumGZQ7PFl4RcFs7p7sbsnmm8kZ6t+8cS T2oQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748934654; x=1749539454; 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=wtx+6yP/PZ5J4/5h8BZGfldjHe/UjZ6koSQGv1wSzO0=; b=YHmngMby7nWbAnDA73ay/x6vbCX/aeZPkBnv8xbiUVRquQPXf6U5TbTdeyLdYsOhmD U+D/DR/nlZcxBYjxTG3Xf0OIu6uCxASuPOctYFbZfwRhUzdptK4Vg8eSdrrLne0LND35 qLqW0Efe/4EfDKP83HP+xQHUUUNqz6TZ0cS7BekvKYL+LMXHH++Cfr33R7j5jzUgtNVX Sp1G8bXRqTsFGafEhI/Mhw+UyYhKViYoksRCKxg8GrObfV7sBcYYMl49SpyorPNcfBri lOvmzX1YfgC2T4xHxi3bj8G+DlhgaCMhGpCUW02OT9RrNqWcJZxadm64Q2XgyEFwrlE/ RBhw== X-Forwarded-Encrypted: i=1; AJvYcCXUrxip0Mth2NT7LYy5FrtVuDy3frfhfd1EHWI4+ZvPOUp5J9k4Aan/iOVIGB+tp5xR9HZPCNx6QbtO45w=@vger.kernel.org X-Gm-Message-State: AOJu0YwliEzMTYJFC71p73/BcMXEGYERlXo5gnqqowve6jGAcsdwOIHe pHZRavbQtvPxApDePFT/fOrcZSCzrR1Yg1gEdkkRqAhRMPGpijHMSpJ5bbtpfljAmVM= X-Gm-Gg: ASbGncswmAdIi6mo+G7c+wPU0OfM2qLpydmC+ePendrzlXElsnTSgHgBYEy9XeFSEp7 569PGcHYBvWyknfJqrDmy8JRs0ivZpWYMuS/EVW2KcdOcWgxUrddKoSYzEdN1Ty5RzW07fctS7b TSybo+Z2RWucrb5z/4OkvF1Rw9RBMeJkLyZeMVFA4ZmdArwMwvWwZHtgzglBEyg+VXbfwhue/jB T+79+crj09FWjxF3pFvsUeJn0k3VlBT9II0ygWUhZAP4Jpxd93OW+vJPspywkrDxuZ9FumHwTwV TYoi6wKxs9CV9OdMR6O02XSgcBPSobMO2bWMWRlpC9A685lBoQ== X-Google-Smtp-Source: AGHT+IEjJGNuidzGcf6sJ/A0meCFZ2p/UGTGDCh8kd70ximZ8dtNCwm1meXyCFhsmKPr3Tv9lyZmUw== X-Received: by 2002:a05:6a20:a11b:b0:216:1476:f5c with SMTP id adf61e73a8af0-21bad120c57mr16078986637.25.1748934653870; Tue, 03 Jun 2025 00:10:53 -0700 (PDT) Received: from [127.0.1.1] ([104.234.225.11]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-747afed360fsm8746481b3a.81.2025.06.03.00.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jun 2025 00:10:53 -0700 (PDT) From: Jun Nie Date: Tue, 03 Jun 2025 15:10:03 +0800 Subject: [PATCH v11 04/12] drm/msm/dpu: bind correct pingpong for quad pipe 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: <20250603-v6-15-quad-pipe-upstream-v11-4-c3af7190613d@linaro.org> References: <20250603-v6-15-quad-pipe-upstream-v11-0-c3af7190613d@linaro.org> In-Reply-To: <20250603-v6-15-quad-pipe-upstream-v11-0-c3af7190613d@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=1748934620; l=1809; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=uDQ4bz8vnlfaTdZAeHvnaqmYz1iezU6QmXEPd3wO/d8=; b=HYENK6zyOmddtj3kw/I4EdLhSrfkzfZ0p/SQUiDA02c89wQHKvf9pcRyzEdpvnvPF6bqlrhpk Ql/a0CaLDNpB6KEqsa8tRrmCptdMW8z86dhWOE+3vIpDR0s53qbgC+X 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 7020098360e474ee149824a488d912a7ad8ed06a..be8102691b99d3b381476ff844d= dfd28fe17dc7c 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c @@ -1157,7 +1157,7 @@ static void dpu_encoder_virt_atomic_mode_set(struct d= rm_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 =3D 0; bool is_cwb_encoder; unsigned int dsc_mask =3D 0; @@ -1236,10 +1236,16 @@ static void dpu_encoder_virt_atomic_mode_set(struct= drm_encoder *drm_enc, dpu_enc->cur_master->hw_cdm =3D hw_cdm ? to_dpu_hw_cdm(hw_cdm) : NULL; } =20 + /* + * 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 =3D num_pp / dpu_enc->num_phys_encs; + for (i =3D 0; i < dpu_enc->num_phys_encs; i++) { struct dpu_encoder_phys *phys =3D dpu_enc->phys_encs[i]; =20 - phys->hw_pp =3D dpu_enc->hw_pp[i]; + phys->hw_pp =3D 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); --=20 2.34.1