* [igt-dev] [PATCH 0/2] tests/kms_writeback: Test cleanup
@ 2022-09-30 5:32 Jeevan B
2022-09-30 5:32 ` [igt-dev] [PATCH 1/2] lib/intel_memory_region: Remove function which returns batch size in regions Jeevan B
2022-09-30 5:32 ` [igt-dev] [PATCH 2/2] tests/kms_writeback: Test cleanup Jeevan B
0 siblings, 2 replies; 4+ messages in thread
From: Jeevan B @ 2022-09-30 5:32 UTC (permalink / raw)
To: igt-dev
*** BLURB HERE ***
Nidhi Gupta (1):
tests/kms_writeback: Test cleanup
Zbigniew Kempczyński (1):
lib/intel_memory_region: Remove function which returns batch size in
regions
lib/i915/intel_memory_region.c | 14 ---------
lib/i915/intel_memory_region.h | 1 -
tests/kms_writeback.c | 52 ++++++++++------------------------
3 files changed, 15 insertions(+), 52 deletions(-)
--
2.36.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [igt-dev] [PATCH 1/2] lib/intel_memory_region: Remove function which returns batch size in regions 2022-09-30 5:32 [igt-dev] [PATCH 0/2] tests/kms_writeback: Test cleanup Jeevan B @ 2022-09-30 5:32 ` Jeevan B 2022-09-30 5:32 ` [igt-dev] [PATCH 2/2] tests/kms_writeback: Test cleanup Jeevan B 1 sibling, 0 replies; 4+ messages in thread From: Jeevan B @ 2022-09-30 5:32 UTC (permalink / raw) To: igt-dev From: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Function gem_get_batch_size() is confusing as it might return different size thus deceiving reader of object real size created in different memory regions. Let's remove it and enforce igt user to be aware that kernel may alter size where it is necessary. v2: reword commit message (Kamil) Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com> --- lib/i915/intel_memory_region.c | 14 -------------- lib/i915/intel_memory_region.h | 1 - 2 files changed, 15 deletions(-) diff --git a/lib/i915/intel_memory_region.c b/lib/i915/intel_memory_region.c index 568bace9..d80cb3a0 100644 --- a/lib/i915/intel_memory_region.c +++ b/lib/i915/intel_memory_region.c @@ -92,20 +92,6 @@ const char *get_memory_region_name(uint32_t region) igt_assert_f(false, "Unknown memory region"); } -/** - * gem_get_batch_size: - * @fd: open i915 drm file descriptor - * @mem_region_type: used memory_region type - * - * With introduction of LMEM we observe different page sizes for those two - * memory regions. Without this helper funtion we may be prone to forget - * about setting proper page size. - */ -uint32_t gem_get_batch_size(int fd, uint8_t mem_region_type) -{ - return (mem_region_type == I915_MEMORY_CLASS_DEVICE) ? 65536 : 4096; -} - /** * gem_get_query_memory_regions: * @fd: open i915 drm file descriptor diff --git a/lib/i915/intel_memory_region.h b/lib/i915/intel_memory_region.h index fd04df83..425bda0e 100644 --- a/lib/i915/intel_memory_region.h +++ b/lib/i915/intel_memory_region.h @@ -56,7 +56,6 @@ bool gem_has_query_support(int fd); const char *get_memory_region_name(uint32_t region); -uint32_t gem_get_batch_size(int fd, uint8_t mem_region_type); struct drm_i915_query_memory_regions *gem_get_query_memory_regions(int fd); -- 2.36.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [igt-dev] [PATCH 2/2] tests/kms_writeback: Test cleanup 2022-09-30 5:32 [igt-dev] [PATCH 0/2] tests/kms_writeback: Test cleanup Jeevan B 2022-09-30 5:32 ` [igt-dev] [PATCH 1/2] lib/intel_memory_region: Remove function which returns batch size in regions Jeevan B @ 2022-09-30 5:32 ` Jeevan B 1 sibling, 0 replies; 4+ messages in thread From: Jeevan B @ 2022-09-30 5:32 UTC (permalink / raw) To: igt-dev; +Cc: Nidhi Gupta From: Nidhi Gupta <nidhi1.gupta@intel.com> v1: move igt_skip_on(data.dump_check || data.list_modes) to igt_fixture as it is common for all subtests. (Bhanu) v2: replaced hard coded mode with default mode. (Bhanu) Signed-off-by: Nidhi Gupta <nidhi1.gupta@intel.com> --- tests/kms_writeback.c | 52 +++++++++++++------------------------------ 1 file changed, 15 insertions(+), 37 deletions(-) diff --git a/tests/kms_writeback.c b/tests/kms_writeback.c index 9d134585..8846d6d8 100644 --- a/tests/kms_writeback.c +++ b/tests/kms_writeback.c @@ -107,46 +107,27 @@ static bool check_writeback_config(igt_display_t *display, igt_output_t *output, static igt_output_t *kms_writeback_get_output(igt_display_t *display) { - int i; enum pipe pipe; + igt_output_t *output; - drmModeModeInfo override_mode = { - .clock = 25175, - .hdisplay = 640, - .hsync_start = 656, - .hsync_end = 752, - .htotal = 800, - .hskew = 0, - .vdisplay = 480, - .vsync_start = 490, - .vsync_end = 492, - .vtotal = 525, - .vscan = 0, - .vrefresh = 60, - .flags = DRM_MODE_FLAG_NHSYNC | DRM_MODE_FLAG_NVSYNC, - .name = {"640x480-60"}, - }; - - for (i = 0; i < display->n_outputs; i++) { - igt_output_t *output = &display->outputs[i]; + drmModeModeInfo override_mode; + for_each_pipe_with_valid_output(display, pipe, output) { + igt_output_set_pipe(output, pipe); if (output->config.connector->connector_type != DRM_MODE_CONNECTOR_WRITEBACK) continue; - for_each_pipe(display, pipe) { - igt_output_set_pipe(output, pipe); + override_mode = *igt_output_get_mode(output); - if (data.custom_mode) - override_mode = data.user_mode; - if (data.builtin_mode) - override_mode = output->config.connector->modes[data.mode_index]; - - if (check_writeback_config(display, output, override_mode)) { - igt_debug("Using connector %u:%s on pipe %d\n", - output->config.connector->connector_id, - output->name, pipe); + if (data.custom_mode) + override_mode = data.user_mode; + if (data.builtin_mode) + override_mode = output->config.connector->modes[data.mode_index]; + if (check_writeback_config(display, output, override_mode)) { + igt_debug("Using connector %u:%s on pipe %d\n", + output->config.connector->connector_id, + output->name, pipe); return output; - } } igt_debug("We found %u:%s, but this test will not be able to use it.\n", @@ -155,7 +136,6 @@ static igt_output_t *kms_writeback_get_output(igt_display_t *display) /* Restore any connectors we don't use, so we don't trip on them later */ kmstest_force_connector(display->drm_fd, output->config.connector, FORCE_CONNECTOR_UNSPECIFIED); } - return NULL; } @@ -498,6 +478,8 @@ igt_main_args("b:c:dl", long_options, help_str, opt_handler, NULL) igt_require(display.is_atomic); + igt_skip_on(data.dump_check || data.list_modes); + output = kms_writeback_get_output(&display); igt_require(output); @@ -533,7 +515,6 @@ igt_main_args("b:c:dl", long_options, help_str, opt_handler, NULL) drmModePropertyBlobRes *formats_blob; const char *valid_chars; - igt_skip_on(data.dump_check || data.list_modes); formats_blob = get_writeback_formats_blob(output); valid_chars = "01234568 ABCGNRUVXY"; @@ -556,7 +537,6 @@ igt_main_args("b:c:dl", long_options, help_str, opt_handler, NULL) igt_subtest("writeback-invalid-parameters") { igt_fb_t invalid_output_fb; - igt_skip_on(data.dump_check || data.list_modes); fb_id = igt_create_fb(display.drm_fd, mode.hdisplay / 2, mode.vdisplay / 2, DRM_FORMAT_XRGB8888, @@ -573,7 +553,6 @@ igt_main_args("b:c:dl", long_options, help_str, opt_handler, NULL) igt_subtest("writeback-fb-id") { igt_fb_t output_fb; - igt_skip_on(data.dump_check || data.list_modes); fb_id = igt_create_fb(display.drm_fd, mode.hdisplay, mode.vdisplay, DRM_FORMAT_XRGB8888, DRM_FORMAT_MOD_LINEAR, @@ -589,7 +568,6 @@ igt_main_args("b:c:dl", long_options, help_str, opt_handler, NULL) igt_subtest("writeback-check-output") { igt_fb_t output_fb; - igt_skip_on(data.dump_check || data.list_modes); fb_id = igt_create_fb(display.drm_fd, mode.hdisplay, mode.vdisplay, DRM_FORMAT_XRGB8888, igt_fb_mod_to_tiling(0), -- 2.36.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
* [igt-dev] [PATCH 0/2] tests/kms_writeback: Test cleanup
@ 2022-09-30 5:41 Nidhi Gupta
2022-09-30 5:41 ` [igt-dev] [PATCH 1/2] lib/intel_memory_region: Remove function which returns batch size in regions Nidhi Gupta
0 siblings, 1 reply; 4+ messages in thread
From: Nidhi Gupta @ 2022-09-30 5:41 UTC (permalink / raw)
To: igt-dev
From: Jeevan B <jeevan.b@intel.com>
*** BLURB HERE ***
Nidhi Gupta (1):
tests/kms_writeback: Test cleanup
Zbigniew Kempczyński (1):
lib/intel_memory_region: Remove function which returns batch size in
regions
lib/i915/intel_memory_region.c | 14 ---------
lib/i915/intel_memory_region.h | 1 -
tests/kms_writeback.c | 52 ++++++++++------------------------
3 files changed, 15 insertions(+), 52 deletions(-)
--
2.36.0
^ permalink raw reply [flat|nested] 4+ messages in thread* [igt-dev] [PATCH 1/2] lib/intel_memory_region: Remove function which returns batch size in regions 2022-09-30 5:41 [igt-dev] [PATCH 0/2] " Nidhi Gupta @ 2022-09-30 5:41 ` Nidhi Gupta 0 siblings, 0 replies; 4+ messages in thread From: Nidhi Gupta @ 2022-09-30 5:41 UTC (permalink / raw) To: igt-dev From: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Function gem_get_batch_size() is confusing as it might return different size thus deceiving reader of object real size created in different memory regions. Let's remove it and enforce igt user to be aware that kernel may alter size where it is necessary. v2: reword commit message (Kamil) Signed-off-by: Zbigniew Kempczyński <zbigniew.kempczynski@intel.com> Cc: Kamil Konieczny <kamil.konieczny@linux.intel.com> Reviewed-by: Kamil Konieczny <kamil.konieczny@linux.intel.com> --- lib/i915/intel_memory_region.c | 14 -------------- lib/i915/intel_memory_region.h | 1 - 2 files changed, 15 deletions(-) diff --git a/lib/i915/intel_memory_region.c b/lib/i915/intel_memory_region.c index 568bace9..d80cb3a0 100644 --- a/lib/i915/intel_memory_region.c +++ b/lib/i915/intel_memory_region.c @@ -92,20 +92,6 @@ const char *get_memory_region_name(uint32_t region) igt_assert_f(false, "Unknown memory region"); } -/** - * gem_get_batch_size: - * @fd: open i915 drm file descriptor - * @mem_region_type: used memory_region type - * - * With introduction of LMEM we observe different page sizes for those two - * memory regions. Without this helper funtion we may be prone to forget - * about setting proper page size. - */ -uint32_t gem_get_batch_size(int fd, uint8_t mem_region_type) -{ - return (mem_region_type == I915_MEMORY_CLASS_DEVICE) ? 65536 : 4096; -} - /** * gem_get_query_memory_regions: * @fd: open i915 drm file descriptor diff --git a/lib/i915/intel_memory_region.h b/lib/i915/intel_memory_region.h index fd04df83..425bda0e 100644 --- a/lib/i915/intel_memory_region.h +++ b/lib/i915/intel_memory_region.h @@ -56,7 +56,6 @@ bool gem_has_query_support(int fd); const char *get_memory_region_name(uint32_t region); -uint32_t gem_get_batch_size(int fd, uint8_t mem_region_type); struct drm_i915_query_memory_regions *gem_get_query_memory_regions(int fd); -- 2.36.0 ^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2022-09-30 5:47 UTC | newest] Thread overview: 4+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2022-09-30 5:32 [igt-dev] [PATCH 0/2] tests/kms_writeback: Test cleanup Jeevan B 2022-09-30 5:32 ` [igt-dev] [PATCH 1/2] lib/intel_memory_region: Remove function which returns batch size in regions Jeevan B 2022-09-30 5:32 ` [igt-dev] [PATCH 2/2] tests/kms_writeback: Test cleanup Jeevan B -- strict thread matches above, loose matches on Subject: below -- 2022-09-30 5:41 [igt-dev] [PATCH 0/2] " Nidhi Gupta 2022-09-30 5:41 ` [igt-dev] [PATCH 1/2] lib/intel_memory_region: Remove function which returns batch size in regions Nidhi Gupta
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.