From patchwork Fri Feb 23 14:18:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 205415 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp613654dyb; Fri, 23 Feb 2024 06:19:01 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCU+DO5Z49GkNh5YTeB6h4uYJxi6BkeQBEdpaGZs7HpRZNLa52Cj6wXFtSGRYQfzT80c1avIN5Es4reqwHq2GuoKJ3xfow== X-Google-Smtp-Source: AGHT+IG/ZgZVfU0y734/Y6hezFfS9uTqNjcAntfAPKF6J8JtGVEUnSbfa1kj5F8pT28YsHkQqUGP X-Received: by 2002:a81:b044:0:b0:607:87cd:9395 with SMTP id x4-20020a81b044000000b0060787cd9395mr2081410ywk.17.1708697941591; Fri, 23 Feb 2024 06:19:01 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708697941; cv=pass; d=google.com; s=arc-20160816; b=ifKoMuRnuTc2m3FJTVVLCG285GNAyezG6xHTvhaFNaYdeG9m5Nisn+8BxI1srKRtc7 ZveFhWlkP+MAm3vqlJX3mvY0BTeP0/XaqsUZGZt0mGt+zeKIKQ28DyeaqOA6LpAX4ZeD LwDK1CGAyuJxCRcpMro5lM55Z3qks2WYk5PfXE6PAmV2EEcWi+TSoOWOZND25du8vfAw N57LVkpI8vq1hxl4pQ0FCacRtgrsBKOREzk6OaiXQKwqFaT112elPF7shGlVwIzajQJD 6Otbgdx1V+L/UY7YOwtbhOLCxpStjoFC5YziFjzkV651jNksPVj7AJP0VJqLXrDhlTGo NRBg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:list-unsubscribe:list-subscribe:list-id:precedence :references:subject:cc:to:from:date:user-agent:message-id; bh=0/5c2cZfKVTnzv0GaqwutBjLS0drmGlD+Ynu1ljkoJQ=; fh=sP+g5SVT877kocLwsgEFtkKYgCNZjYecMHK7EDTYRLg=; b=0T0HuIbt0ToIl+cZriNv/pCOwza3b07T+UzqshH9fNSpFrQ61h9BmXdT1AzmIzD4fw Ls0kYnbQKkI0gKfCm+20Ai1Iq6s9Z0JKKDNcPCL8a0xP/+F5Dxb9kR3KDt3JKyJ5xLml P/8GD3PZM1f7T+cGtbl4DeskoDwdSkuWF99qCH56ptvWfE7wK++h25py9MnKGusPNnmX VsZ0r8w9CCfHf4PYdAJkYluz1GlXD3krX7a3UPTnRMZ+S05RjcxwACrRw0+93tNfnNDo ewyk85WDTrXG1B5DJfRJ4n8o2h8/5dGnTXGt2xrP+dAtaMYBjEvmiYhFzAvKqIlisYAM sipg==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-78459-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-78459-ouuuleilei=gmail.com@vger.kernel.org" Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [2604:1380:45d1:ec00::1]) by mx.google.com with ESMTPS id y17-20020a05622a005100b0042e5ad3ee27si2676831qtw.52.2024.02.23.06.19.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 06:19:01 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-78459-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) client-ip=2604:1380:45d1:ec00::1; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-78459-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45d1:ec00::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-78459-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 611EA1C2212E for ; Fri, 23 Feb 2024 14:19:01 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id C331884FA7; Fri, 23 Feb 2024 14:17:12 +0000 (UTC) Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B1972811F9 for ; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; cv=none; b=O6ODy7Ix6tYAXKSRbkxoO+8c/4lbYY1sfsXOo6ZyM2+5QeUxUbSzIkuFORLzsA2GNwh0NGNfV6G/hFG7xTF04wIuhIUiao5L8Gah/SYiE8wlb9VYor2S6JWxuJgU54WIOyI2YMYFIriJ1rwCQCSaALluYNWgxB/Tl1s0wyqvtGc= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708697829; c=relaxed/simple; bh=uBv+s4SGLMdbgolqp2QWNEru5imW1UxdLM5GyLNVTUw=; h=Message-ID:Date:From:To:Cc:Subject:References:MIME-Version: Content-Type; b=Ki2iKe/GKlgOakXDzEzOAqrpicCG8lSMCKffSSThB4ypeJhTz17X+dVXyJHPhhYhNm0f1IuZKLTMFKiOF37MrZcedfClQ8xUVNqiFIjdm4Om/pk9JuJ3fGCAb6sNGZV8X4kE91JQrw2K4w3YNLilXGvhClT5WhIu8wirOr7s57g= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9D369C43142; Fri, 23 Feb 2024 14:17:09 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.97) (envelope-from ) id 1rdWOE-000000077OA-2tYX; Fri, 23 Feb 2024 09:19:02 -0500 Message-ID: <20240223141902.554087446@goodmis.org> User-Agent: quilt/0.67 Date: Fri, 23 Feb 2024 09:18:45 -0500 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Mathieu Desnoyers , Andrew Morton , Daniel Vetter , David Airlie , =?utf-8?b?VmlsbGUgU3lyasOkbMOk?= , Rodrigo Vivi Subject: [for-next][PATCH 07/13] drm/i915: Add missing ; to __assign_str() macros in tracepoint code References: <20240223141838.985298316@goodmis.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791699652953923824 X-GMAIL-MSGID: 1791699652953923824 From: "Steven Rostedt (Google)" I'm working on improving the __assign_str() and __string() macros to be more efficient, and removed some unneeded semicolons. This triggered a bug in the build as some of the __assign_str() macros in intel_display_trace was missing a terminating semicolon. Link: https://lore.kernel.org/linux-trace-kernel/20240222133057.2af72a19@gandalf.local.home Cc: Daniel Vetter Cc: David Airlie Fixes: 2ceea5d88048b ("drm/i915: Print plane name in fbc tracepoints") Reviewed-by: Ville Syrjälä Acked-by: Rodrigo Vivi Signed-off-by: Steven Rostedt (Google) --- drivers/gpu/drm/i915/display/intel_display_trace.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/i915/display/intel_display_trace.h b/drivers/gpu/drm/i915/display/intel_display_trace.h index 99bdb833591c..7862e7cefe02 100644 --- a/drivers/gpu/drm/i915/display/intel_display_trace.h +++ b/drivers/gpu/drm/i915/display/intel_display_trace.h @@ -411,7 +411,7 @@ TRACE_EVENT(intel_fbc_activate, struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev), plane->pipe); __assign_str(dev, __dev_name_kms(plane)); - __assign_str(name, plane->base.name) + __assign_str(name, plane->base.name); __entry->pipe = crtc->pipe; __entry->frame = intel_crtc_get_vblank_counter(crtc); __entry->scanline = intel_get_crtc_scanline(crtc); @@ -438,7 +438,7 @@ TRACE_EVENT(intel_fbc_deactivate, struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev), plane->pipe); __assign_str(dev, __dev_name_kms(plane)); - __assign_str(name, plane->base.name) + __assign_str(name, plane->base.name); __entry->pipe = crtc->pipe; __entry->frame = intel_crtc_get_vblank_counter(crtc); __entry->scanline = intel_get_crtc_scanline(crtc); @@ -465,7 +465,7 @@ TRACE_EVENT(intel_fbc_nuke, struct intel_crtc *crtc = intel_crtc_for_pipe(to_i915(plane->base.dev), plane->pipe); __assign_str(dev, __dev_name_kms(plane)); - __assign_str(name, plane->base.name) + __assign_str(name, plane->base.name); __entry->pipe = crtc->pipe; __entry->frame = intel_crtc_get_vblank_counter(crtc); __entry->scanline = intel_get_crtc_scanline(crtc);