On to, 2015-11-26 at 18:32 +0200, Marius Vlad wrote:
> Signed-off-by: Marius Vlad <marius.c.v...@intel.com>
> ---
> tests/pm_rpm.c | 120
> +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
> 1 file changed, 120 insertions(+)
>
> diff --git a/tests/pm_rpm.c b/tests/pm_rpm.c
> index c4fb19c..d34b2b2 100644
> --- a/tests/pm_rpm.c
> +++ b/tests/pm_rpm.c
> @@ -1729,6 +1729,120 @@ static void planes_subtest(bool universal, bool dpms)
> }
> }
>
> +static void pm_test_tiling(void)
> +{
> + uint32_t *handles;
> + uint8_t **gem_bufs;
> +
> + int max_gem_objs = 0;
> + uint8_t off_bit = 14;
> + uint32_t gtt_obj_max_size = (256 * 1024);
> +
> + uint32_t i, j, p, tiling_modes[3] = {
> + I915_TILING_NONE,
> + I915_TILING_X,
> + I915_TILING_Y,
> + };
> + uint32_t ti, sw;
> +
> + /* default stride value */
> + uint32_t stride = 512;
> +
> + /* calculate how many objects we can map */
> + for (j = 1 << off_bit; j <= gtt_obj_max_size; j <<= 1, max_gem_objs++)
> + ;
> +
> + gem_bufs = calloc(max_gem_objs, sizeof(*gem_bufs));
> + handles = calloc(max_gem_objs, sizeof(*handles));
> +
> + /* map to gtt */
> + for (i = 0, j = 1 << off_bit; j <= gtt_obj_max_size; j <<= 1, i++) {
> + handles[i] = gem_create(drm_fd, j);
> + gem_bufs[i] = gem_mmap__gtt(drm_fd, handles[i], j, PROT_WRITE);
> + }
> +
> + /* try to set different tiling for each handle */
> + for (i = 0; i < ARRAY_SIZE(tiling_modes); i++) {
This still has the problem that we don't rebind the objects in each
iteration before disable_all_screens_and_wait(). So please move the
above "map to gtt" loop allocating and mmaping the objects and the
memset(gem_bufs[]) below here, and ..
> + disable_all_screens_and_wait(&ms_data);
> +
> + for (j = 0, p = 1 << off_bit; j < max_gem_objs; j++, p <<= 1) {
> +
> + /* modify the contents each time */
> + memset(gem_bufs[j], 16 << j, p);
> +
> + igt_debug("Testing tiling mode %u, gem %u, "
> + "size=%ukB (d=0x%x)\n", i, j,
> + (p / (1 << 10)), (16 << j));
> +
> + gem_set_tiling(drm_fd, handles[j],
> + tiling_modes[i], stride);
> +
> + gem_get_tiling(drm_fd, handles[j], &ti, &sw);
> + igt_assert(tiling_modes[i] == ti);
> +
> + }
> +
> + enable_one_screen_and_wait(&ms_data);
move the loop below doing the munmap() and gem_close() on the objects
here. With that fixed this looks ok to me:
Reviewed-by: Imre Deak <imre.d...@intel.com>
> + }
> +
> + for (i = 0, j = 1 << off_bit; j <= gtt_obj_max_size; j <<= 1, i++) {
> + igt_assert(munmap(gem_bufs[i], j) == 0);
> + gem_close(drm_fd, handles[i]);
> + }
> +
> + free(gem_bufs);
> + free(handles);
> +}
> +
> +static void pm_test_caching(void)
> +{
> + uint32_t handle;
> + uint8_t *gem_buf;
> +
> + uint32_t i, got_caching;
> + uint32_t gtt_obj_max_size = (16 * 1024);
> + uint32_t cache_levels[3] = {
> + I915_CACHING_NONE,
> + I915_CACHING_CACHED, /* LLC caching */
> + I915_CACHING_DISPLAY, /* eDRAM caching */
> + };
> +
> +
> + handle = gem_create(drm_fd, gtt_obj_max_size);
> + gem_buf = gem_mmap__gtt(drm_fd, handle, gtt_obj_max_size, PROT_WRITE);
> +
> + for (i = 0; i < ARRAY_SIZE(cache_levels); i++) {
> + memset(gem_buf, 16 << i, gtt_obj_max_size);
> +
> + disable_all_screens_and_wait(&ms_data);
> +
> + igt_debug("Setting cache level %u\n", cache_levels[i]);
> +
> + gem_set_caching(drm_fd, handle, cache_levels[i]);
> +
> + got_caching = gem_get_caching(drm_fd, handle);
> +
> + igt_debug("Got back %u\n", got_caching);
> +
> + /*
> + * Allow fall-back to CACHING_NONE in case the platform does
> + * not support it.
> + */
> + if (cache_levels[i] == I915_CACHING_DISPLAY)
> + igt_assert(got_caching == I915_CACHING_NONE ||
> + got_caching == I915_CACHING_DISPLAY);
> + else
> + igt_assert(got_caching == cache_levels[i]);
> +
> + enable_one_screen_and_wait(&ms_data);
> + }
> +
> + igt_assert(munmap(gem_buf, gtt_obj_max_size) == 0);
> + gem_close(drm_fd, handle);
> +}
> +
> +
> +
> static void fences_subtest(bool dpms)
> {
> int i;
> @@ -1927,6 +2041,12 @@ int main(int argc, char *argv[])
> igt_subtest("gem-execbuf-stress-extra-wait")
> gem_execbuf_stress_subtest(rounds, WAIT_STATUS | WAIT_EXTRA);
>
> + /* power-wake reference tests */
> + igt_subtest("pm-tiling")
> + pm_test_tiling();
> + igt_subtest("pm-caching")
> + pm_test_caching();
> +
> igt_fixture
> teardown_environment();
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
