From patchwork Mon Jun 25 17:25:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10487069 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D03536038C for ; Mon, 25 Jun 2018 17:25:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B8036285A4 for ; Mon, 25 Jun 2018 17:25:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id AC4D2285A9; Mon, 25 Jun 2018 17:25:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-5.2 required=2.0 tests=BAYES_00, MAILING_LIST_MULTI, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 624DF285A4 for ; Mon, 25 Jun 2018 17:25:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4BD5D6E1D5; Mon, 25 Jun 2018 17:25:55 +0000 (UTC) X-Original-To: Intel-gfx@lists.freedesktop.org Delivered-To: Intel-gfx@lists.freedesktop.org Received: from mail-wr0-x241.google.com (mail-wr0-x241.google.com [IPv6:2a00:1450:400c:c0c::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id DD7076E199 for ; Mon, 25 Jun 2018 17:25:53 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id k16-v6so14506166wro.0 for ; Mon, 25 Jun 2018 10:25:53 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=9KuJm5FddBNsWSyEEp1erq34KaMb5lyqyPKTNbLAQow=; b=KRTFchTa7jGVOCFjFJ3+VHuHmQ4kndarhZWvZOtd4MOFHyJnbO65q3nVfdHcbVrQCX Bk69VboAXFPXlaFR2iYkV42F2QBxG0ouIOKM/giYgJlQKWCFdqgmVw9yl55lnWbpi3Fj CCIfviw/NoMZ9vDZDlLyD+gSviuGYZh4gyHrDW2MrATLwgNN7dGXcVONu1Pg2TkLm+0T IG3K9egqnf7mdEZA4ePdqZ+OHH+d+aDeJY3wgc1iLQxgaT4t5zwRWafgOacFFUbQIOPg kpnDkS0CN01Y+cL64gHDkHCIaf1ZDtw2ydQZ5qZh/cD6FBGrNmoYRnM1COq1teONFZIA F5Ew== X-Gm-Message-State: APt69E2/cszSy/8hBUS6L9NZ5q6uYDuiSSuEBi/jJrUw9Gp3+4RAzqrh 16EbabzlVI1XVt/DHE80CNLwGLyN X-Google-Smtp-Source: AAOMgpdfWuTK6d0NP5hwM5I6TVrYb7+VQDqFd6iNhe91//YTtoa9s8JWCofjrdiEADyd2Hb7j9vRpQ== X-Received: by 2002:adf:fc8c:: with SMTP id g12-v6mr10671925wrr.216.1529947552382; Mon, 25 Jun 2018 10:25:52 -0700 (PDT) Received: from localhost.localdomain ([95.146.151.144]) by smtp.gmail.com with ESMTPSA id c18-v6sm27849800wrq.17.2018.06.25.10.25.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jun 2018 10:25:51 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: Intel-gfx@lists.freedesktop.org Date: Mon, 25 Jun 2018 18:25:46 +0100 Message-Id: <20180625172546.7729-2-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20180625172546.7729-1-tvrtko.ursulin@linux.intel.com> References: <20180625172546.7729-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH 2/2] drm/i915/tracepoints: Remove DRM_I915_LOW_LEVEL_TRACEPOINTS Kconfig option X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin This Kconfig option was added to protect the implementation specific internals from user expectations but so far it was mostly hassle. Remove it so it is possible to debug request submission on any kernel anywhere. This adds around 4k to default i915.ko build but should have no performance effects due inactive tracepoints being no-op-ed out and out- of-line. Users should remember tracepoints which are close to low level i915 implementation details are subject to change and cannot be guaranteed. Signed-off-by: Tvrtko Ursulin --- drivers/gpu/drm/i915/Kconfig.debug | 11 ----------- drivers/gpu/drm/i915/i915_trace.h | 20 -------------------- 2 files changed, 31 deletions(-) diff --git a/drivers/gpu/drm/i915/Kconfig.debug b/drivers/gpu/drm/i915/Kconfig.debug index 9de8b1c51a5c..058094235329 100644 --- a/drivers/gpu/drm/i915/Kconfig.debug +++ b/drivers/gpu/drm/i915/Kconfig.debug @@ -132,17 +132,6 @@ config DRM_I915_SELFTEST_BROKEN If in doubt, say "N". -config DRM_I915_LOW_LEVEL_TRACEPOINTS - bool "Enable low level request tracing events" - depends on DRM_I915 - default n - help - Choose this option to turn on low level request tracing events. - This provides the ability to precisely monitor engine utilisation - and also analyze the request dependency resolving timeline. - - If in doubt, say "N". - config DRM_I915_DEBUG_VBLANK_EVADE bool "Enable extra debug warnings for vblank evasion" depends on DRM_I915 diff --git a/drivers/gpu/drm/i915/i915_trace.h b/drivers/gpu/drm/i915/i915_trace.h index 4a6a15075afa..c0352a1b036c 100644 --- a/drivers/gpu/drm/i915/i915_trace.h +++ b/drivers/gpu/drm/i915/i915_trace.h @@ -679,7 +679,6 @@ DEFINE_EVENT(i915_request, i915_request_add, TP_ARGS(rq) ); -#if defined(CONFIG_DRM_I915_LOW_LEVEL_TRACEPOINTS) DEFINE_EVENT(i915_request, i915_request_submit, TP_PROTO(struct i915_request *rq), TP_ARGS(rq) @@ -751,25 +750,6 @@ TRACE_EVENT(i915_request_out, __entry->global_seqno, __entry->completed) ); -#else -#if !defined(TRACE_HEADER_MULTI_READ) -static inline void -trace_i915_request_submit(struct i915_request *rq) -{ -} - -static inline void -trace_i915_request_in(struct i915_request *rq, unsigned int port) -{ -} - -static inline void -trace_i915_request_out(struct i915_request *rq) -{ -} -#endif -#endif - TRACE_EVENT(intel_engine_notify, TP_PROTO(struct intel_engine_cs *engine, bool waiters), TP_ARGS(engine, waiters),