Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753349AbbLKQNU (ORCPT ); Fri, 11 Dec 2015 11:13:20 -0500 Received: from mail-wm0-f51.google.com ([74.125.82.51]:37720 "EHLO mail-wm0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751547AbbLKQNS (ORCPT ); Fri, 11 Dec 2015 11:13:18 -0500 Date: Fri, 11 Dec 2015 17:13:14 +0100 From: Daniel Vetter To: LABBE Corentin Cc: airlied@linux.ie, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org Subject: Re: [PATCH] drm: modes: Revert cc344980c767 "replace simple_strtoul by kstrtouint" Message-ID: <20151211161314.GA20822@phenom.ffwll.local> Mail-Followup-To: LABBE Corentin , airlied@linux.ie, linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org References: <1449838739-29969-1-git-send-email-clabbe.montjoie@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1449838739-29969-1-git-send-email-clabbe.montjoie@gmail.com> X-Operating-System: Linux phenom 4.1.0-2-amd64 User-Agent: Mutt/1.5.23 (2014-03-12) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 3114 Lines: 90 On Fri, Dec 11, 2015 at 01:58:59PM +0100, LABBE Corentin wrote: > My latest commit introduce some case where a valid mode, could be > rejected. > simple_strtox functions stop at first non-digit character, but kstrtox > not. > So args like "video=HDMI-A-1:720x480-16@60" will be reject when checking > 16@. > > Discussions about this change comes to the conclusion that the best > solution is to revert my commit cc344980c76748e57c9c03100c2a14d36ab00334. > > Signed-off-by: LABBE Corentin Queued for -next, thanks for the patch. -Daniel > --- > drivers/gpu/drm/drm_modes.c | 16 +++++----------- > 1 file changed, 5 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > index db36af7..3da1434 100644 > --- a/drivers/gpu/drm/drm_modes.c > +++ b/drivers/gpu/drm/drm_modes.c > @@ -1230,7 +1230,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, > unsigned int xres = 0, yres = 0, bpp = 32, refresh = 0; > bool yres_specified = false, cvt = false, rb = false; > bool interlace = false, margins = false, was_digit = false; > - int i, err; > + int i; > enum drm_connector_force force = DRM_FORCE_UNSPECIFIED; > > #ifdef CONFIG_FB > @@ -1250,9 +1250,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, > case '@': > if (!refresh_specified && !bpp_specified && > !yres_specified && !cvt && !rb && was_digit) { > - err = kstrtouint(&name[i + 1], 10, &refresh); > - if (err) > - return false; > + refresh = simple_strtol(&name[i+1], NULL, 10); > refresh_specified = true; > was_digit = false; > } else > @@ -1261,9 +1259,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, > case '-': > if (!bpp_specified && !yres_specified && !cvt && > !rb && was_digit) { > - err = kstrtouint(&name[i + 1], 10, &bpp); > - if (err) > - return false; > + bpp = simple_strtol(&name[i+1], NULL, 10); > bpp_specified = true; > was_digit = false; > } else > @@ -1271,9 +1267,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, > break; > case 'x': > if (!yres_specified && was_digit) { > - err = kstrtouint(&name[i + 1], 10, &yres); > - if (err) > - return false; > + yres = simple_strtol(&name[i+1], NULL, 10); > yres_specified = true; > was_digit = false; > } else > @@ -1496,4 +1490,4 @@ int drm_mode_convert_umode(struct drm_display_mode *out, > > out: > return ret; > -} > +} > \ No newline at end of file > -- > 2.4.10 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel -- Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/