From patchwork Tue Sep 12 15:11:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 9949445 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 5C5F46024A for ; Tue, 12 Sep 2017 15:14:41 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4E7CD28F5C for ; Tue, 12 Sep 2017 15:14:41 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 435B328FBE; Tue, 12 Sep 2017 15:14:41 +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=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID 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 D2CED28F5C for ; Tue, 12 Sep 2017 15:14:40 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id B39086E036; Tue, 12 Sep 2017 15:14:16 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wr0-x242.google.com (mail-wr0-x242.google.com [IPv6:2a00:1450:400c:c0c::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id DAD8A6E036; Tue, 12 Sep 2017 15:14:14 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id g50so6388408wra.3; Tue, 12 Sep 2017 08:14:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=5jNMtIU0ru6qWXVyS4mKzlVJo42g6ycPsz/zNviCrJY=; b=JeDimHPnNoLedmRcg36AFnllEkxYGYdSFjrHYkvS4xt5WYYC643eZl0H7942Ls9bmn wHt0EOu+8lgWhTRwWn7knvASMNEYGIy1fmBW/VDd6IJMuujiwWhVI+B0vT2gxQZ6BAFM DECoXiK5TCOEriH5xPD9KqLPMT1bzfv+bGk0iQU1gGeNTncm3mHpV3YWvkvrUXaizgrU KuPetUzn0YJJ8VKiofeHFVmD6NLaK+huGZLs/oYfRN5OnvK4KWdh0Fb8G3neEKM6/5eN I4jWdzMA4CB2M/dQ+HnNvCNaHUWK7/TJyKlLzwYBCYafFWU9MweOkgZq4wQ5Z32tOMcN Huxg== 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=5jNMtIU0ru6qWXVyS4mKzlVJo42g6ycPsz/zNviCrJY=; b=SqPmi6/R+ACaZcYdqv0gmPoD6157IMtk7CuR/UW+XWjDdnjLtwNLzSa3un7r0FEHK9 pjXlfz65PsQUfqns2lJzVwBmiOlQVewSC+pZT9yYSHO61G3BJ6httHQdJDWJ0ViwbLRJ JTtsbLJyaK1L0WzFPeIydNzU7u20uTArorf4AXFbGgDnrlaPha7EuGuAJeKIIAjBIgmd xNN5IbxovYMrI1Y3lHAkRPpQEMOk03FRyE0Hfk0JPUTuInD/Idkkkug9MwDwA4jZjuw/ mSdcpuiyHWw5gaVpm59PfJ3zPf1uyQFQukddtCOEx/cSBwaNYLS+5jWxjtXxjcd4px8W xeEA== X-Gm-Message-State: AHPjjUjrg8OSFf90+7AJQqmvQFQhKZ3nVP6/FrKoBmX9+WkNXfNzDpOy veEmyCOwjlKm/jlD X-Google-Smtp-Source: AOwi7QCnp3Pny1z0V/NWLmIdQ+WXhVANcfas5kG3J/h8ocVGyd/3lbIr3mAWvCE2QfGa72QVlei9QA== X-Received: by 10.223.135.66 with SMTP id 2mr12276216wrz.208.1505229253289; Tue, 12 Sep 2017 08:14:13 -0700 (PDT) Received: from localhost.localdomain (91-115-35-97.adsl.highway.telekom.at. [91.115.35.97]) by smtp.gmail.com with ESMTPSA id 110sm6593819wra.39.2017.09.12.08.14.07 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Sep 2017 08:14:11 -0700 (PDT) From: Christian Gmeiner To: dri-devel@lists.freedesktop.org Subject: [PATCH V4 22/23] drm/etnaviv: enable debug registers on demand Date: Tue, 12 Sep 2017 17:11:54 +0200 Message-Id: <20170912151155.4603-23-christian.gmeiner@gmail.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170912151155.4603-1-christian.gmeiner@gmail.com> References: <20170912151155.4603-1-christian.gmeiner@gmail.com> Cc: linux+etnaviv@armlinux.org.uk, etnaviv@lists.freedesktop.org, cphealy@gmail.com X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Some performance register are debug register and they need to be enabled in order to be functional. Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach --- drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c index 04acc3a64c3c..05122761c7f3 100644 --- a/drivers/gpu/drm/etnaviv/etnaviv_gpu.c +++ b/drivers/gpu/drm/etnaviv/etnaviv_gpu.c @@ -1348,6 +1348,11 @@ static void sync_point_perfmon_sample_pre(struct etnaviv_gpu *gpu, val &= ~VIVS_PM_POWER_CONTROLS_ENABLE_MODULE_CLOCK_GATING; gpu_write(gpu, VIVS_PM_POWER_CONTROLS, val); + /* enable debug register */ + val = gpu_read(gpu, VIVS_HI_CLOCK_CONTROL); + val &= ~VIVS_HI_CLOCK_CONTROL_DISABLE_DEBUG_REGISTERS; + gpu_write(gpu, VIVS_HI_CLOCK_CONTROL, val); + sync_point_perfmon_sample(gpu, event, ETNA_PM_PROCESS_PRE); } @@ -1366,6 +1371,11 @@ static void sync_point_perfmon_sample_post(struct etnaviv_gpu *gpu, *pmr->bo_vma = pmr->sequence; } + /* disable debug register */ + val = gpu_read(gpu, VIVS_HI_CLOCK_CONTROL); + val |= VIVS_HI_CLOCK_CONTROL_DISABLE_DEBUG_REGISTERS; + gpu_write(gpu, VIVS_HI_CLOCK_CONTROL, val); + /* enable clock gating */ val = gpu_read(gpu, VIVS_PM_POWER_CONTROLS); val |= VIVS_PM_POWER_CONTROLS_ENABLE_MODULE_CLOCK_GATING;