From patchwork Thu Dec 19 07:49:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jun Nie X-Patchwork-Id: 13914674 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 0FEE3E77184 for ; Thu, 19 Dec 2024 07:50:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8A52D10ECAF; Thu, 19 Dec 2024 07:50:39 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="z6Fj5SEP"; dkim-atps=neutral Received: from mail-pl1-x62a.google.com (mail-pl1-x62a.google.com [IPv6:2607:f8b0:4864:20::62a]) by gabe.freedesktop.org (Postfix) with ESMTPS id 2B32A10ECAF for ; Thu, 19 Dec 2024 07:50:38 +0000 (UTC) Received: by mail-pl1-x62a.google.com with SMTP id d9443c01a7336-2166360285dso4393495ad.1 for ; Wed, 18 Dec 2024 23:50:38 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1734594638; x=1735199438; 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=6QACPLHbU96vR5yGnVxi+OCvdrWdXj07n9rpK8uCOHE=; b=z6Fj5SEPVynuRz1sJxyctzzc88JT9e7KNzSg0VqCaLBoozJAVLvS6gDcE1jTKI9Vbw ZB2HJhC8IItIVg++MtZLS2zGPfWVMylgRxogyF6hO7ojgvRgLIxOpjkl1ESoVYfKRg6u f8HlKMiFCHNwuJtG3dIi44FjGTHfC5gsJXtKrWokniYPB1Kt4z5v1Ar/UpezoUy666qu vBj+YkG2B0F7cO0+CUwQvJxz6fF03Fqaj/UeQzf5aZyFG2qVRdP4dbyarq4RFlRE3/q3 psS1kS+YP0mvXj7HmuLUcS2Rvgiuyk/0suswLA64bqtfsUa01VkSucX+NtGvBeGbYX6B Z5wA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734594638; x=1735199438; 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=6QACPLHbU96vR5yGnVxi+OCvdrWdXj07n9rpK8uCOHE=; b=enAvM101QIPd0KI8HOtTZYuMVAF5TKzYj/nE788JtLtzo1WXy66+NXt/M4fPvh3c7l 8Y4GMDZ+SO1sWMLFDhLlQgv+oJZJ6fCHInmmj2ysaROBU4c5WJwe2D76vD4N5QfB4nZv rBRVrH+Uf80IoXO6sRYMnucEWBadY7qxDMOryT0o1h/5rr4QVVyJZOFFVg4cN+XboMru DB/gVwOPGwBmYOwE1EhlK8N3Wqlw9kjtvQWA+/Y4ZCBFYqzhYgFTsnvM4bhsaaKthod/ PxrMKjjJKTpZSYuCudLl1EJ0OxCprsqxgcGY0TNiCcJe0aJEg0un28otj9X4m5gLb95L qyOQ== X-Forwarded-Encrypted: i=1; AJvYcCV+8arkAUW8MhAypmJkl0R2NKIO9kCTfPF6dEwmsEiLoipqLklC6qv0YO7firrRy0PdbBDNCvVVtgc=@lists.freedesktop.org X-Gm-Message-State: AOJu0YzUni9LoUyw345pysp00rFkJXAYsUrpcEnqeGNi87CZ1W1dDTED jAbC/wHB7Gj3yoe7iTW63xChkcYutWsCZPozD2Er4ok5M8ML6B+f6ghNPipRIXc= X-Gm-Gg: ASbGncvOtbMI8STcR8/itfT82O0RXcJTbWAAY4pCxArC2wdNR/9PhtU0vksB/NTjhbr Agxx5Kk70T+pwgG73bI/AtYc/om07qX+BF+J67rcNKVPD9zs6RtF2Qiru4EDy4KE8jwi0FGi4x8 oAQ8rnpe7y/AbN6CicX2OSpIdW2Nljb26GMfMN1NkUSVF831S3JgMNq3gX4Y5WrnngWKNktc+zq BdGwSzQygcL3es0sS6G7wjj5YSu5/Gr7mx6iA5vkrc3GMaq8tpCHg== X-Google-Smtp-Source: AGHT+IFw74Cgq7jywjWum0/vvzCufwreSULGiGLizUIz+reETmaHjliDxBUvaVtVLedA+GKu2zL2mg== X-Received: by 2002:a17:903:18b:b0:216:2a36:5b2a with SMTP id d9443c01a7336-218d727dd8cmr83172895ad.47.1734594637757; Wed, 18 Dec 2024 23:50:37 -0800 (PST) Received: from [127.0.1.1] ([112.65.12.217]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-219dc97432dsm6784445ad.110.2024.12.18.23.50.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 18 Dec 2024 23:50:37 -0800 (PST) From: Jun Nie Date: Thu, 19 Dec 2024 15:49:28 +0800 Subject: [PATCH v3 10/15] drm/msm/dpu: Add pipe as trace argument MIME-Version: 1.0 Message-Id: <20241219-sm8650-v6-13-hmd-deckard-mdss-quad-upstream-32-v3-10-92c7c0a228e3@linaro.org> References: <20241219-sm8650-v6-13-hmd-deckard-mdss-quad-upstream-32-v3-0-92c7c0a228e3@linaro.org> In-Reply-To: <20241219-sm8650-v6-13-hmd-deckard-mdss-quad-upstream-32-v3-0-92c7c0a228e3@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=1734594568; l=2230; i=jun.nie@linaro.org; s=20240403; h=from:subject:message-id; bh=6ZtdpxhXB/rhz3hCMyuJbmAdwfkWhh1P6PW5UxiXJuE=; b=DKvn2dcBo0LBd5J6yg1T8LHUwMwZBR8+U8I5tnUqhsqeeWjSyF2K1WgAOy2JmiekoigPcSUOf 7AmgzuaRziLAakLiBOKe45if2lXog+ljyKv2gKGx/xOlvKMcfT04XH6 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" Add pipe as trace argument to ease converting pipe into pipe array later. Signed-off-by: Jun Nie --- 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 72ed8749cd716..6841d0504d450 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 5307cbc2007c5..cb24ad2a6d8d3 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; ),