From patchwork Mon Jun 8 21:04:57 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Paul X-Patchwork-Id: 11594035 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6CA801391 for ; Mon, 8 Jun 2020 21:06:10 +0000 (UTC) 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 mail.kernel.org (Postfix) with ESMTPS id 499252074B for ; Mon, 8 Jun 2020 21:06:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=poorly.run header.i=@poorly.run header.b="eV6tB2DM" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 499252074B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=poorly.run Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7D79F6E99C; Mon, 8 Jun 2020 21:06:09 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk1-x743.google.com (mail-qk1-x743.google.com [IPv6:2607:f8b0:4864:20::743]) by gabe.freedesktop.org (Postfix) with ESMTPS id B4BC16E9A2 for ; Mon, 8 Jun 2020 21:06:08 +0000 (UTC) Received: by mail-qk1-x743.google.com with SMTP id w1so18788641qkw.5 for ; Mon, 08 Jun 2020 14:06:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=poorly.run; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=88E1b1M85yoLt2wQSUARt1kqrX/wmst0RMRkdQQFLvY=; b=eV6tB2DMiYMp9aq5CL2nHjRZfadoA56ZVinBb8t1ouoHvNvsZdHME1MO6SN75PuU3O 7pe+icAw3bycKTtJjBP3EssD8kQDOjH8/b6a69azEZ7plAQwmSFYe13Iv96OCAOAAbIE KvlIqzAwKODnrtgDHQxgKdLObgPHEwmhhM2VH8iVpzU1f7sWyf45PHXSEPhGmqEotQXv 0cvRnineQC3NVTNPdZgxpGWu3j5sfJUZGpDGrnjUHoLHHVAYI8EfFHo1lKEkURHEd4gd sbzQ+YVZgQ0S5vwfM5hLyQoXx5umlq1MUMJhRiFyk31QiEjn/4OQU0/pjk45lHjTGXEL Stpg== 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=88E1b1M85yoLt2wQSUARt1kqrX/wmst0RMRkdQQFLvY=; b=pa7V23B5H9TiohrU5fuDcytH7IOuA2QPy4ilTuz5mKQ9UfQ9adiNpcFMkfyECRmwGk rYoP6xAHfxetjQtKkCsPPzRtpYqzC+v2OD+jJu18xAF+e+0K8rDdufXl5687W5KGHh5k 630a5aCzSApZhVPgsdetJOBjahGhfrhjlOfJJL44SSXfkCLVKMW9rvVVHNsoLcDFQuEZ LMEV6e/GnDLESi5W1ST/IowoVLzH4yRTF7MMj2ugiUvX92qsFysyWzjkcI4iuT7AmwUI xVizdlq+TVrgZaheY7aK4ob5QO+IsAYFMLesZZFWhjeZRQjJ3GCq5Hb8mvFlaGvduWe3 ABmw== X-Gm-Message-State: AOAM530naP1BE66IGCyvPtVzUO5d9PAFAJt+BDA9z68Gf67A4TPCF7HM +zJMqBVn/AThBAHnKOCjAr99fO8LoXc= X-Google-Smtp-Source: ABdhPJw+jlIdPJV1eXMsqqg65yxIIDLqsUSVa/vXlYz25h1eL1tIBueBHjuCloadV2NlG9t6xhSOPA== X-Received: by 2002:a05:620a:15e8:: with SMTP id p8mr25094222qkm.333.1591650367719; Mon, 08 Jun 2020 14:06:07 -0700 (PDT) Received: from localhost (mobile-166-173-249-24.mycingular.net. [166.173.249.24]) by smtp.gmail.com with ESMTPSA id u7sm7606239qku.119.2020.06.08.14.06.07 (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 08 Jun 2020 14:06:07 -0700 (PDT) From: Sean Paul To: dri-devel@lists.freedesktop.org Subject: [PATCH v5 07/13] drm/etnaviv: Change buffer dump checks to target syslog Date: Mon, 8 Jun 2020 17:04:57 -0400 Message-Id: <20200608210505.48519-8-sean@poorly.run> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200608210505.48519-1-sean@poorly.run> References: <20200608210505.48519-1-sean@poorly.run> 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: , Cc: David Airlie , daniel.vetter@ffwll.ch, etnaviv@lists.freedesktop.org, Sean Paul , tzimmermann@suse.de, Russell King MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" From: Sean Paul Since the logs protected by these checks specifically target syslog, use the new drm_debug_syslog_enabled() call to avoid triggering these prints when only trace is enabled. Signed-off-by: Sean Paul Changes in v5: -Added to the set --- drivers/gpu/drm/etnaviv/etnaviv_buffer.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c index 76d38561c910..7713474800e8 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_buffer.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_buffer.c @@ -353,7 +353,7 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, lockdep_assert_held(&gpu->lock); - if (drm_debug_enabled(DRM_UT_DRIVER)) + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) etnaviv_buffer_dump(gpu, buffer, 0, 0x50); link_target = etnaviv_cmdbuf_get_va(cmdbuf, @@ -509,13 +509,13 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, etnaviv_cmdbuf_get_va(buffer, &gpu->mmu_context->cmdbuf_mapping) + buffer->user_size - 4); - if (drm_debug_enabled(DRM_UT_DRIVER)) + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) pr_info("stream link to 0x%08x @ 0x%08x %p\n", return_target, etnaviv_cmdbuf_get_va(cmdbuf, &gpu->mmu_context->cmdbuf_mapping), cmdbuf->vaddr); - if (drm_debug_enabled(DRM_UT_DRIVER)) { + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) { print_hex_dump(KERN_INFO, "cmd ", DUMP_PREFIX_OFFSET, 16, 4, cmdbuf->vaddr, cmdbuf->size, 0); @@ -534,6 +534,6 @@ void etnaviv_buffer_queue(struct etnaviv_gpu *gpu, u32 exec_state, VIV_FE_LINK_HEADER_PREFETCH(link_dwords), link_target); - if (drm_debug_enabled(DRM_UT_DRIVER)) + if (drm_debug_syslog_enabled(DRM_UT_DRIVER)) etnaviv_buffer_dump(gpu, buffer, 0, 0x50); }