From patchwork Tue Sep 12 15:11:36 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christian Gmeiner X-Patchwork-Id: 9949395 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 76F276024A for ; Tue, 12 Sep 2017 15:12:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6920C286EF for ; Tue, 12 Sep 2017 15:12:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5DFC428F9C; Tue, 12 Sep 2017 15:12:49 +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 121AD286EF for ; Tue, 12 Sep 2017 15:12:49 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5A6BE6E67C; Tue, 12 Sep 2017 15:12:48 +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 AEB226E67B; Tue, 12 Sep 2017 15:12:46 +0000 (UTC) Received: by mail-wr0-x242.google.com with SMTP id p37so6381411wrb.5; Tue, 12 Sep 2017 08:12:46 -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=DBcZQwKBD5pdqHFi83YRV4qJ4AT3KKS01IlIKYR9faQ=; b=Pes2YTRaTvsHwrda5ILgNkVgN+u540mVgLGbtobt79PukXDJ6RaH6iDDfrYwEE2YZd antsewC2C87+1uPbuBOmltCYViusS2qqC7L6+x2tU3YCYYGvwsasS2kRyUdpZqCd6M1U 8N7wCrnaWhPfuEFVBq4JjGvEDD2K3QJEAMYKjiIyTchwuiPrHhmj2XSnIyRusfkrIyzx Cdpad9TDOP7C6rn7VAqokjVGu7Gscw0zPYUPL3YxsJfQC8s1oe0J+si2YmYlsxZ+jEfT +D+vzbqFQHyRvVD93vOI2iKzb5fmtEGfB2IQX/AxUoX5BZK7ABZl9HSrMoKZk1wlsOWj r6vA== 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=DBcZQwKBD5pdqHFi83YRV4qJ4AT3KKS01IlIKYR9faQ=; b=hfGLAeIeEJsgw6CKoHRSu6+87aXvYE6h+QSkprgSaop3RN5N0arRwmFv6NriEv725W YUS48Tkm3UEwNTmdVd7nwb5Bf0fqGsy+U2VEca/sO2ondWSLWl3N1CYtMAtvbSvUuvkl i87qqPy4aia1GVHD/GScS2LBDi/uVZ2/GQJPAMIoxdvVxlKCkv3RzcSn5eMA3Hj6wN+r nTgo+o/p4SEJxYkZaVh1IDLkY05JEUXoJu7vq/itmGsenVEVF09F3a/lxrvvcmzO5PIz xfYPLNhiMsQoH/X6UWG8bT4K8gAFzb2qkWklAM4iFdmh9Ugl1GgoKAvknLXHYaFUB8m6 +m6g== X-Gm-Message-State: AHPjjUhN5w8ImS1th5BErOvsNVd8frp+E7PnY3ADMEjibAG1G2jXIIrc 2X5l2vLYiD0YJ5Aa X-Google-Smtp-Source: ADKCNb7dVYRB73IBysumi5BWcoWtj3PZ13dRtfSPfgJeaUbdke6QoAXQy4B+TrWubIYDlNJGRIiBzQ== X-Received: by 10.223.182.80 with SMTP id i16mr13125160wre.131.1505229164936; Tue, 12 Sep 2017 08:12:44 -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.12.40 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 12 Sep 2017 08:12:43 -0700 (PDT) From: Christian Gmeiner To: dri-devel@lists.freedesktop.org Subject: [PATCH V4 04/23] drm/etnaviv: add uapi for perfmon feature Date: Tue, 12 Sep 2017 17:11:36 +0200 Message-Id: <20170912151155.4603-5-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 Sadly we can not read any registers via command stream so we need to extend the drm_etnaviv_gem_submit struct with performance monitor requests. Those requests gets process before or after the actual submitted command stream. The Vivante kernel driver has a special ioctl to read all perfmon registers at once and return it. Changes from v1 -> v2: - use a 16 bit value for signals - fix padding issues Signed-off-by: Christian Gmeiner --- include/uapi/drm/etnaviv_drm.h | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/include/uapi/drm/etnaviv_drm.h b/include/uapi/drm/etnaviv_drm.h index c065c8308bbd..110cc73bf549 100644 --- a/include/uapi/drm/etnaviv_drm.h +++ b/include/uapi/drm/etnaviv_drm.h @@ -150,6 +150,19 @@ struct drm_etnaviv_gem_submit_bo { __u64 presumed; /* in/out, presumed buffer address */ }; +/* performance monitor request (pmr) */ +#define ETNA_PM_PROCESS_PRE 0x0001 +#define ETNA_PM_PROCESS_POST 0x0002 +struct drm_etnaviv_gem_submit_pmr { + __u32 flags; /* in, when to process request (ETNA_PM_PROCESS_x) */ + __u8 domain; /* in, pm domain */ + __u8 pad; + __u16 signal; /* in, pm signal */ + __u32 sequence; /* in, sequence number */ + __u32 read_offset; /* in, offset from read_bo */ + __u32 read_idx; /* in, index of read_bo buffer */ +}; + /* Each cmdstream submit consists of a table of buffers involved, and * one or more cmdstream buffers. This allows for conditional execution * (context-restore), and IB buffers needed for per tile/bin draw cmds. @@ -175,6 +188,9 @@ struct drm_etnaviv_gem_submit { __u64 stream; /* in, ptr to cmdstream */ __u32 flags; /* in, mask of ETNA_SUBMIT_x */ __s32 fence_fd; /* in/out, fence fd (see ETNA_SUBMIT_FENCE_FD_x) */ + __u64 pmrs; /* in, ptr to array of submit_pmr's */ + __u32 nr_pmrs; /* in, number of submit_pmr's */ + __u32 pad; }; /* The normal way to synchronize with the GPU is just to CPU_PREP on