From nobody Sun Dec 14 21:56:08 2025 Received: from mail-pl1-f169.google.com (mail-pl1-f169.google.com [209.85.214.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 4488C199920 for ; Thu, 16 Jan 2025 07:26:44 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737012407; cv=none; b=EIiwx1b4e+xbzXgwte1zumdLDTvlZ1i51MBVVtmc3SUtV3s26btiVEnqozNSGlkQAiFw62IrB9kuciI+i3xQm0JURGc9eWy6ZlNM+UcHglWhx+fVsjpZ65Q+S07+oBsx7b+qi7awN3iBm4VZ2G60vw+DZSnXIhnTwFv0/XfEk+0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737012407; c=relaxed/simple; bh=Sj3Czivhsbaa4LJdooT+esNwlFrWC/YCnOEkeTa//RM=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=miRg2Mhqc28f988BVIxFkHZb/K1bXUTmlqL0eBYaAQCcf3DldhE5ySl0DNg4k3EeiDKaCD3q/kkIMQYaaS+gqhoq6iRmzSCMQZoPeYCkGHjljji0cz2oY09ZBau/hk2Cgt6mVy28mBVkeop0DrAY0ztezO+7tSVh/7S/RdBd4XM= 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=LasMBSpi; arc=none smtp.client-ip=209.85.214.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="LasMBSpi" Received: by mail-pl1-f169.google.com with SMTP id d9443c01a7336-216634dd574so5872725ad.2 for ; Wed, 15 Jan 2025 23:26:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1737012403; x=1737617203; 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=6vUwtbv6QkBMkinOtoSzI57ocGpisrQ8kP4ZBj8OJ9w=; b=LasMBSpiolCyo4sysKJfPrw4cZZlkhamp4TFaSnjz/xKwiSTDevrCrFfRtk0wpllfa hCv7XW73bLFPdeENi1xBZ4zS4mjOg9Slgs7HcMU7eJcOuMGiyLsAO8Cf5puHnfZYOKLx 2hRK85XVyCW7F+dwKC2ZbIGK5aPcbXXYR+em6Xssp4w5SYEFGOqp1TuYFzBfszBV2BmV Qnj6C9rIK4AoGqZ6R158fVg3QPJhsuTmUkMhEsYHGQpmw06rpM3fzX0kl/dDqcaNL9ak SI2rRfgWgCsULX1RDt0UR1Vn1qs61CvV1CaMAYqdBwLzV2H89/qgo2ayLyM6b7dwyUwk kPSA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737012403; x=1737617203; 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=6vUwtbv6QkBMkinOtoSzI57ocGpisrQ8kP4ZBj8OJ9w=; b=SVPePvvjEJIQh7+kMJFNJ1qwwZvIDo6rd009Z/OIjlKz8JI6nsdtDWEnawMWt+5cih npaIzpB/PUt4ZAuloKdTaF3jJ43E+ZRhVGLPZQ9CLqrZKGaDtK+54qlS+5H1ldgdRqq5 mrv8Px29nq5IrskBRtxl/qVHerCG3ZTOh0zkDR7Q47kXwQTGuoFIsbFKlO4l2YcmPawR ueQqBgw6an5cOqmHX/XMiJKfgzhY1wOfpGqcCt7bw21yE1vHNM9lLaEUTWYynzfKp+yd XGIAGbU/IVwZZ6a5RezMCUys3wcDiyiRLurHzP1lwZgnE+H5gjAryCI+10vG2J7qSngN yx+A== X-Forwarded-Encrypted: i=1; AJvYcCXFPfTtN21BqoGE5gZYTAWkcz5xUxamg9j2zMrToqx0SI18WHPm07xezU5/toUXPQZmesZV6rODfBW6Ubs=@vger.kernel.org X-Gm-Message-State: AOJu0YwlcwFYeibYF5xp64QTTNIoXA8tFTRqhOEfGb+02r4otkDID1bY cDUyaBz0QTRGLGDm8FDuY1h/Aq5K+e02OS7GWcUneiqoImWwDb643c6HHbOxlpU= X-Gm-Gg: ASbGncsLuYLTPtCOLuSyZ5BGjsDBEbk3+T4JDfCEZAt0GZlvvGps1tMmP4OoiuEJvwm a8YxD8dxlLuNVc04JprKEcuGvILipixH4zpxVFpnk+ZrkPWiGK8r1zHYALF0ierienf6pI1SRmq l2DR7KjPxzCqlq2kkV/gZgdHkbwm+DG+kl2D/ad3DOnHroHRt+p08VNeI0JDMHP3yjZujmXuSNF 15IYsAyj5JzxgADOxa/LOT80QDT/blFoSDhHu6EHes8hH1Pq2C2uA== X-Google-Smtp-Source: AGHT+IHEZ8xbbHf6WOE5lVgvL/EZZjzSZcR/ONwuLfwLhiLy0XL6LoLqBpWJ3PuAXM7IxlN82vAVrA== X-Received: by 2002:a05:6a00:4485:b0:71e:16b3:e5dc with SMTP id d2e1a72fcca58-72d21fd8b84mr48514252b3a.19.1737012403491; Wed, 15 Jan 2025 23:26:43 -0800 (PST) Received: from [127.0.1.1] ([112.65.12.217]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-72d4059485bsm10164583b3a.83.2025.01.15.23.26.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 15 Jan 2025 23:26:43 -0800 (PST) From: Jun Nie Date: Thu, 16 Jan 2025 15:25:55 +0800 Subject: [PATCH v4 06/16] drm/msm/dpu: fix mixer number counter on allocation 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: <20250116-sm8650-v6-13-hmd-deckard-mdss-quad-upstream-33-v4-6-74749c6eba33@linaro.org> References: <20250116-sm8650-v6-13-hmd-deckard-mdss-quad-upstream-33-v4-0-74749c6eba33@linaro.org> In-Reply-To: <20250116-sm8650-v6-13-hmd-deckard-mdss-quad-upstream-33-v4-0-74749c6eba33@linaro.org> To: Rob Clark , Abhinav Kumar , Dmitry Baryshkov , Sean Paul , Marijn Suijten , David Airlie , Simona Vetter Cc: linux-arm-msm@vger.kernel.org, dri-devel@lists.freedesktop.org, freedreno@lists.freedesktop.org, linux-kernel@vger.kernel.org, Jun Nie X-Mailer: b4 0.13.0 X-Developer-Signature: v=1; a=ed25519-sha256; t=1737012353; l=1148; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=Sj3Czivhsbaa4LJdooT+esNwlFrWC/YCnOEkeTa//RM=; b=wwLDum0ZmSKxVWLUCff0iyuTso8UOKgLOcC3MiXn4ZuV5Y6iB9FHmaZj2ZQVC7cFkBqmZxjDI a2qygM2FjnWB8cXJ4P9EoUGyKCT+CWVNu+4OQpOFxt5SOMAwFQ1W45Q X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= Add the case to reserve multiple pairs mixers for high resolution. Current code only supports one pair of mixer usage case. To support quad-pipe usage case, two pairs of mixers are needed. Reset the current lm_count to an even number instead of completely clearing it. This prevents all pairs from being cleared in cases where multiple LM pairs are needed. Signed-off-by: Jun Nie --- drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c b/drivers/gpu/drm/msm/d= isp/dpu1/dpu_rm.c index 24e085437039e..3b3660d0b166d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -321,7 +321,11 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, if (!rm->mixer_blks[i]) continue; =20 - lm_count =3D 0; + /* + * Reset lm_count to an even index. This will drop the previous + * primary mixer if failed to find its peer. + */ + lm_count &=3D ~1; lm_idx[lm_count] =3D i; =20 if (!_dpu_rm_check_lm_and_get_connected_blks(rm, global_state, --=20 2.34.1