| Message ID | 3696bcbf95fa1ae98f452c7ea32072642b46caa7.1657788997.git.geert@linux-m68k.org (mailing list archive) |
|---|---|
| State | Handled Elsewhere |
| Headers | show |
| Series | drm/modes: Command line mode selection fixes and improvements | expand |
On Thu, Jul 14, 2022 at 11:04:08AM +0200, Geert Uytterhoeven wrote: > The various mode->*specified flags are not handled in an uniform way: > some flags are set by the corresponding drm_mode_parse_cmdline_*() > function, some flags by the caller of the function, and some flags by > both. > > Make this uniform by making this the responsibility of the various > parsing helpers, i.e. > - Move the setting of mode->specified from caller to callee, > - Drop the duplicate setting of mode->bpp_specified and > mode->refresh_specified from callers. > > Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> > Reviewed-by: Hans de Goede <hdegoede@redhat.com> > Acked-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Maxime Ripard <maxime@cerno.tech> Maxime
diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index a3df18fccb31fa77..0cbf0467f263b30a 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1599,6 +1599,7 @@ static int drm_mode_parse_cmdline_res_mode(const char *str, unsigned int length, mode->yres = yres; mode->cvt = cvt; mode->rb = rb; + mode->specified = true; return 0; } @@ -1861,8 +1862,6 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, mode); if (ret) return false; - - mode->specified = true; } /* No mode? Check for freestanding extras and/or options */ @@ -1884,8 +1883,6 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, ret = drm_mode_parse_cmdline_bpp(bpp_ptr, &bpp_end_ptr, mode); if (ret) return false; - - mode->bpp_specified = true; } if (refresh_ptr) { @@ -1893,8 +1890,6 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, &refresh_end_ptr, mode); if (ret) return false; - - mode->refresh_specified = true; } /*
The various mode->*specified flags are not handled in an uniform way: some flags are set by the corresponding drm_mode_parse_cmdline_*() function, some flags by the caller of the function, and some flags by both. Make this uniform by making this the responsibility of the various parsing helpers, i.e. - Move the setting of mode->specified from caller to callee, - Drop the duplicate setting of mode->bpp_specified and mode->refresh_specified from callers. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Thomas Zimmermann <tzimmermann@suse.de> --- v2: - Add Reviewed-by, Acked-by. --- drivers/gpu/drm/drm_modes.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)