intel: Export total subslice and EU counts
PATCH 1/1 intel: Export total subslice and EU counts
From: Jeff McGee <[email protected]>
Update kernel interface with new I915_GETPARAM ioctl entries for subslice total and EU total. Add a wrapping function for each parameter. Userspace drivers need these values when constructing GPGPU commands. This kernel query method is intended to replace the PCI ID-based tables that userspace drivers currently maintain. The kernel driver can employ fuse register reads as needed to ensure the most accurate determination of GT config attributes. This first became important with Cherryview in which the config could differ between devices with the same PCI ID.
The kernel detection of these values is device-specific. Userspace drivers should continue to maintain ID-based tables for older devices which return ENODEV when using this query.
For: VIZ-4636
--- include/drm/i915_drm.h | 2 ++ intel/intel_bufmgr.h | 4 ++++ intel/intel_bufmgr_gem.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+)
include/drm/i915_drm.h +2 -0
@@ -340,6 +340,8 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_HAS_EXEC_HANDLE_LUT 26#define I915_PARAM_HAS_WT 27#define I915_PARAM_CMD_PARSER_VERSION 28 +#define I915_PARAM_SUBSLICE_TOTAL 32 +#define I915_PARAM_EU_TOTAL 33 typedef struct drm_i915_getparam { int param;
intel/intel_bufmgr.h +4 -0
@@ -37,6 +37,7 @@#include <stdio.h> #include <stdint.h> #include <stdio.h> +#include <stdbool.h> struct drm_clip_rect ;
@@ -264,6 +265,9 @@ int drm_intel_get_reset_stats(drm_intel_context *ctx,uint32_t *active, uint32_t *pending); +int drm_intel_get_subslice_total (int fd,unsigned int *subslice_total); +int drm_intel_get_eu_total (int fd,unsigned int *eu_total); +/** @{ Compatibility defines to keep old code building despite the symbol rename * from dri_* to drm_intel_* */
intel/intel_bufmgr_gem.c +31 -0
@@ -3292,6 +3292,37 @@ drm_intel_reg_read(drm_intel_bufmgr *bufmgr,return ret; } +drm_public int +drm_intel_get_subslice_total (int fd,unsigned int *subslice_total) +{ +drm_i915_getparam_t gp; +int ret; + +memclear (gp); + gp.value = (int *)subslice_total; + gp.param =I915_PARAM_SUBSLICE_TOTAL ; + ret =drmIoctl (fd,DRM_IOCTL_I915_GETPARAM , &gp); +if (ret) +return -errno; + +return 0 ; +} + +drm_public int +drm_intel_get_eu_total (int fd,unsigned int *eu_total) +{ +drm_i915_getparam_t gp; +int ret; + +memclear (gp); + gp.value = (int *)eu_total; + gp.param =I915_PARAM_EU_TOTAL ; + ret =drmIoctl (fd,DRM_IOCTL_I915_GETPARAM , &gp); +if (ret) +return -errno; + +return 0 ; +}/** * Annotate the given bo for use in aub dumping.
Signature · 6 lines
2.3.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH v2 1/2 intel: Export total subslice and EU counts
From: Jeff McGee <[email protected]>
Update kernel interface with new I915_GETPARAM ioctl entries for subslice total and EU total. Add a wrapping function for each parameter. Userspace drivers need these values when constructing GPGPU commands. This kernel query method is intended to replace the PCI ID-based tables that userspace drivers currently maintain. The kernel driver can employ fuse register reads as needed to ensure the most accurate determination of GT config attributes. This first became important with Cherryview in which the config could differ between devices with the same PCI ID.
The kernel detection of these values is device-specific. Userspace drivers should continue to maintain ID-based tables for older devices which return ENODEV when using this query.
v2: remove unnecessary include of <stdbool.h> and increment the
I915_GETPARAM indices to match updated kernel patch.
For: VIZ-4636
--- include/drm/i915_drm.h | 2 ++ intel/intel_bufmgr.h | 3 +++ intel/intel_bufmgr_gem.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 36 insertions(+)
include/drm/i915_drm.h +2 -0
@@ -340,6 +340,8 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_HAS_EXEC_HANDLE_LUT 26#define I915_PARAM_HAS_WT 27#define I915_PARAM_CMD_PARSER_VERSION 28 +#define I915_PARAM_SUBSLICE_TOTAL 33 +#define I915_PARAM_EU_TOTAL 34 typedef struct drm_i915_getparam { int param;
intel/intel_bufmgr.h +3 -0
@@ -264,6 +264,9 @@ int drm_intel_get_reset_stats(drm_intel_context *ctx,uint32_t *active, uint32_t *pending); +int drm_intel_get_subslice_total (int fd,unsigned int *subslice_total); +int drm_intel_get_eu_total (int fd,unsigned int *eu_total); +/** @{ Compatibility defines to keep old code building despite the symbol rename * from dri_* to drm_intel_* */
intel/intel_bufmgr_gem.c +31 -0
@@ -3295,6 +3295,37 @@ drm_intel_reg_read(drm_intel_bufmgr *bufmgr,return ret; } +drm_public int +drm_intel_get_subslice_total (int fd,unsigned int *subslice_total) +{ +drm_i915_getparam_t gp; +int ret; + +memclear (gp); + gp.value = (int *)subslice_total; + gp.param =I915_PARAM_SUBSLICE_TOTAL ; + ret =drmIoctl (fd,DRM_IOCTL_I915_GETPARAM , &gp); +if (ret) +return -errno; + +return 0 ; +} + +drm_public int +drm_intel_get_eu_total (int fd,unsigned int *eu_total) +{ +drm_i915_getparam_t gp; +int ret; + +memclear (gp); + gp.value = (int *)eu_total; + gp.param =I915_PARAM_EU_TOTAL ; + ret =drmIoctl (fd,DRM_IOCTL_I915_GETPARAM , &gp); +if (ret) +return -errno; + +return 0 ; +}/** * Annotate the given bo for use in aub dumping.
Signature · 6 lines
2.3.0 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
PATCH 2/2 configure.ac: bump version to 2.4.60 for release
From: Jeff McGee <[email protected]>
--- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
configure.ac +1 -1
@@ -20,7 +20,7 @@ AC_PREREQ([2.63]) AC_INIT([libdrm], - [2.4.59], + [2.4.60], [https://bugs.freedesktop.org/enter_bug.cgi?product=DRI], [libdrm])
Signature · 6 lines
2.3.0 _______________________________________________ Beignet mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/beignet
Quoted 1 line · On Mon, Mar 02, 2015 at 03:39:27PM -0800, [email protected] wrote:
From: Jeff McGee <[email protected]>
2 small details, but otherwise:
Quoted 10 lines
Update kernel interface with new
I915_GETPARAMioctl entries for subslice total and EU total. Add a wrapping function for each parameter. Userspace drivers need these values when constructing GPGPU commands. This kernel query method is intended to replace the PCI ID-based tables that userspace drivers currently maintain. The kernel driver can employ fuse register reads as needed to ensure the most accurate determination of GT config attributes. This first became important with Cherryview in which the config could differ between devices with the same PCI ID.
Quoted 3 lines
The kernel detection of these values is device-specific. Userspace drivers should continue to maintain ID-based tables for older devices which return ENODEV when using this query.
This should probably part of some comment near the API entry point.
Quoted 27 lines
For: VIZ-4636
Signed-off-by Jeff McGee <[email protected]>--- include/drm/i915_drm.h | 2 ++ intel/intel_bufmgr.h | 4 ++++ intel/intel_bufmgr_gem.c | 31 +++++++++++++++++++++++++++++++ 3 files changed, 37 insertions(+)include/drm/i915_drm.h +2
-0@@ -340,6 +340,8 @@ typedef struct drm_i915_irq_wait {#define I915_PARAM_HAS_EXEC_HANDLE_LUT 26#define I915_PARAM_HAS_WT 27#define I915_PARAM_CMD_PARSER_VERSION 28 +#define I915_PARAM_SUBSLICE_TOTAL 32 +#define I915_PARAM_EU_TOTAL 33 typedef struct drm_i915_getparam { int param;intel/intel_bufmgr.h +0
-0
intel/intel_bufmgr.h line 40
Quoted 4 lines
intel/intel_bufmgr.h +1
-0@@ -37,6 +37,7 @@#include <stdio.h> #include <stdint.h> #include <stdio.h> +#include <stdbool.h>
But you don't seem to use bool or _Bool in the rest of the patch?
Quoted 61 lines
intel/intel_bufmgr.h +3
-0struct drm_clip_rect ;@@ -264,6 +265,9 @@ int drm_intel_get_reset_stats(drm_intel_context *ctx,uint32_t *active, uint32_t *pending); +int drm_intel_get_subslice_total (int fd,unsigned int *subslice_total); +int drm_intel_get_eu_total (int fd,unsigned int *eu_total); +/** @{ Compatibility defines to keep old code building despite the symbol rename * from dri_* to drm_intel_* */ intel/intel_bufmgr_gem.c +31
-0@@ -3292,6 +3292,37 @@ drm_intel_reg_read(drm_intel_bufmgr *bufmgr,return ret; } +drm_public int +drm_intel_get_subslice_total (int fd,unsigned int *subslice_total) +{ +drm_i915_getparam_t gp; +int ret; + +memclear (gp); + gp.value = (int *)subslice_total; + gp.param =I915_PARAM_SUBSLICE_TOTAL ; + ret =drmIoctl (fd,DRM_IOCTL_I915_GETPARAM , &gp); +if (ret) +return -errno; + +return 0 ; +} + +drm_public int +drm_intel_get_eu_total (int fd,unsigned int *eu_total) +{ +drm_i915_getparam_t gp; +int ret; + +memclear (gp); + gp.value = (int *)eu_total; + gp.param =I915_PARAM_EU_TOTAL ; + ret =drmIoctl (fd,DRM_IOCTL_I915_GETPARAM , &gp); +if (ret) +return -errno; + +return 0 ; +}/** * Annotate the given bo for use in aub dumping. Signature · 6 lines
2.3.0 _______________________________________________ dri-devel mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/dri-devel
Damien Lespiau
AppliedQuoted 16 lines · On Mon, Mar 09, 2015 at 04:13:03PM -0700, [email protected] wrote:
From: Jeff McGee <[email protected]>
Update kernel interface with new
I915_GETPARAMioctl entries for subslice total and EU total. Add a wrapping function for each parameter. Userspace drivers need these values when constructing GPGPU commands. This kernel query method is intended to replace the PCI ID-based tables that userspace drivers currently maintain. The kernel driver can employ fuse register reads as needed to ensure the most accurate determination of GT config attributes. This first became important with Cherryview in which the config could differ between devices with the same PCI ID.The kernel detection of these values is device-specific. Userspace drivers should continue to maintain ID-based tables for older devices which return ENODEV when using this query.
Quoted 5 lines
v2: remove unnecessary include of <
stdbool.h> and increment the
I915_GETPARAMindices to match updated kernel patch.For: VIZ-4636
Signed-off-by Jeff McGee <[email protected]>
Pushed to libdrm.
Signature · 5 lines
Damien _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx