[PATCH igt] igt/perf_pmu: Semaphores do not exists before gen6

[PATCH igt] igt/perf_pmu: Semaphores do not exists before gen6

[Chris Wilson]

We don't expect to be able to open the I915_SAMPLE_SEMA on gen5 and
earlier as the HW doesn't support semaphores.

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
---
 tests/perf_pmu.c | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c
index a27a8a81e..c7f87d52f 100644
--- a/tests/perf_pmu.c
+++ b/tests/perf_pmu.c
@@ -74,13 +74,19 @@ static void
 init(int gem_fd, const struct intel_execution_engine2 *e, uint8_t sample)
 {
 	int fd, err = 0;
+	bool exists;
 
 	errno = 0;
 	fd = perf_i915_open(__I915_PMU_ENGINE(e->class, e->instance, sample));
 	if (fd < 0)
 		err = errno;
 
-	if (gem_has_engine(gem_fd, e->class, e->instance)) {
+	exists = gem_has_engine(gem_fd, e->class, e->instance);
+	if (intel_gen(intel_get_drm_devid(gem_fd)) < 6 &&
+	    sample == I915_SAMPLE_SEMA)
+		exists = false;
+
+	if (exists) {
 		igt_assert_eq(err, 0);
 		igt_assert_fd(fd);
 		close(fd);
-- 
2.16.1

_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [igt-dev] [PATCH igt] igt/perf_pmu: Semaphores do not exists before gen6

[Tvrtko Ursulin]

On 09/02/2018 14:39, Chris Wilson wrote:
> We don't expect to be able to open the I915_SAMPLE_SEMA on gen5 and
> earlier as the HW doesn't support semaphores.
> 
> Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
> ---
>   tests/perf_pmu.c | 8 +++++++-
>   1 file changed, 7 insertions(+), 1 deletion(-)
> 
> diff --git a/tests/perf_pmu.c b/tests/perf_pmu.c
> index a27a8a81e..c7f87d52f 100644
> --- a/tests/perf_pmu.c
> +++ b/tests/perf_pmu.c
> @@ -74,13 +74,19 @@ static void
>   init(int gem_fd, const struct intel_execution_engine2 *e, uint8_t sample)
>   {
>   	int fd, err = 0;
> +	bool exists;
>   
>   	errno = 0;
>   	fd = perf_i915_open(__I915_PMU_ENGINE(e->class, e->instance, sample));
>   	if (fd < 0)
>   		err = errno;
>   
> -	if (gem_has_engine(gem_fd, e->class, e->instance)) {
> +	exists = gem_has_engine(gem_fd, e->class, e->instance);
> +	if (intel_gen(intel_get_drm_devid(gem_fd)) < 6 &&
> +	    sample == I915_SAMPLE_SEMA)
> +		exists = false;
> +
> +	if (exists) {
>   		igt_assert_eq(err, 0);
>   		igt_assert_fd(fd);
>   		close(fd);
> 

Ooopsie.. :(

Reviewed-by: Tvrtko Ursulin <tvrtko.ursulin@intel.com>

Regards,

Tvrtko
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx