From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pf1-f176.google.com (mail-pf1-f176.google.com [209.85.210.176]) (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 BE8AF1F09B6 for ; Tue, 19 Aug 2025 01:31:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.176 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755567089; cv=none; b=m+OFTXykmGvWv6v82rIc+LRBNaXiACABvGb8ekmKTsJ8NlEcxd4A8JcPkHv8LENrlmnbRQyk4DKEQBaGBywVygOhEeUupLrcDOSneO8KpxwX839WXopO/UOOFbjUkMjzxEClxPJT5wAtjiMLmv9hdZxooRXjATH2shUL1760X0A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1755567089; c=relaxed/simple; bh=OO2Z7mIWJju/0AAWi0QFQrEeFkD+xuMhO5TmIsG9bFo=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=smugpC8XCtCeps1My2/aH10ynL2k5fL/sBVmYUvWTkFjug3a+2+69CG+4jGUHygbqY8axWoq6ZiCTSQNtZrxSAWlYFsfdwxBPr1eIFiH8lRXmSLlz2kVB7XyhYyucR4Dl4hujJG/wPjqY9F1aWFfFEf8sXAzDQgZl6ZZCE1l+z4= 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=VFfMjveD; arc=none smtp.client-ip=209.85.210.176 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="VFfMjveD" Received: by mail-pf1-f176.google.com with SMTP id d2e1a72fcca58-76e2e613e90so3436611b3a.0 for ; Mon, 18 Aug 2025 18:31:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1755567087; x=1756171887; 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=XDSLLULuQro4tZ+C6kFbdQGbu24iHgqnLikNbErS/QE=; b=VFfMjveDgAr/OMsLqO/bUOLtEjffYQQz2i3i5XJvnmC5fOUTjezM+JKC6BmrOh1+ea 6O85aohtadOL+7iglxYe1z4oc06ThItDaEAGWCtCe+vunPi6rRvtFN85WbQcZWg7rCja 6kmcLHcayhpzgfCi8rc9AsrMR0Q5WtlNl3ikghA0MjSxg6DefB67LFgwRwjJV2x+hOKJ sOnw/HOUSFFbR8rEbDNeq12p7e0M8unnduUdPbmUR2f9HmoPF849GagqxhrNdGUi8cHT vhLFXcTrNQe+Ffx8pNSclb6BSpNEkvhmAd1M7cUyGd8IP5zOATVaCfIvAlPznKqnOZ5t rZDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1755567087; x=1756171887; 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=XDSLLULuQro4tZ+C6kFbdQGbu24iHgqnLikNbErS/QE=; b=T6TtaVgo5lzQkKwsN1JkdzTpLKvB9JtbCEDzkRMemLv7SuBzJH446DyST+tFYu5CnU 3Lpn0BpKCYoOj2UcKQyZ2J70isorN6AsxaK5pqMhYTe4XWU4yloHCLVLQVuNdJsOwHHQ nwdrfB3FS2MKTWXiYlBVioDYhtFgQKtEdfN5PWivmF6tTmuwXkpXqnjAJJhanh97KBFg KkuqOEETDEzdiTLKLMbNoaGcVcTmWEI2845o4QmenPKfo31P5Fi9l1f6HGnGSQovu3hV 5QGBjJSn6e3Jtk8AjHl9wELLmrc4BJ1kl+FIQ5jiTa1VcxboMsNxEp4BtN1vUEaYjKgB NuMA== X-Gm-Message-State: AOJu0Yw7PFMXlEeTLfuIadB9XXer++USMW33F9G6Nx1cV2UKEVDvb8G2 lqhbT1bE9LHGw6bCYoyNRRx2+zN8ZRQlbhr1q9ILSEOQ6ZVSfg03LK5u1PYN+FNCiivZynOFUGh RLuQLElM= X-Gm-Gg: ASbGncueK4eL8WAET7afRlffoDQOfnK5kI/PbLxTCQm+si3mJhvmD6koNkJCiU1lLrX pJAAtT5Lxj3KjavaESRIpXld+Bjx5QXy0gx/h5HKzPe3iSKofaU8KowxlVgA+SQdk29QysLeSiD imQSUMe1UHuGFAtcEf5cQpYPkxXIKEeohM4sxOH4rpxzYNB+1dX4JLJchzQAy+SXBjB/HvbYW1/ Sff1ykKNFWQUG5yZ2nnA3CZBnyQESBqNrkyoGzFhe0jcjzJhghvfjGsIEK9oQXIl4DXfQTqbZRL /hRf9TO/1hcPuhDDGNXBoBmdmFh/vyX+S5mdZg1bGU2mPv5AU/omSDuPDrxK6jZnGdCzyWV6/6P 62WGg43fW9gSKTLVd6A== X-Google-Smtp-Source: AGHT+IGps1ST7kdQvxYit2Ob99jtGtkYokyhyRmmvXkWhW2P7lhMmeUjXrOBgJl4/RARBwWnz7OdKg== X-Received: by 2002:a05:6a20:7294:b0:240:9af2:71cb with SMTP id adf61e73a8af0-2430d372220mr922993637.20.1755567086739; Mon, 18 Aug 2025 18:31:26 -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.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Aug 2025 18:31:26 -0700 (PDT) From: Jun Nie Date: Tue, 19 Aug 2025 09:30:58 +0800 Subject: [PATCH v15 04/13] drm/msm/dpu: fix mixer number counter on allocation 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-4-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=1366; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=OO2Z7mIWJju/0AAWi0QFQrEeFkD+xuMhO5TmIsG9bFo=; b=Dl0sF5pWfn9RHyOh3X9+toV9iaBEjSAor1oRajKpwW6z4obYTT7oFvWdRGeYf+oUPpjzPNx3z 5LYiatLWoMBDaahzNyoUttMSMXwjmvTD6Zw4bE8Ia//fq2rbkAB5S9B X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= Current code only supports usage cases with one pair of mixers at most. To support quad-pipe usage case, two pairs of mixers need to be reserved. The lm_count for all pairs is cleared if a peer allocation fails in current implementation. 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 Reviewed-by: Jessica Zhang Reviewed-by: Dmitry Baryshkov --- 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/disp/dpu1/dpu_rm.c index 2c77c74fac0fda649da8ce19b7b3c6cb32b9535c..3f344322b7f214d0050986e675b32522f8eb0ba7 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c @@ -374,7 +374,11 @@ static int _dpu_rm_reserve_lms(struct dpu_rm *rm, if (!rm->mixer_blks[i]) continue; - lm_count = 0; + /* + * Reset lm_count to an even index. This will drop the previous + * primary mixer if failed to find its peer. + */ + lm_count &= ~1; lm_idx[lm_count] = i; if (!_dpu_rm_check_lm_and_get_connected_blks(rm, global_state, -- 2.34.1