<html xmlns:v="urn:schemas-microsoft-com:vml" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:w="urn:schemas-microsoft-com:office:word" xmlns:m="http://schemas.microsoft.com/office/2004/12/omml" xmlns="http://www.w3.org/TR/REC-html40"> <head> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"> <meta name="Generator" content="Microsoft Word 15 (filtered medium)"> <style></style> </head> <body lang="EN-US" link="#0563C1" vlink="#954F72" style="word-wrap:break-word"> <div class="WordSection1"> Sorry for the delay, I am working on it to fix it. <o:p></o:p> <o:p> </o:p> I am trying to debug by replacing the atomic commit with legacy commit:<o:p></o:p> <o:p> </o:p> diff --git a/tests/kms_invalid_mode.c b/tests/kms_invalid_mode.c<o:p></o:p> index f1c38669..08c1d001 100644<o:p></o:p> --- a/tests/kms_invalid_mode.c<o:p></o:p> +++ b/tests/kms_invalid_mode.c<o:p></o:p> @@ -197,6 +197,7 @@ test_output(data_t *data)<o:p></o:p> igt_require(data->adjust_mode(data, mode));<o:p></o:p> igt_output_override_mode(output, mode);<o:p></o:p> - ret = igt_display_try_commit2(&data->display, data->display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY);<o:p></o:p> + ret = igt_display_try_commit2(display, COMMIT_LEGACY);<o:p></o:p> igt_assert(ret == -EINVAL);<o:p></o:p> }<o:p></o:p> <o:p> </o:p> Nidhi<o:p></o:p> <div> <div style="border:none;border-top:solid #E1E1E1 1.0pt;padding:3.0pt 0in 0in 0in"> From: Modem, Bhanuprakash <bhanuprakash.modem@intel.com> Sent: Friday, October 28, 2022 3:33 AM To: Ville Syrjälä <ville.syrjala@linux.intel.com>; igt-dev@lists.freedesktop.org Cc: Gupta, Nidhi1 <nidhi1.gupta@intel.com> Subject: Re: [PATCH i-g-t 3/3] Revert "tests/kms_invalid_mode: Test Cleanup"<o:p></o:p> </div> </div> <o:p> </o:p> <div> <div> <div> Nidhi is working on it.<o:p></o:p> </div> <div> <o:p> </o:p> </div> <div> Thanks<o:p></o:p> </div> <div> Bhanu<o:p></o:p> </div> </div> </div> <div class="MsoNormal" align="center" style="text-align:center"> <hr size="2" width="98%" align="center"> </div> <div id="divRplyFwdMsg"> పంపినవారు: Ville Syrjälä <<a href="mailto:ville.syrjala@linux.intel.com">ville.syrjala@linux.intel.com</a>> పంపినవి: Friday, October 28, 2022 1:48:03 AM గ్రహీత: <a href="mailto:igt-dev@lists.freedesktop.org">igt-dev@lists.freedesktop.org</a> <<a href="mailto:igt-dev@lists.freedesktop.org">igt-dev@lists.freedesktop.org</a>> Cc: Gupta, Nidhi1 <<a href="mailto:nidhi1.gupta@intel.com">nidhi1.gupta@intel.com</a>>; Modem, Bhanuprakash <<a href="mailto:bhanuprakash.modem@intel.com">bhanuprakash.modem@intel.com</a>> విషయం: Re: [PATCH i-g-t 3/3] Revert "tests/kms_invalid_mode: Test Cleanup" <o:p></o:p> <div> <o:p></o:p> </div> </div> <div> <div> On Fri, Oct 07, 2022 at 04:40:29PM +0300, Ville Syrjala wrote: > From: Ville Syrjälä <<a href="mailto:ville.syrjala@linux.intel.com">ville.syrjala@linux.intel.com</a>> > > This reverts commit 6725767a84109e934ca138d94df0482386c44532. > > This was no cleanup. It does fifteen different things and > in the process flat out breaks the test at least on all > non-atomic drivers/platforms. > > Cc: Nidhi Gupta <<a href="mailto:nidhi1.gupta@intel.com">nidhi1.gupta@intel.com</a>> > Cc: Bhanuprakash Modem <<a href="mailto:bhanuprakash.modem@intel.com">bhanuprakash.modem@intel.com</a>> > Signed-off-by: Ville Syrjälä <<a href="mailto:ville.syrjala@linux.intel.com">ville.syrjala@linux.intel.com</a>> Is anyone going to do anything about this or do I just push the reverts? > --- > tests/kms_invalid_mode.c | 39 ++++++++++++++++++++++++--------------- > 1 file changed, 24 insertions(+), 15 deletions(-) > > diff --git a/tests/kms_invalid_mode.c b/tests/kms_invalid_mode.c > index 21ee91abf54b..0287ee02c1c4 100644 > --- a/tests/kms_invalid_mode.c > +++ b/tests/kms_invalid_mode.c > @@ -35,6 +35,7 @@ struct _data { > enum pipe pipe; > igt_display_t display; > igt_output_t *output; > + drmModeResPtr res; > int max_dotclock; > bool (*adjust_mode)(data_t *data, drmModeModeInfoPtr mode); > }; > @@ -181,29 +182,35 @@ static void > test_output(data_t *data) > { > igt_output_t *output = data->output; > + drmModeModeInfo mode; > struct igt_fb fb; > int ret; > - drmModeModeInfo *mode; > + uint32_t crtc_id; > > - igt_output_set_pipe(output, data->pipe); > + /* > + * FIXME test every mode we have to be more > + * sure everything is really getting rejected? > + */ > + mode = *igt_output_get_mode(output); > + igt_require(data->adjust_mode(data, &mode)); > > - igt_create_fb(data->drm_fd, 512, 512, DRM_FORMAT_XRGB8888, > + igt_create_fb(data->drm_fd, > + max_t(uint16_t, mode.hdisplay, 64), > + max_t(uint16_t, mode.vdisplay, 64), > + DRM_FORMAT_XRGB8888, > DRM_FORMAT_MOD_LINEAR, > &fb); > > - for_each_connector_mode(output) { > - mode = &output->config.connector->modes[j__]; > - igt_require(data->adjust_mode(data, mode)); > - igt_output_override_mode(output, mode); > - ret = igt_display_try_commit2(&data->display, data->display.is_atomic ? COMMIT_ATOMIC : COMMIT_LEGACY); > - igt_assert(ret == -EINVAL); > - } > + kmstest_unset_all_crtcs(data->drm_fd, data->res); > + > + crtc_id = data->display.pipes[data->pipe].crtc_id; > + > + ret = drmModeSetCrtc(data->drm_fd, crtc_id, > + fb.fb_id, 0, 0, > + &output->id, 1, &mode); > + igt_assert_lt(ret, 0); > > igt_remove_fb(data->drm_fd, &fb); > - igt_output_override_mode(output, NULL); > - /*unset_all_crtcs*/ > - igt_display_reset(&data->display); > - igt_display_commit(&data->display); > } > > static int i915_max_dotclock(data_t *data) > @@ -283,10 +290,11 @@ igt_main > kmstest_set_vt_graphics_mode(); > > igt_display_require(&data.display, data.drm_fd); > + data.res = drmModeGetResources(data.drm_fd); > + igt_assert(data.res); > > data.max_dotclock = i915_max_dotclock(&data); > igt_info("Max dotclock: %d kHz\n", data.max_dotclock); > - igt_display_require_output(&data.display); > } > > igt_describe("Make sure all modesets are rejected when the requested mode is invalid"); > @@ -306,5 +314,6 @@ igt_main > igt_fixture { > igt_display_fini(&data.display); > igt_reset_connectors(); > + drmModeFreeResources(data.res); > } > } > -- > 2.35.1 -- Ville Syrjälä Intel<o:p></o:p> </div> </div> </div> </body> </html>