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: 13977990 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0136AC021AA for ; Mon, 17 Feb 2025 14:17:18 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 73E5510E4E0; Mon, 17 Feb 2025 14:17:18 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="eDTV8Sc6"; dkim-atps=neutral Received: from mail-pl1-f173.google.com (mail-pl1-f173.google.com [209.85.214.173]) by gabe.freedesktop.org (Postfix) with ESMTPS id 1A25210E4E7 for ; Mon, 17 Feb 2025 14:17:17 +0000 (UTC) Received: by mail-pl1-f173.google.com with SMTP id d9443c01a7336-21c2f1b610dso110853125ad.0 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=lists.freedesktop.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=eDTV8Sc62sbAzUb0WqIPuGynkB+wXToYa+QJlFjq82x+Lh2Anv0FsvtiHrie4n3SbR HOuJl2LK7dVw2MEn1QYX9Nh/1WNlPVJeAfmAlNeaHv/qaKNyVd+lraq8k/Wg2gzq3O2B Zk/XMYCJGkBQqcvTKxOu24m7wk9M6oHue2713pXWGMTbimtCq91lT9LpV67/IHzI3pq2 2yE6P7i2vouKXoyjih0YdNoomS8SubDi7L+HsCUW6gjxPvaohHMZOhOrPQK25bPdrnk3 sBBBNH800P/ko3QqfFxoB5G4czc/q5GWU6njKOQnBJSRmCy1erqcmh0fwH77TtKRrzhy zF5Q== 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=hkEl+JDgkir6/UFXgRFKMrWQocz33Le/z9SKzgxlRqn8bVfzcB4dPrWlqaZk332IBJ xMSveIh6rd+s693ec4X+wVBDZwabkj0pgoKQUV0a/+Q4+n9aXvu5ii6VilgDikGjbmtp gOOy7WXUdmyTu+igd0bgIC2ZVODFtLCqZgj3F+R7rkQh3unB0f+Z86HUJkBA6nLLNF1t 7p6L6WhN41hjIIHI/bKptcMi9wrOcvqFnHhZTB2aMK0dncv2czH1UjfSZjEWNPszm4w3 rDNz2BMoZljeLWZpb0pK5laQC+JHe8Lw+OY5TkHIxJtZt7fXJIGzqhHrlgkBSdvZzGje jGtw== X-Forwarded-Encrypted: i=1; AJvYcCWRza58x0o2ip6wrX4tZMAOqNCQ9L0/+KTOvuWhDls2VKMIjUXo8WFB3BqbGtoP9gr4VhkaT3Ch/L8=@lists.freedesktop.org X-Gm-Message-State: AOJu0Ywu3Y+GdGdiXaVBBeM9q4p7rOpwvD4QH045aI39L9q3ltFmTinK RAYg79SUtMf34ZertWvEnTS+XB4NaQRZwpWqhelItcjDNffrvHu7HlbzCF2TFLXdK3a/3wrB4XU EpN/N5A== X-Gm-Gg: ASbGncu7g+Hxwo2xsFx3vbfxOEo8karZEjUaNuo6bvhzf21QfrPsmmmLwkGibvo9ztw 5MZaOKje8zjwVHu7zaIN90O5+s5YRP901yLoDGKOzAqzhyGfla6mubrKIqP9cjqNe2P53I6gIVi gvTcj3r+Ynxlxq1REPKcO1wsQKoxbjh8rmOc+yeL33YOx+/+A6ARF7kElqK8ebc7lEJDZSdaaTj tp++uIZz5P9Maz5s1if7sXfYBMu7YR2iYF4qNIxsruzbNU5vmLV/1pWoVfpmscepy3Xkxu+Ex3M t1ZjZJVCdyXN 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 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= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" 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,