From patchwork Tue Jun 3 07:10:04 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 894287 Received: from mail-pf1-f169.google.com (mail-pf1-f169.google.com [209.85.210.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 0CB7F268C76 for ; Tue, 3 Jun 2025 07:11:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748934663; cv=none; b=d9OU72Ms8XNqIInqELqxroqQFIKhnVupo384OatNlzJEDPNgdyqK5xpupsgsANjdPORDV9vSPgp6HBRLoCSi41tyZJ1rTMU+MTOP/8WXWSImqadmQA4+XPBHUmAVCjg0IC7bt70kXBKqRAG0fVj+ANLHUKGxuV8zu4N6pU9DA8M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1748934663; c=relaxed/simple; bh=AzK35uakUtRc9B2/mkaI31Hgz37sujAtB+6mV9+2mao=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=nVyL8LcI6SuCWGzSLjHTttZ43XzZRDG0G+TodaboEuXi3XvEf+GrXp9zWfkdaR2MPq30xi0RwMPoVSqa0pjtyO7B26At82aaGBj1+ItWJY42lp27KkH18KApFgkL5lQ2ZIjFRhNfP8rbCZ8Szp122vxZ6Fp7Xb+7hJioy98xFgo= 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=cs/IBO+R; arc=none smtp.client-ip=209.85.210.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="cs/IBO+R" Received: by mail-pf1-f169.google.com with SMTP id d2e1a72fcca58-742caef5896so4330092b3a.3 for ; Tue, 03 Jun 2025 00:11:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1748934661; x=1749539461; 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=9JA927uWtYKHWYqLpVeeOOuDkS72N+Td94lU14Gx7eE=; b=cs/IBO+RX39svLZRUr+fAh0lyGvWvMYPUP6dQa077YjxCWwEh6bKDuP7mm2l+UCxVX FoOmv5krcSBh6AJPyVq2VXFJHL5Bug3o8A23d7ofTN3A50YQIYkeVlq1cDtlfrdC0B/6 8lFuJFF/QuMnAir4TD4WDoWumi5YEYjIMXfCenUEng+dXMirNRsEdRJssTpsQY9sx58w hLQ6g0d8U0Y1MljM8/yx1pz+6q+AnGejEMyeNiC6j3GlJQtiPmXGgfiqdUqPzg+MPwVN MPeHWrmZaeD7kQ8KtUharX7ZxRBMNjwJz/KiapciUfi8ws617XwhwdSbDw3LokpQzV7c XfEw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1748934661; x=1749539461; 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=9JA927uWtYKHWYqLpVeeOOuDkS72N+Td94lU14Gx7eE=; b=nOy9B0c2e7QqLciLsW9rETg3Gp9EzGGr68vegF9S8cPy6df5wMb/Uje2ml+XZv1Ccc wPrUiUPwrwDNMVG6zdgfLIgs7/lHMaHHsH7BVymGvJ58zMdGxC+dysSvbxKC83iqEFcy lti6Yy+5siOwGciMTclWsFktVH0UFqHoije9yBhwf19rO81kcCtGbwWh/vbrfTf4GzWb t5DLO86u5MG3RslGgV0EcOzuCQdZf02c6qBlfnHONTrF5+N3YYsosZAuJIP9xr0bMvxP bckkH3bsCWuCh3lbfB1RrfJ2m8eQPQj339yS+poqtZBC68i4MZo1CNtZF4NGN3J9I6jr MVQA== X-Gm-Message-State: AOJu0YyIxPcf6FiW08w36+PMRrM3T/aPHQVKAPLH6B67XRUmmE+6UzWC 2KYvMhG9JMD+k9LWnE85ofdq9aNFw43C8K7EQIadTQBi+POzLEw8ubCgKqiyUzytTaE= X-Gm-Gg: ASbGncurpduU4IhInrr+KYMX9edA5xC3zEeRzTeTpv3wZX9Aktkxq+9EPLt9pdQs7+C 5dFR6zQyXwwclGjj2VZI7mg18k2jQ/yKj9WXK9vq6CEaQBpQTED4YDVvwzHsJcrhdBJWtNHT6BW ln12ZXsJvYid7eh8UhG+94p6LCYpcPhxdT6TOAgA3N5VOa/CDmmBJCTRvwJh+kOspcKMFqDAEn3 RuqtN0nhMCOP2LQcupi/qGbV/cuouMO1F7zJkZ+u9T+tkRQdsTONFoPD/+DCsLmJ2hFhwh4JiX/ zqOsj8c0P05bAqaws8MijOkiMsx1SuEmCR44VytGo9yjc6xHHQ== X-Google-Smtp-Source: AGHT+IFjWCARHruptuJVLmM8AfVvbtePqSODkl82sJOlhsf4UkzXWJqbDaCd4kbMemrBH6D23IqzDg== X-Received: by 2002:a05:6a00:2e12:b0:742:aecc:c47c with SMTP id d2e1a72fcca58-747bd970f56mr20943760b3a.7.1748934661240; Tue, 03 Jun 2025 00:11:01 -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.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Jun 2025 00:11:00 -0700 (PDT) From: Jun Nie Date: Tue, 03 Jun 2025 15:10:04 +0800 Subject: [PATCH v11 05/12] drm/msm/dpu: Add pipe as trace argument Precedence: bulk X-Mailing-List: linux-arm-msm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-Id: <20250603-v6-15-quad-pipe-upstream-v11-5-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=2487; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=AzK35uakUtRc9B2/mkaI31Hgz37sujAtB+6mV9+2mao=; b=lCfGlNgdftpf9pXQpFuf+RZ4PCJy6x3Jo848+yn3e5YXK0pb/mRGUH2c14Z4J9uMc0sEVgDlH WCpCkjTvOWYBUB9AiL/tTqrn88WQn0PQQixCWWYArolB+ivrgzrD8yV X-Developer-Key: i=jun.nie@linaro.org; a=ed25519; pk=MNiBt/faLPvo+iJoP1hodyY2x6ozVXL8QMptmsKg3cc= Add pipe as trace argument in trace_dpu_crtc_setup_mixer() to ease converting pipe into pipe array later. Signed-off-by: Jun Nie Reviewed-by: Dmitry Baryshkov Reviewed-by: Jessica Zhang --- drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c index 90941ff4104f620d1f4f18ec260418ee59dc16b2..3a7e030e1241a5115460a1e9d552341f8dff7d85 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c @@ -411,7 +411,7 @@ static void _dpu_crtc_blend_setup_pipe(struct drm_crtc *crtc, trace_dpu_crtc_setup_mixer(DRMID(crtc), DRMID(plane), state, to_dpu_plane_state(state), stage_idx, - format->pixel_format, + format->pixel_format, pipe, modifier); DRM_DEBUG_ATOMIC("crtc %d stage:%d - plane %d sspp %d fb %d multirect_idx %d\n", diff --git a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h index 5307cbc2007c5044c5b897c53b44a8e356f1ad0f..cb24ad2a6d8d386bbc97b173854c410220725a0d 100644 --- a/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h +++ b/drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h @@ -651,9 +651,9 @@ TRACE_EVENT(dpu_crtc_setup_mixer, TP_PROTO(uint32_t crtc_id, uint32_t plane_id, struct drm_plane_state *state, struct dpu_plane_state *pstate, uint32_t stage_idx, uint32_t pixel_format, - uint64_t modifier), + struct dpu_sw_pipe *pipe, uint64_t modifier), TP_ARGS(crtc_id, plane_id, state, pstate, stage_idx, - pixel_format, modifier), + pixel_format, pipe, modifier), TP_STRUCT__entry( __field( uint32_t, crtc_id ) __field( uint32_t, plane_id ) @@ -676,9 +676,9 @@ TRACE_EVENT(dpu_crtc_setup_mixer, __entry->dst_rect = drm_plane_state_dest(state); __entry->stage_idx = stage_idx; __entry->stage = pstate->stage; - __entry->sspp = pstate->pipe.sspp->idx; - __entry->multirect_idx = pstate->pipe.multirect_index; - __entry->multirect_mode = pstate->pipe.multirect_mode; + __entry->sspp = pipe->sspp->idx; + __entry->multirect_idx = pipe->multirect_index; + __entry->multirect_mode = pipe->multirect_mode; __entry->pixel_format = pixel_format; __entry->modifier = modifier; ),