From patchwork Mon Feb 17 14:15:55 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 13977972 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.170]) (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 5994E22069C for ; Mon, 17 Feb 2025 14:17:17 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739801838; cv=none; b=dPyIRg3hu5qwv7j2YRgHJ0T3diR1s4exPEnwx8eEv4HuLhExZcoQ29mBXLzAtWRCCBS4ngsfF552L/c6Z1ayBXRk8YggbqQbfUvIC3Ap111xUfXeGO39gwBErhcAjZqpGi4LmYl6TwaYTR6Pr0/28BWmhC4MtJbTWF81ODIk+3I= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739801838; c=relaxed/simple; bh=94sGM0uG9AA2R84ut2aXyN09vsNy3Mf9Tf086GLox/k=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=SnEg8JLH9QN7X7FdL9qoxb9j+CHGRK3nvi8jgXTRYDFNb306sSIS/uScLOaPEyqcVKaZ3ZF2N1Qi09QXXpqpvUxk6cI633EylBkka0QRgp0Rwor3SKo9sIlNXA59qFyf68GSTxDtoHIu4dWzjW830b+63X+j2s7TE6oAhzVb7wk= 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=VGL4KcQP; arc=none smtp.client-ip=209.85.214.170 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="VGL4KcQP" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-220e989edb6so82588895ad.1 for ; Mon, 17 Feb 2025 06:17:17 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1739801836; x=1740406636; 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=IpxTAQa8072dELfu5kZ4WUb4EfPVG9CirHn3aioqsaY=; b=VGL4KcQPs4oZTZFyWu+DZFgbcjC0PYlfGONo5IOsV5p2KSJqORoKlo/fF2t2uZ2SVc 5BIJAbvjCQkytl1/+tJSdnEB+mayekf8cylRujxKret47HpHIrPejBipxDObNbgpScFo uZHiM7RRvmsFN78CpAp8neoQXtOrdz9qrX+StAzJraS6pAOx1GidKJ21wDtyM2/gaSnX U22BbA2CojNZrr6tN6D4xq/wxXhIZZb1w61jAktzQYGXYCWQBP1s48gtXMapkvPv2D4R 4CzO8Mcn/HY6Vup0H9/lUVeuvu1izXkBtRW9NWbSwgZ0/mLNKZgERJvT4GOWoMBOMyEK +9Rw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739801836; x=1740406636; 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=IpxTAQa8072dELfu5kZ4WUb4EfPVG9CirHn3aioqsaY=; b=CK0DfJeuSt9TJLLbOkkCr86IIzLC+sv6+xJoxtDjhpSRKzs2kadxCFP7GYYcCIRVkL RxtXD3ALhee/l+5kI2nRE29ZAH8WOhLHdfcDsMBB6N3N3PUP5nAjoUGKgVMXiKobjAou Tcpr6am6ISqzjxgq0c8oFv5MboZRb63E8jjnPUdWDRSEBsiPVR8DHy6r5lDkF7h+5fvV ATi0+G8Zvul/cQYU0zJIqlw7ffzYFTDJvjiStvAmrLAROaSnYgqxLbuHaU2tEDWv70GC 1DLCD4d/zDdxJmyf8/uFCV8yBUxn5+ycX4udZ8rthH+Lpa38v7QvpByL6NtI94AvDVui RAzw== X-Gm-Message-State: AOJu0YyHLm95jQeg1Htu0ytHi1HZHaGquWdLFn6Mns/Ue3zqcAXPG5Vn /HnMUJyDVGrH02klo9YCuuw0Fpgte3L458dnZVB20Fc2EjfJ/10odlL1iPXPmJg= X-Gm-Gg: ASbGncvpcsa4Gm4nc85HQb4hTIMz/X3i75qq58nEWsEKfZVWGH5WQARggWc2MFjaI/u l+11aqQDFNRNh9L0vveDSt+2Wg2X0PGqzSBcF7pmuY2sR1lrJMXPxCQrm9K8Pq4BjRG64oxmSo2 R9fLwjtvZU1vV0jmo3d1Ft2uMedT2ceXmPFvIoeK6EaPUGaRkXL084cGXtEc+O2kKZcCfWbyP9U 9VUqTGuDLfDF93eSjpvTJSopYeshfcp0zJFPFSYe6ztC2m5YPLtVLMjnUkZYLioY6P0ZIbXuve6 Ph8yx2msKyln X-Google-Smtp-Source: AGHT+IFZHeIA0CD4UYx9Z3ngew6444gPSr2M1ZAt7fuz/lLqxs6zXEfEO8224qriYfC42F0X0mlf2A== X-Received: by 2002:a17:903:41c8:b0:220:c86d:d7eb with SMTP id d9443c01a7336-221040a9a24mr171158235ad.36.1739801836664; Mon, 17 Feb 2025 06:17:16 -0800 (PST) Received: from [127.0.1.1] ([112.65.12.217]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-220d5366984sm71900845ad.60.2025.02.17.06.17.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 17 Feb 2025 06:17:16 -0800 (PST) From: Jun Nie Date: Mon, 17 Feb 2025 22:15:55 +0800 Subject: [PATCH v6 06/15] 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 Message-Id: <20250217-sm8650-v6-14-hmd-deckard-mdss-quad-upstream-oldbootwrapper-36-prep-v6-6-c11402574367@linaro.org> References: <20250217-sm8650-v6-14-hmd-deckard-mdss-quad-upstream-oldbootwrapper-36-prep-v6-0-c11402574367@linaro.org> In-Reply-To: <20250217-sm8650-v6-14-hmd-deckard-mdss-quad-upstream-oldbootwrapper-36-prep-v6-0-c11402574367@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 X-Mailer: b4 0.14.2 X-Developer-Signature: v=1; a=ed25519-sha256; t=1739801787; l=1305; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=94sGM0uG9AA2R84ut2aXyN09vsNy3Mf9Tf086GLox/k=; b=sBcqZRv0ogKjajSPG9ugvgn2jWTjkmdxAHujjheTZRukMN9BXeN5vr1uB92ILnxrl+DGsaYQe zZd+h+j/wt+B5YZPhX5R72j8qaa2kWdGJpXRN6qzh7cAXO+14YMKzTs 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 24e085437039e677e0fb4bbd755a8cb3852300a4..3b3660d0b166d9b0e947b2c918e37adaae8b76d2 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; - 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,