From patchwork Thu Feb 22 18:30:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Steven Rostedt X-Patchwork-Id: 204992 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp135354dyb; Thu, 22 Feb 2024 10:39:22 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCVvP8ogcu1PdsfnS+z3Pg9mja35YXtO8e4//aA20k8V5LiTCmPGgJjkSV4yOY/bZQblDkLhRddD9cTR6aRtQqkhF250MQ== X-Google-Smtp-Source: AGHT+IEa4e7sm0bxh5hJH1+p0e9o3bfvTcZZVgZ80uXVsik4Csx0Z2J/UwLKUHygF8Kvfrx18YUj X-Received: by 2002:a05:6870:414b:b0:21e:5f33:9f5b with SMTP id r11-20020a056870414b00b0021e5f339f5bmr20183120oad.26.1708627161925; Thu, 22 Feb 2024 10:39:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708627161; cv=pass; d=google.com; s=arc-20160816; b=uIFoDDa+HulH17ts07KbAEKxKgb1iiS2k5tpZLy+5eyTl3mj4foqiwP8Q/1RA3vTzM QTfg8BTSA+1wq/iqASHFmzXwjw5Z61WK9AzOhbjcDPeFDmcvUxjf8hc3DjSSJ7TPrxa6 GJv8foNBlUglreNGQfKqRgDpfR4EHEBHSxiZjHbR+MDb2He7+0+lqPKcfon5TXT88Arr UhiOep8SqE2fthlKSfd/qzqS5L0I22O9yYLgjLqEImy0KYKwsu7EoYb3oOktSzWEJpi9 Z97v8ki2FnJaB9EUYs3U6mp6ypc26SfuGViPXQZWjBcvDrMlbdYIUlIWjQI3XSYInJub ZJuA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:subject:cc:to:from :date; bh=BNhDioYhbtLpbzn0FteHMTk8w6lD0uEvJm4MFp1I6YM=; fh=kPRxJNOku1+H7hvbRauk+pHBmW9RnLr10UO8YUlD/B8=; b=sjErYu0rSGBrK5pX2CL32MmYhp8rJNggzJVQ5IhlWNSxxxPVZp7/jti5e6OewtSRuu RFqEiEwh6Rcm/ynZ862jew4znbn2ZnE1o/2cEV1yARDEj0Szk1n1C64239zhggQ2pmJH fkLAtVMSfrmTkuiTUeypU/TJBYabsjHGh3GakGVBf0ALaAGRLqKbsGB6kbnkFjeG4ljF H82aw5q01Z+YVbAm7DMEnrainI3KLnxmsvHleJRn8gwSg+yCYmJinEHWKOQco2MixH62 bwInyRoYp4iKQGuktKRKhW85W5TQrlL4HAeHWPDymZVeUmEtINIkh5kOF98GLkerdEXQ lTBw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-77142-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-77142-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id z125-20020a633383000000b005cdd9963f49si10790781pgz.863.2024.02.22.10.39.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 22 Feb 2024 10:39:21 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-77142-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; arc=pass (i=1); spf=pass (google.com: domain of linux-kernel+bounces-77142-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-77142-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 sv.mirrors.kernel.org (Postfix) with ESMTPS id B2F4B28832D for ; Thu, 22 Feb 2024 18:39:21 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 78A3A13BAE4; Thu, 22 Feb 2024 18:29:09 +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 06A69137923; Thu, 22 Feb 2024 18:29:07 +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=1708626548; cv=none; b=fI7/oXZJsE/3h0hGBRnNX/dUu0kD4t2j5bcz/TJ9VLsPgbr1bl8+fu+7igKcMwQ9vcVyxjrZ4nEb7b3fXzmN2hOew5LgmOKbPwcjhz47YmesdDqkWCGZiOorCo4lsSwHvxfN1coTeqpq3l/BH8w/6/zNIityso+/9GHvtmFqDfU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708626548; c=relaxed/simple; bh=pBekZ+WsAj+6n/8strTHjSgCBwuZw+ZZ7K+e+nZzKYY=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type; b=F8tI2NmIuiDAoXlden6hm+wB5PkTGq7UiZ79tObuFZ8raj0vUcOvcFgLmHXMBIkhRssFZclIz+unGCHowEKQVEaKVfh+wzDOjhqwsv6WGNHpRL011IPevvg34x1y5fyHtn+RXiTNVUDMOyo9IXHn4+puA3nuGeN1jc0o2IYeit0= 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 B8E11C433F1; Thu, 22 Feb 2024 18:29:06 +0000 (UTC) Date: Thu, 22 Feb 2024 13:30:57 -0500 From: Steven Rostedt To: LKML , Linux Trace Kernel Cc: dri-devel@lists.freedesktop.org, intel-xe@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, "Ville =?utf-8?b?U3lyasOkbMOk?= " , Daniel Vetter , David Airlie Subject: [PATCH] drm/i915: Add missing ; to __assign_str() macros in tracepoint code Message-ID: <20240222133057.2af72a19@gandalf.local.home> X-Mailer: Claws Mail 3.19.1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) 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: 1791625434640313072 X-GMAIL-MSGID: 1791625434640313072 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. Fixes: 2ceea5d88048b ("drm/i915: Print plane name in fbc tracepoints") Signed-off-by: Steven Rostedt (Google) Reviewed-by: Ville Syrjälä Acked-by: Rodrigo Vivi --- 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);