diff options
| author | José Roberto de Souza <jose.souza@intel.com> | 2019-01-11 16:48:45 -0800 |
|---|---|---|
| committer | José Roberto de Souza <jose.souza@intel.com> | 2019-01-22 14:09:12 -0800 |
| commit | 13ac931a33f9ce43273af0232fa33ad122c3fa07 (patch) | |
| tree | a774adeb973c4108b38b2ea1d3bbd9372118835c /tests | |
| parent | 3f828a7a8cf22b5440372234b7814c4bd1b9315e (diff) | |
lib/psr: Add PSR2 support to the remaning psr functions
Add the mode parameter to psr_enable() and psr_sink_support() so PSR1
and PSR2 can be tested separated.
For now all PSR tests will run only with PSR1 and the tests for PSR2
will come in the future.
Cc: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Reviewed-by: Dhinakaran Pandiyan <dhinakaran.pandiyan@intel.com>
Signed-off-by: José Roberto de Souza <jose.souza@intel.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/kms_fbcon_fbt.c | 9 | ||||
| -rw-r--r-- | tests/kms_frontbuffer_tracking.c | 4 | ||||
| -rw-r--r-- | tests/kms_psr.c | 5 |
3 files changed, 12 insertions, 6 deletions
diff --git a/tests/kms_fbcon_fbt.c b/tests/kms_fbcon_fbt.c index 2823b47a..9d0d5a36 100644 --- a/tests/kms_fbcon_fbt.c +++ b/tests/kms_fbcon_fbt.c @@ -199,6 +199,11 @@ static bool psr_wait_until_enabled(int debugfs_fd) return r; } +static bool psr_supported_on_chipset(int debugfs_fd) +{ + return psr_sink_support(debugfs_fd, PSR_MODE_1); +} + static void disable_features(int debugfs_fd) { igt_set_module_param_int("enable_fbc", 0); @@ -212,7 +217,7 @@ static inline void fbc_modparam_enable(int debugfs_fd) static inline void psr_debugfs_enable(int debugfs_fd) { - psr_enable(debugfs_fd); + psr_enable(debugfs_fd, PSR_MODE_1); } struct feature { @@ -226,7 +231,7 @@ struct feature { .connector_possible_fn = connector_can_fbc, .enable = fbc_modparam_enable, }, psr = { - .supported_on_chipset = psr_sink_support, + .supported_on_chipset = psr_supported_on_chipset, .wait_until_enabled = psr_wait_until_enabled, .connector_possible_fn = connector_can_psr, .enable = psr_debugfs_enable, diff --git a/tests/kms_frontbuffer_tracking.c b/tests/kms_frontbuffer_tracking.c index ed9a039a..609f7b41 100644 --- a/tests/kms_frontbuffer_tracking.c +++ b/tests/kms_frontbuffer_tracking.c @@ -1425,7 +1425,7 @@ static void setup_psr(void) return; } - if (!psr_sink_support(drm.debugfs)) { + if (!psr_sink_support(drm.debugfs, PSR_MODE_1)) { igt_info("Can't test PSR: not supported by sink.\n"); return; } @@ -1722,7 +1722,7 @@ static bool enable_features_for_test(const struct test_mode *t) if (t->feature & FEATURE_FBC) fbc_enable(); if (t->feature & FEATURE_PSR) - ret = psr_enable(drm.debugfs); + ret = psr_enable(drm.debugfs, PSR_MODE_1); if (t->feature & FEATURE_DRRS) drrs_enable(); diff --git a/tests/kms_psr.c b/tests/kms_psr.c index 23d000bd..c31dc317 100644 --- a/tests/kms_psr.c +++ b/tests/kms_psr.c @@ -191,7 +191,8 @@ static void fill_render(data_t *data, uint32_t handle, unsigned char color) static bool sink_support(data_t *data) { - return data->with_psr_disabled || psr_sink_support(data->debugfs_fd); + return data->with_psr_disabled || + psr_sink_support(data->debugfs_fd, PSR_MODE_1); } static bool psr_wait_entry_if_enabled(data_t *data) @@ -410,7 +411,7 @@ int main(int argc, char *argv[]) data.devid = intel_get_drm_devid(data.drm_fd); if (!data.with_psr_disabled) - psr_enable(data.debugfs_fd); + psr_enable(data.debugfs_fd, PSR_MODE_1); igt_require_f(sink_support(&data), "Sink does not support PSR\n"); |