From patchwork Fri Nov 25 20:31:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 26135 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4275548wrr; Fri, 25 Nov 2022 12:33:37 -0800 (PST) X-Google-Smtp-Source: AA0mqf4MwI764y/sdywJSS7CS7NiZwYov1hTMwUCw8X+nUW/KllcrPF48ehygVhdGqnMVU+lQRMS X-Received: by 2002:aa7:9257:0:b0:56c:cea7:8650 with SMTP id 23-20020aa79257000000b0056ccea78650mr20623426pfp.40.1669408417030; Fri, 25 Nov 2022 12:33:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669408417; cv=none; d=google.com; s=arc-20160816; b=MJBmuDYKrkErm6Ha9Yc1IgmHTs6g02WoKnAfhAwbFUpH5GYVSFVRgjZwXcrW8Lq/ZV ZR3T+C2JVd1tl3PZ8a71lpaP26CWuMkBCmixEy3n0eiKURxAnyb19VxXrbTqLy227xfO BeAcQr3TujehhpcfnXKlrROdY7ixEBF5O4qNz4VK0Nyl/m+7XOqXrsggCpnhCQF/rjWm XmtqPn4LhWJZszpQRoC0Z/Nh2B16qIyYeqVlgZg0s9iDsY4NOLQZrMV51250+GV2UFTJ 1UPgGWuU1LXuU5rjUlxvbb5x/Eww4v6JffZsUV1dUfNHeZfOiYat2oC0R28OfKhp/xnc hbwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=CkHYls2prdVk24nks14SLzJK9mecWMW0n33q0xjbxMU=; b=WFN94IQ1QV22acsrr+5Hqf3jhV3LSQBMVa1niUZZMJVzAOoXYb5HwEPNLkNldpDKo4 a6Bdo5kjocPk58ik2Y5p+UWNcXfmB8MOQacUeZh1v4+BYQC0T5tgn7d4ddnIFeY0bBtK 3fhZ+sWz1KUgsVrvGuFNhPPayTyGiudk61bkdqTiBOyf9I/EpwVx6GL4WXU9RS4omHq6 pMUEDE11X/Vy9PR10WhISCKM1uM33vYOGTLslbdFyUgTy25x0PjLiNnjXBiR3B0ik8rX 9hx+YR9SDmjtw/ZXhrBhpNwvygUgBfMW9FZvUm9N1zIR4r+oT/PE4LeEqqK20DARMgau dc6Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r198-20020a632bcf000000b00477f5ac52edsi698682pgr.492.2022.11.25.12.33.24; Fri, 25 Nov 2022 12:33:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230007AbiKYUbW (ORCPT + 99 others); Fri, 25 Nov 2022 15:31:22 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56484 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229946AbiKYUbP (ORCPT ); Fri, 25 Nov 2022 15:31:15 -0500 Received: from michel.telenet-ops.be (michel.telenet-ops.be [IPv6:2a02:1800:110:4::f00:18]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A78E031370 for ; Fri, 25 Nov 2022 12:31:11 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed10:d898:271f:7512:e47f]) by michel.telenet-ops.be with bizsmtp id okX62800N4su47u06kX6c2; Fri, 25 Nov 2022 21:31:09 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1oyfLj-001aQ7-Sv; Fri, 25 Nov 2022 21:31:03 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1oyfLj-003Kwy-F9; Fri, 25 Nov 2022 21:31:03 +0100 From: Geert Uytterhoeven To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Hans de Goede Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven , Maxime Ripard Subject: [PATCH v3 1/2] drm/modes: parse_cmdline: Make mode->*specified handling more uniform Date: Fri, 25 Nov 2022 21:31:00 +0100 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750501600126222336?= X-GMAIL-MSGID: =?utf-8?q?1750501600126222336?= 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 Reviewed-by: Hans de Goede Acked-by: Thomas Zimmermann Acked-by: Maxime Ripard --- v3: - Add Acked-by, v2: - Add Reviewed-by, Acked-by, --- drivers/gpu/drm/drm_modes.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 3c8034a8c27bd25a..45b9e6aab766002a 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1605,6 +1605,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; } @@ -1921,8 +1922,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 */ @@ -1944,8 +1943,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) { @@ -1953,8 +1950,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; } /* From patchwork Fri Nov 25 20:31:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Geert Uytterhoeven X-Patchwork-Id: 26131 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp4275172wrr; Fri, 25 Nov 2022 12:32:40 -0800 (PST) X-Google-Smtp-Source: AA0mqf6CICKtJRb9JIC0xEJSbXnTyC2BbRxOMdcNGPwKH4vVx5LZRujP1E6xT0ZJWAwynkRdT5CD X-Received: by 2002:aa7:8c19:0:b0:573:620a:3b1c with SMTP id c25-20020aa78c19000000b00573620a3b1cmr21020758pfd.50.1669408360419; Fri, 25 Nov 2022 12:32:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669408360; cv=none; d=google.com; s=arc-20160816; b=R6mRC2FU7lN5QkwmmzbMWx4e27pnRFLa9Ygv81Ah9sjFQhcgjd3qy9ej6TeJRZ5URk avlx2kK8w2zbH2nUUUQQrEJ4WfWYkUK33od5LVoy6Bp2r8euYi0xpsIC6IDWHB+T/ZJt TOOoFqlzR4RbWeXuOj3zKwoOAOLwfm+qv9L4Oi4eV3ujW8ylPwYFdQhoQDoVgN/QFXVM 64+qKBQNYJOGOFSqpPUj18uCjgVZVTiLymg2dcb6Jx4yjVYW94J5b6L/wEylpdiWD8TN qXf3TyOb7QZbdgownO8I0s0WEYWi3SWYzvh+8BGO7kmPPrwLS38uBafHp6MbiBi1akoE Qmpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=IjKcOQ1sE9lxW5u9DT6WFY7m8tdqnMBcKlVzG4YOCv0=; b=ajPpNbfqbA5KVZnha1pLNYyLx4j656hZkVfdIhR0gh11sUO0T9GRCLIfwycuzDdKVc hpJ5k2yeOw34bHci2iUpFLPK/pDsNpXHUx0LNzErAuKqPXyxQqjIhuUpAyzN50qsyPfG mOxa5PaepvNDQJK87iDm+SofU4hgHNVRgC76ts13jfedFF4uqk2MuGotlp2j7fF2mvv1 Sxe+Zg2lqb6Z+yPfWUA+ewkylbt7iwfY0FKUDOwyMkq4n5+3fwAqMinoHv7o1EYeVta9 Nx1xcBoKlsGb0uOZopmVRDFgBqwdUZEuq8hIvmPenScNrZz+sa2uS0vNCgFlUYy1PznW 4E5A== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id me5-20020a17090b17c500b00213621b3301si8755123pjb.162.2022.11.25.12.32.27; Fri, 25 Nov 2022 12:32:40 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229981AbiKYUbQ (ORCPT + 99 others); Fri, 25 Nov 2022 15:31:16 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56470 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229583AbiKYUbP (ORCPT ); Fri, 25 Nov 2022 15:31:15 -0500 Received: from albert.telenet-ops.be (albert.telenet-ops.be [IPv6:2a02:1800:110:4::f00:1a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9384D2FFF8 for ; Fri, 25 Nov 2022 12:31:11 -0800 (PST) Received: from ramsan.of.borg ([IPv6:2a02:1810:ac12:ed10:d898:271f:7512:e47f]) by albert.telenet-ops.be with bizsmtp id okX62800E4su47u06kX6PU; Fri, 25 Nov 2022 21:31:08 +0100 Received: from rox.of.borg ([192.168.97.57]) by ramsan.of.borg with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1oyfLj-001aQ8-Se; Fri, 25 Nov 2022 21:31:03 +0100 Received: from geert by rox.of.borg with local (Exim 4.93) (envelope-from ) id 1oyfLj-003Kx4-Fq; Fri, 25 Nov 2022 21:31:03 +0100 From: Geert Uytterhoeven To: Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , Hans de Goede Cc: dri-devel@lists.freedesktop.org, linux-fbdev@vger.kernel.org, linux-m68k@vger.kernel.org, linux-kernel@vger.kernel.org, Geert Uytterhoeven Subject: [PATCH v3 2/2] drm/modes: Add support for driver-specific named modes Date: Fri, 25 Nov 2022 21:31:01 +0100 Message-Id: <577fd80ce4b98a5517564eccf7b4dceaf823c545.1669405382.git.geert@linux-m68k.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_LOW, SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1750501540839895652?= X-GMAIL-MSGID: =?utf-8?q?1750501540839895652?= The mode parsing code recognizes named modes only if they are explicitly listed in the internal named mode list, which is currently limited to "NTSC" and "PAL". Provide a mechanism for drivers to override this list to support custom modes. Ideally, this list should just come from the driver's actual list of modes, but connector->probed_modes is not yet populated at the time of parsing. Signed-off-by: Geert Uytterhoeven Reviewed-by: Hans de Goede --- I don't expect this patch to be acceptable as-is, but it's a dependency for posting the RFC Atari DRM driver. v3: - Update for the switch from names to named mode descriptors, v2: - Add Reviewed-by. --- drivers/gpu/drm/drm_modes.c | 19 ++++++++----------- include/drm/drm_connector.h | 18 ++++++++++++++++++ 2 files changed, 26 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index 45b9e6aab766002a..9ea928b35e728d13 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1751,14 +1751,6 @@ static int drm_mode_parse_cmdline_options(const char *str, return 0; } -struct drm_named_mode { - const char *name; - unsigned int pixel_clock_khz; - unsigned int xres; - unsigned int yres; - unsigned int flags; -}; - #define NAMED_MODE(_name, _pclk, _x, _y, _flags) \ { \ .name = _name, \ @@ -1771,12 +1763,15 @@ struct drm_named_mode { static const struct drm_named_mode drm_named_modes[] = { NAMED_MODE("NTSC", 13500, 720, 480, DRM_MODE_FLAG_INTERLACE), NAMED_MODE("PAL", 13500, 720, 576, DRM_MODE_FLAG_INTERLACE), + { /* sentinel */ } }; static int drm_mode_parse_cmdline_named_mode(const char *name, unsigned int name_end, + const struct drm_connector *connector, struct drm_cmdline_mode *cmdline_mode) { + const struct drm_named_mode *named_modes; unsigned int i; if (!name_end) @@ -1802,8 +1797,9 @@ static int drm_mode_parse_cmdline_named_mode(const char *name, * We're sure we're a named mode at this point, iterate over the * list of modes we're aware of. */ - for (i = 0; i < ARRAY_SIZE(drm_named_modes); i++) { - const struct drm_named_mode *mode = &drm_named_modes[i]; + named_modes = connector->named_modes ? : drm_named_modes; + for (i = 0; named_modes[i].name; i++) { + const struct drm_named_mode *mode = &named_modes[i]; int ret; ret = str_has_prefix(name, mode->name); @@ -1903,7 +1899,8 @@ bool drm_mode_parse_command_line_for_connector(const char *mode_option, if (!mode_end) return false; - ret = drm_mode_parse_cmdline_named_mode(name, mode_end, mode); + ret = drm_mode_parse_cmdline_named_mode(name, mode_end, connector, + mode); if (ret < 0) return false; diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 565cf9d3c550926f..ff78ac214e475086 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1315,6 +1315,14 @@ struct drm_cmdline_mode { struct drm_connector_tv_margins tv_margins; }; +struct drm_named_mode { + const char *name; + unsigned int pixel_clock_khz; + unsigned int xres; + unsigned int yres; + unsigned int flags; +}; + /** * struct drm_connector - central DRM connector control structure * @@ -1708,6 +1716,16 @@ struct drm_connector { /** @hdr_sink_metadata: HDR Metadata Information read from sink */ struct hdr_sink_metadata hdr_sink_metadata; + + /** + * @named_modes: + * + * Optional NULL-terminated array of names to be considered valid mode + * names. This lets the command line option parser distinguish between + * mode names and freestanding extras and/or options. + * If not set, a set of defaults will be used. + */ + const struct drm_named_mode *named_modes; }; #define obj_to_connector(x) container_of(x, struct drm_connector, base)