OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

intel/perf: specify sseu configuration when supported

Browse Source 
Because of functional requirements for Gen11, when perf is enabled we
only power half the EU array.

This change forces it to enable everything.

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>
This commit is contained in:
Lionel Landwerlin
2020-03-02 14:43:30 +02:00
committed by Marge Bot
parent 8f152ed101
commit a7998371ed
3 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/intel/perf/gen_perf.c
View File

@@ -54,11 +54,6 @@
#define OA_REPORT_INVALID_CTX_ID (0xffffffff) #define OA_REPORT_INVALID_CTX_ID (0xffffffff)
static inline uint64_t to_user_pointer(void *ptr)
{
return (uintptr_t) ptr;
}
static bool static bool
is_dir_or_link(const struct dirent *entry, const char *parent_dir) is_dir_or_link(const struct dirent *entry, const char *parent_dir)
{ {

5
src/intel/perf/gen_perf_private.h
View File

@@ -26,6 +26,11 @@
#include "gen_perf.h" #include "gen_perf.h"
static inline uint64_t to_user_pointer(void *ptr)
{
return (uintptr_t) ptr;
}
static inline void static inline void
gen_perf_query_add_stat_reg(struct gen_perf_query_info *query, uint32_t reg, gen_perf_query_add_stat_reg(struct gen_perf_query_info *query, uint32_t reg,
uint32_t numerator, uint32_t denominator, uint32_t numerator, uint32_t denominator,

10
src/intel/perf/gen_perf_query.c
View File

@@ -30,6 +30,7 @@
#include "perf/gen_perf.h" #include "perf/gen_perf.h"
#include "perf/gen_perf_mdapi.h" #include "perf/gen_perf_mdapi.h"
#include "perf/gen_perf_private.h"
#include "perf/gen_perf_query.h" #include "perf/gen_perf_query.h"
#include "perf/gen_perf_regs.h" #include "perf/gen_perf_regs.h"
@@ -347,6 +348,8 @@ gen_perf_close(struct gen_perf_context *perfquery,
} }
} }
#define NUM_PERF_PROPERTIES(array) (ARRAY_SIZE(array) / 2)
static bool static bool
gen_perf_open(struct gen_perf_context *perf_ctx, gen_perf_open(struct gen_perf_context *perf_ctx,
int metrics_set_id, int metrics_set_id,
@@ -366,12 +369,17 @@ gen_perf_open(struct gen_perf_context *perf_ctx,
DRM_I915_PERF_PROP_OA_METRICS_SET, metrics_set_id, DRM_I915_PERF_PROP_OA_METRICS_SET, metrics_set_id,
DRM_I915_PERF_PROP_OA_FORMAT, report_format, DRM_I915_PERF_PROP_OA_FORMAT, report_format,
DRM_I915_PERF_PROP_OA_EXPONENT, period_exponent, DRM_I915_PERF_PROP_OA_EXPONENT, period_exponent,
/* SSEU configuration */
DRM_I915_PERF_PROP_GLOBAL_SSEU, to_user_pointer(&perf_ctx->perf->sseu),
}; };
struct drm_i915_perf_open_param param = { struct drm_i915_perf_open_param param = {
.flags = I915_PERF_FLAG_FD_CLOEXEC | .flags = I915_PERF_FLAG_FD_CLOEXEC |
I915_PERF_FLAG_FD_NONBLOCK | I915_PERF_FLAG_FD_NONBLOCK |
I915_PERF_FLAG_DISABLED, I915_PERF_FLAG_DISABLED,
.num_properties = ARRAY_SIZE(properties) / 2, .num_properties = perf_ctx->perf->i915_perf_version >= 4 ?
NUM_PERF_PROPERTIES(properties) :
NUM_PERF_PROPERTIES(properties) - 1,
.properties_ptr = (uintptr_t) properties, .properties_ptr = (uintptr_t) properties,
}; };
int fd = gen_ioctl(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param); int fd = gen_ioctl(drm_fd, DRM_IOCTL_I915_PERF_OPEN, &param);