From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 679E1C433EF for ; Fri, 8 Jul 2022 19:46:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239918AbiGHTqF (ORCPT ); Fri, 8 Jul 2022 15:46:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53496 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238515AbiGHTqE (ORCPT ); Fri, 8 Jul 2022 15:46:04 -0400 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by lindbergh.monkeyblade.net (Postfix) with ESMTP id 2F45188F2B for ; Fri, 8 Jul 2022 12:46:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1657309562; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vLjxfS/IkYLw35yGStC8uj/FyqMkGDcG5weCQvZVRiw=; b=UcCFRvYxdUpr0Ig8rGAe0wnHaolOcBy9nTlcUb+qSteeVDBbBdoyGt5rQYHWHxV0I2UbBO j6cPGOAFXvb58HT7tLDx6Ttuzf9tdlJ5axddDktjUVv5R5WLTJz1HnbL//NvErmK7XgYkN WLjKCv5qy1wzvfiPO0gkinQfG2ZrrB0= Received: from mail-ej1-f72.google.com (mail-ej1-f72.google.com [209.85.218.72]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-146-tUtYEQo0NGqWKj1KKf-W_A-1; Fri, 08 Jul 2022 15:46:00 -0400 X-MC-Unique: tUtYEQo0NGqWKj1KKf-W_A-1 Received: by mail-ej1-f72.google.com with SMTP id hq41-20020a1709073f2900b00722e5ad076cso6095062ejc.20 for ; Fri, 08 Jul 2022 12:46:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:in-reply-to :content-transfer-encoding; bh=vLjxfS/IkYLw35yGStC8uj/FyqMkGDcG5weCQvZVRiw=; b=lNjOWbwsr/GfnDRZN/lQYuiNHvNc3P4WotqrgO8ffZN5gflkA5VrgdT4bDDEsJG7DQ DJHwTWDYaAtksENND+3VFgrxFu0l0S05dduitE12EX+RNk6A/OqcP63Y46Mafx19iGvo Eiw6Bm1mokSPEAJOVMj54EbmiQ0JcTcSPK94XRMXmYZScSr5HxyGA0PMyuVmwV8ezzla 5c7bJX13cTs84Mb7U3j8/lYuf1+8uzp4dtifKPDKOiMm6OpP2ilV5sm0Zk8HYkdL8gl3 /pcqiGBfPIvdIGMFlXePbsFi2HTGvP7SHSZp11Ycm20pE+4oTIAKIVKpLyphKAu/unmb J81Q== X-Gm-Message-State: AJIora9YuyiqEkhXmfvBg/wLEAh8kXh2OUkmN6/vBTTV6BfEZTko9Za5 qIvsJMzKuwZP3CAMAxrL522BRzTtoECyY6v5RB3XQOn2NndMCpFNWuQRhLZYivlsBoz0Z7a6pTv rIHoJM3svd4Acc8wyHMBuKuI= X-Received: by 2002:a17:906:84f0:b0:72b:136a:a406 with SMTP id zp16-20020a17090684f000b0072b136aa406mr5208083ejb.700.1657309559678; Fri, 08 Jul 2022 12:45:59 -0700 (PDT) X-Google-Smtp-Source: AGRyM1soRNcaDcTHOuYD8Mr2wY+AfEJyajgo94gJG5OzKtzrgk5L+7s97fmEIdCygRjckvG23MWK6Q== X-Received: by 2002:a17:906:84f0:b0:72b:136a:a406 with SMTP id zp16-20020a17090684f000b0072b136aa406mr5208072ejb.700.1657309559515; Fri, 08 Jul 2022 12:45:59 -0700 (PDT) Received: from ?IPV6:2001:1c00:c1e:bf00:d69d:5353:dba5:ee81? (2001-1c00-0c1e-bf00-d69d-5353-dba5-ee81.cable.dynamic.v6.ziggo.nl. [2001:1c00:c1e:bf00:d69d:5353:dba5:ee81]) by smtp.gmail.com with ESMTPSA id f13-20020a170906824d00b00726e108b566sm15039136ejx.173.2022.07.08.12.45.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 08 Jul 2022 12:45:59 -0700 (PDT) Message-ID: Date: Fri, 8 Jul 2022 21:45:58 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.8.0 Subject: Re: [PATCH 2/5] drm/modes: Extract drm_mode_parse_cmdline_named_mode() Content-Language: en-US To: Geert Uytterhoeven , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org References: <402dea47269f2e3960946d186ba3cb118066e74a.1657301107.git.geert@linux-m68k.org> From: Hans de Goede In-Reply-To: <402dea47269f2e3960946d186ba3cb118066e74a.1657301107.git.geert@linux-m68k.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Precedence: bulk List-ID: X-Mailing-List: linux-fbdev@vger.kernel.org Hi, On 7/8/22 20:21, Geert Uytterhoeven wrote: > Extract the code to check for a named mode parameter into its own > function, to streamline the main parsing flow. > > Signed-off-by: Geert Uytterhoeven > --- > drivers/gpu/drm/drm_modes.c | 41 +++++++++++++++++++++++++++---------- > 1 file changed, 30 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c > index 30a7be97707bfb16..434383469e9d984d 100644 > --- a/drivers/gpu/drm/drm_modes.c > +++ b/drivers/gpu/drm/drm_modes.c > @@ -1749,6 +1749,30 @@ static const char * const drm_named_modes_whitelist[] = { > "PAL", > }; > > +static int drm_mode_parse_cmdline_named_mode(const char *name, > + unsigned int length, > + bool refresh, > + struct drm_cmdline_mode *mode) > +{ > + unsigned int i; > + int ret; > + > + for (i = 0; i < ARRAY_SIZE(drm_named_modes_whitelist); i++) { > + ret = str_has_prefix(name, drm_named_modes_whitelist[i]); > + if (!ret) As discussed in my review of 1/5 this needs to become: if (ret != length) > + continue; Which renders my other comment on this patch (length not being used) mute. Regards, Hans > + > + if (refresh) > + return -EINVAL; /* named + refresh is invalid */ > + > + strcpy(mode->name, drm_named_modes_whitelist[i]); > + mode->specified = true; > + return 0; > + } > + > + return 0; > +} > + > /** > * drm_mode_parse_command_line_for_connector - parse command line modeline for connector > * @mode_option: optional per connector mode option > @@ -1785,7 +1809,7 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, > const char *bpp_ptr = NULL, *refresh_ptr = NULL, *extra_ptr = NULL; > const char *options_ptr = NULL; > char *bpp_end_ptr = NULL, *refresh_end_ptr = NULL; > - int i, len, ret; > + int len, ret; > > memset(mode, 0, sizeof(*mode)); > mode->panel_orientation = DRM_MODE_PANEL_ORIENTATION_UNKNOWN; > @@ -1823,16 +1847,11 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, > } > > /* First check for a named mode */ > - for (i = 0; mode_end && i < ARRAY_SIZE(drm_named_modes_whitelist); i++) { > - ret = str_has_prefix(name, drm_named_modes_whitelist[i]); > - if (ret) { > - if (refresh_ptr) > - return false; /* named + refresh is invalid */ > - > - strcpy(mode->name, drm_named_modes_whitelist[i]); > - mode->specified = true; > - break; > - } > + if (mode_end) { > + ret = drm_mode_parse_cmdline_named_mode(name, mode_end, > + refresh_ptr, mode); > + if (ret) > + return false; > } > > /* No named mode? Check for a normal mode argument, e.g. 1024x768 */