From patchwork Thu Apr 5 12:40:24 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tvrtko Ursulin X-Patchwork-Id: 10324527 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 3D085600CB for ; Thu, 5 Apr 2018 12:40:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2C85627C05 for ; Thu, 5 Apr 2018 12:40:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1D1BA29197; Thu, 5 Apr 2018 12:40:42 +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_SIGNED, 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 BEAC029182 for ; Thu, 5 Apr 2018 12:40:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C9E66E759; Thu, 5 Apr 2018 12:40:40 +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 59C876E0F6 for ; Thu, 5 Apr 2018 12:40:39 +0000 (UTC) Received: by mail-wr0-x241.google.com with SMTP id n2so24823090wrj.7 for ; Thu, 05 Apr 2018 05:40:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ursulin-net.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=bAQSDdoRmKmWHj8H+EbvBGCdvWGPZ69K/H8CSW/mW5c=; b=gwdjVa3AJLTNUwI7mrNulPF3v5Eyl8NR2+nfE8GaR/FrM0Gv7QoNH+EbbZwq/OjWti MgoasCU24Fibv2i8YZSaFX7QzOFLpU6oPjN0A6G8O/URsY1mQmGaGjHIrkEO2yhD4C62 0IVGA8E7An29LwII7P97BjzKcwQv90yAfcbdQdrpskzFgu4lsDF2//13CoSNNmo1s9hD vwE3FCFvMBgvCAC9W8H3OoiFBlOTNbegxdelDUIauZAaYgeerU5zGZiQF737rIkObpKn MFDB/APh5LwA+WgWGo2HeG2FZEIiV+KqHgoyj82f31zyoG8uhbQO3lP2UbBva7DorSoG F1pg== 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=bAQSDdoRmKmWHj8H+EbvBGCdvWGPZ69K/H8CSW/mW5c=; b=LzWlLEwQLJXJcfRdpOCpy26Y4F/tgQefyBL5X2OPWJpJfVc+4DBDqra6tQS9D4OOZ+ X+dtzM6rszlzw3H12iuWh/TlphmBO4/oPORARxbWpT59YR4nb5i6Va/SBcZQW0nbuFez AdsjAwRkzgb+xJcCYd5FclEpAoTB03LNGPFbwX0SgNt9FCRM757vCueYkO1SfQKjpgBf D6kuQZaL6AEFUxYgnd1eZ8q9R0Hxx1Zib+vcEGrmi+WW7U+yigjOSler/14u5XP9VWM/ nl++8P7EOZZgamha8pRoFbXEOyGKXm4j9ty5RS5X/rP0erlVxAI3UpHwYjMzZdwyz/9m OeZw== X-Gm-Message-State: AElRT7ERWgIebyNitclzOf1NE6eW/dCeMp2qiWMeW5PusaDYViT7RYHT AAUO+vs62dmTWRUhDw6lbhb9vA== X-Google-Smtp-Source: AIpwx49oyW9T4rXj5ZsZjubn7q6a5oju+IstXv9W5Fl2kA/SzL0D/O6ttkKLXGvssb8ZlbXA+BVBtw== X-Received: by 10.223.172.236 with SMTP id o99mr16918455wrc.36.1522932038012; Thu, 05 Apr 2018 05:40:38 -0700 (PDT) Received: from localhost.localdomain ([95.146.144.186]) by smtp.gmail.com with ESMTPSA id i44sm4796068wri.23.2018.04.05.05.40.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 05 Apr 2018 05:40:37 -0700 (PDT) From: Tvrtko Ursulin X-Google-Original-From: Tvrtko Ursulin To: igt-dev@lists.freedesktop.org Date: Thu, 5 Apr 2018 13:40:24 +0100 Message-Id: <20180405124028.22766-2-tvrtko.ursulin@linux.intel.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180405124028.22766-1-tvrtko.ursulin@linux.intel.com> References: <20180405124028.22766-1-tvrtko.ursulin@linux.intel.com> Subject: [Intel-gfx] [PATCH i-g-t 1/5] include: i915 uAPI headers 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: , Cc: Intel-gfx@lists.freedesktop.org MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Virus-Scanned: ClamAV using ClamSMTP From: Tvrtko Ursulin Temporary up to date uAPI headers. Signed-off-by: Tvrtko Ursulin --- include/drm-uapi/i915_drm.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/include/drm-uapi/i915_drm.h b/include/drm-uapi/i915_drm.h index 16e452aa12d4..14c7e790f6ed 100644 --- a/include/drm-uapi/i915_drm.h +++ b/include/drm-uapi/i915_drm.h @@ -110,9 +110,17 @@ enum drm_i915_gem_engine_class { enum drm_i915_pmu_engine_sample { I915_SAMPLE_BUSY = 0, I915_SAMPLE_WAIT = 1, - I915_SAMPLE_SEMA = 2 + I915_SAMPLE_SEMA = 2, + I915_SAMPLE_QUEUED = 3, + I915_SAMPLE_RUNNABLE = 4, + I915_SAMPLE_RUNNING = 5, }; + /* Divide counter value by divisor to get the real value. */ +#define I915_SAMPLE_QUEUED_DIVISOR (1024) +#define I915_SAMPLE_RUNNABLE_DIVISOR (1024) +#define I915_SAMPLE_RUNNING_DIVISOR (1024) + #define I915_PMU_SAMPLE_BITS (4) #define I915_PMU_SAMPLE_MASK (0xf) #define I915_PMU_SAMPLE_INSTANCE_BITS (8) @@ -133,6 +141,15 @@ enum drm_i915_pmu_engine_sample { #define I915_PMU_ENGINE_SEMA(class, instance) \ __I915_PMU_ENGINE(class, instance, I915_SAMPLE_SEMA) +#define I915_PMU_ENGINE_QUEUED(class, instance) \ + __I915_PMU_ENGINE(class, instance, I915_SAMPLE_QUEUED) + +#define I915_PMU_ENGINE_RUNNABLE(class, instance) \ + __I915_PMU_ENGINE(class, instance, I915_SAMPLE_RUNNABLE) + +#define I915_PMU_ENGINE_RUNNING(class, instance) \ + __I915_PMU_ENGINE(class, instance, I915_SAMPLE_RUNNING) + #define __I915_PMU_OTHER(x) (__I915_PMU_ENGINE(0xff, 0xff, 0xf) + 1 + (x)) #define I915_PMU_ACTUAL_FREQUENCY __I915_PMU_OTHER(0)