From: Brian Starkey <brian.starkey@xxxxxxx>
Changelog:
- v2: removed the forced overwrite of output->config.default_mode
- v1: original submission by Brian
igt_display_commit isn't refreshing all outputs anymore, which means
that an override mode may never get picked up.
Instead of forcing a reprobe to handle copying the override_mode into
default_mode, just change igt_output_get_mode() to return the
override_mode if it's been set, and remove the old code which would
directly overwrite default_mode.
This should be more robust, as igt_output_get_mode() will always return
the correct mode, without needing the output to be reprobed.
This change means that output->config.default_mode always contains the
"non-overridden" default mode.
Signed-off-by: Brian Starkey <brian.starkey@xxxxxxx>
Signed-off-by: Liviu Dudau <liviu.dudau@xxxxxxx>
---
lib/igt_kms.c | 12 ++++--------
1 file changed, 4 insertions(+), 8 deletions(-)
diff --git a/lib/igt_kms.c b/lib/igt_kms.c
index 5e2ef97b..2abb6b4e 100644
--- a/lib/igt_kms.c
+++ b/lib/igt_kms.c
@@ -1580,9 +1580,6 @@ static void igt_output_refresh(igt_output_t *output)
BROADCAST_RGB_FULL);
}
- if (output->use_override_mode)
- output->config.default_mode = output->override_mode;
-
if (output->config.pipe == PIPE_NONE)
return;
@@ -2821,7 +2818,10 @@ const char *igt_output_name(igt_output_t *output)
drmModeModeInfo *igt_output_get_mode(igt_output_t *output)
{
- return &output->config.default_mode;
+ if (output->use_override_mode)
+ return &output->override_mode;
+ else
+ return &output->config.default_mode;
}
/**
@@ -2839,10 +2839,6 @@ void igt_output_override_mode(igt_output_t *output, drmModeModeInfo *mode)
if (mode)
output->override_mode = *mode;
- else /* restore default_mode, may have been overwritten in igt_output_refresh */
- kmstest_get_connector_default_mode(output->display->drm_fd,
- output->config.connector,
- &output->config.default_mode);
output->use_override_mode = !!mode;
--
2.13.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
