From: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Date: Mon, 2 Mar 2020 12:04:36 +0000 (+0200)
Subject: include/drm-uapi: bump headers
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ea8cb79742fb061817c11bc8ee7854d3b2583283;p=mesa.git

include/drm-uapi: bump headers

From drm-next at the following commit :

  commit 1aa63ddf726ea049279989b93b69b57ce6efd75b
  Merge: 774f1eeb18b0 14d0066b8477
  Author: Dave Airlie <airlied@redhat.com>
  Date:   Wed Apr 22 10:40:34 2020 +1000

      Merge tag 'drm-misc-next-2020-04-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next

Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Acked-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Rafael Antognolli <rafael.antognolli@intel.com>
Reviewed-by: Mark Janes <mark.a.janes@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4021>
---

diff --git a/include/drm-uapi/README b/include/drm-uapi/README
index 08dc139ecc3..76a9d32c330 100644
--- a/include/drm-uapi/README
+++ b/include/drm-uapi/README
@@ -13,8 +13,9 @@ $ make headers_install INSTALL_HDR_PATH=/path/to/install
 
 The last update was done at the following kernel commit :
 
-commit 8f3d9f354286745c751374f5f1fcafee6b3f3136
-Author: Linus Torvalds <torvalds@linux-foundation.org>
-Date:   Sun Apr 12 12:35:55 2020 -0700
+commit 1aa63ddf726ea049279989b93b69b57ce6efd75b
+Merge: 774f1eeb18b0 14d0066b8477
+Author: Dave Airlie <airlied@redhat.com>
+Date:   Wed Apr 22 10:40:34 2020 +1000
 
-    Linux 5.7-rc1
+    Merge tag 'drm-misc-next-2020-04-14' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
diff --git a/include/drm-uapi/i915_drm.h b/include/drm-uapi/i915_drm.h
index 3794e76821a..2b55af13a1f 100644
--- a/include/drm-uapi/i915_drm.h
+++ b/include/drm-uapi/i915_drm.h
@@ -1969,6 +1969,30 @@ enum drm_i915_perf_property_id {
 	 */
 	DRM_I915_PERF_PROP_HOLD_PREEMPTION,
 
+	/**
+	 * Specifying this pins all contexts to the specified SSEU power
+	 * configuration for the duration of the recording.
+	 *
+	 * This parameter's value is a pointer to a struct
+	 * drm_i915_gem_context_param_sseu.
+	 *
+	 * This property is available in perf revision 4.
+	 */
+	DRM_I915_PERF_PROP_GLOBAL_SSEU,
+
+	/**
+	 * This optional parameter specifies the timer interval in nanoseconds
+	 * at which the i915 driver will check the OA buffer for available data.
+	 * Minimum allowed value is 100 microseconds. A default value is used by
+	 * the driver if this parameter is not specified. Note that larger timer
+	 * values will reduce cpu consumption during OA perf captures. However,
+	 * excessively large values would potentially result in OA buffer
+	 * overwrites as captures reach end of the OA buffer.
+	 *
+	 * This property is available in perf revision 5.
+	 */
+	DRM_I915_PERF_PROP_POLL_OA_PERIOD,
+
 	DRM_I915_PERF_PROP_MAX /* non-ABI */
 };