From patchwork Tue Jan 2 11:18:59 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Javier Martinez Canillas X-Patchwork-Id: 184314 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp4384606dyb; Tue, 2 Jan 2024 03:19:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IE1BBXlvImXVDm3mGnDy9xy96IL8CQLXI/v9J0EIjYsbZcC4apGXhF9r3+b9mstTV/mZrzk X-Received: by 2002:a05:620a:3705:b0:781:d55a:3ea1 with SMTP id de5-20020a05620a370500b00781d55a3ea1mr1686302qkb.152.1704194389354; Tue, 02 Jan 2024 03:19:49 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1704194389; cv=none; d=google.com; s=arc-20160816; b=GXDAD0Dh+T89JYjVQ9rbq+I3PKU0pLj3NoaIRrlUriY76VQb/1Wv9YgxR8iTKH2SFM TQmU2vMX4+CVLpTlL9P7LzBykw6PjD9uUpJbb2nssGPjii/7GslJvazDS1A1I10geeN5 mMJwsyMJQksysgvmVriZV9R+2codjdL+nvnhP9ALmaRxhSGvukkRR2VW+zofSEV1a9Yc d0qVjt1qJEz6D+mJzO6xpG4Adl9l3pJYIUR7mwDsWzDBPSOZaoUZG5Kzs3MaL0KqJp8U 31Xjnmb9J6XO+HHDA4P9dKjmGOeHSI+NxlxsqgElQUE9/rOK6rNcGlZNK+nuCvtoE6Ak ODaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:cc:to :from:dkim-signature; bh=qoJsvoq0DDDLxrsVvT9v5nXIRGXNDW8rEpKhzHpyXgI=; fh=lOdQ1gvBd2XKrNbmEkP3KqNOiLVW9BIndg9i39ole74=; b=lDaf4uPVsUejPNksMBaiKBEggLTzX+ymaTT3krQNRN1KyoOZfvae+2cSyx+c/0ibB8 VsLsvTDr8u5h4iXF5d9uCAJ1H/de5EypNW3Se3pRuT95pGJzj6RTQJ3Bq/tnulLaRVb4 TE6cFLi7mHNJEwZ+hFQco9bPdtbMgkPG2SDwWSnFxTn2OBOtV0dN0gpMaOKcKtQ9EAIY g+6GvmGQDXGUCFTbtLmJcwzdcpFKpn9YesUEZFRuR+Dbc0kCsYG1Can8et4gObDbvv4F QiT830ROz4sQojGMh6QJo0PENHX6Gn01nf1EWtS66OyHnvTr1+347w/lHDqt6jR9sv4a dCeQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=a3Piu51Q; spf=pass (google.com: domain of linux-kernel+bounces-14281-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14281-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from ny.mirrors.kernel.org (ny.mirrors.kernel.org. [147.75.199.223]) by mx.google.com with ESMTPS id s4-20020a05620a254400b007819d68a405si8312548qko.257.2024.01.02.03.19.49 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 03:19:49 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-14281-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) client-ip=147.75.199.223; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=a3Piu51Q; spf=pass (google.com: domain of linux-kernel+bounces-14281-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.199.223 as permitted sender) smtp.mailfrom="linux-kernel+bounces-14281-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ny.mirrors.kernel.org (Postfix) with ESMTPS id 1BEAE1C21D9D for ; Tue, 2 Jan 2024 11:19:49 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9D375EAFF; Tue, 2 Jan 2024 11:19:34 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="a3Piu51Q" X-Original-To: linux-kernel@vger.kernel.org Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 39C10EACE for ; Tue, 2 Jan 2024 11:19:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1704194369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qoJsvoq0DDDLxrsVvT9v5nXIRGXNDW8rEpKhzHpyXgI=; b=a3Piu51QeO0BIPdKXCazNR5Y5juuS/D5lV3Ifbhl71pm+HDks3ZMjBDRHhOCOVG9K1WfGL DeLhOs0iuXJhiyW1zaBJCAs3LrNYIbuw4qmFiyreLk/fsC/TdnuY2qbuwl7BL99rm45Snh oQosQhMi/V40O8zSsgH7Ja9L3cQCI+I= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-425-5iwnMwtxMdewayKPopFyzA-1; Tue, 02 Jan 2024 06:19:28 -0500 X-MC-Unique: 5iwnMwtxMdewayKPopFyzA-1 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-40d86184891so14245585e9.1 for ; Tue, 02 Jan 2024 03:19:27 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1704194366; x=1704799166; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=qoJsvoq0DDDLxrsVvT9v5nXIRGXNDW8rEpKhzHpyXgI=; b=BcamKWDoFgujwS4hbgoBDf7qNWe2aEaHwrqNY49pSP6JjARTd7aTQW5fM8xCcCvK0t JpFp3WopjdIRyfycgGcrPcFaxlYOiNiQRfAfkLTq1Nhwx31vXfpdAYlF3TCbT8NK2zIj pkch89tm6x3/IdH4HbE3yLLfltkwCba3XuQTrhMZCaixGBGFEgJokmK3vCOy/EKrI3n1 Tiy/S/Q+lZ7lQB9+ffWlxnFsbh1+0QdRD52kEzSY6rfw7Kf9T43zYGQ4/ffD6NOUPs3g lgBjel68wDRMbs1uzVs8I5SdwKmLV8tB+rGgYoPChzGuPjV2HmSKb85n3clwftJ8PWg/ pufA== X-Gm-Message-State: AOJu0YypGxoWg5jdxZxqN+R5Uo+SyjhqBUxgvzD8/nYsR9JsrNdRZNzw HxPBxBwLe2BvvknZ3nRNRYab/weOO0gArGr8xs4Kr7JwzxC8UGsK6AOt4WCFBqpajIZJVCXSv4f ZAOiRCMRRY5cAxkATI/5pmkQOnHOJmjqRn3QykYE8u1ruMYC8QUUSmRg2UjhRjL5/Dr3XjUyqak /INc+fh/mQIsjCDDYN2Q== X-Received: by 2002:a05:600c:21c3:b0:40c:32bf:20f with SMTP id x3-20020a05600c21c300b0040c32bf020fmr8670404wmj.147.1704194366169; Tue, 02 Jan 2024 03:19:26 -0800 (PST) X-Received: by 2002:a05:600c:21c3:b0:40c:32bf:20f with SMTP id x3-20020a05600c21c300b0040c32bf020fmr8670393wmj.147.1704194365857; Tue, 02 Jan 2024 03:19:25 -0800 (PST) Received: from localhost (red-hat-inc.vlan560.asr1.mad1.gblx.net. [159.63.51.90]) by smtp.gmail.com with ESMTPSA id w10-20020a05600c474a00b0040d725a9967sm16395607wmo.11.2024.01.02.03.19.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jan 2024 03:19:25 -0800 (PST) From: Javier Martinez Canillas To: linux-kernel@vger.kernel.org Cc: Javier Martinez Canillas , Daniel Vetter , David Airlie , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , dri-devel@lists.freedesktop.org Subject: [PATCH] drm: Move drm_set_preferred_mode() helper from drm_edid to drm_modes Date: Tue, 2 Jan 2024 12:18:59 +0100 Message-ID: <20240102111921.3057255-1-javierm@redhat.com> X-Mailer: git-send-email 2.43.0 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786977335653434643 X-GMAIL-MSGID: 1786977335653434643 The helper is generic and doesn't use the opaque EDID type struct drm_edid and is also used by drivers that only support non-probeable displays, such as fixed panels. These drivers add a list of modes using drm_mode_probed_add() and then set a preferred mode using the drm_set_preferred_mode() helper. It seems more logical to have the helper definition in drm_modes.o instead of drm_edid.o, since the former contains modes helper while the latter has helpers to manage the EDID information. Since both drm_edid.o and drm_modes.o object files are built-in the drm.o object, there are no functional changes. But besides being a more logical place for this helper, it could also allow to eventually make drm_edid.o optional and not included in drm.o if only fixed panels must be supported in a given system. Signed-off-by: Javier Martinez Canillas Reviewed-by: Jani Nikula --- drivers/gpu/drm/drm_edid.c | 23 +---------------------- drivers/gpu/drm/drm_modes.c | 22 ++++++++++++++++++++++ include/drm/drm_edid.h | 2 -- include/drm/drm_modes.h | 2 ++ 4 files changed, 25 insertions(+), 24 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index cb4031d5dcbb..48dd2a0a0395 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -43,6 +43,7 @@ #include #include #include +#include #include #include "drm_crtc_internal.h" @@ -6989,28 +6990,6 @@ int drm_add_modes_noedid(struct drm_connector *connector, } EXPORT_SYMBOL(drm_add_modes_noedid); -/** - * drm_set_preferred_mode - Sets the preferred mode of a connector - * @connector: connector whose mode list should be processed - * @hpref: horizontal resolution of preferred mode - * @vpref: vertical resolution of preferred mode - * - * Marks a mode as preferred if it matches the resolution specified by @hpref - * and @vpref. - */ -void drm_set_preferred_mode(struct drm_connector *connector, - int hpref, int vpref) -{ - struct drm_display_mode *mode; - - list_for_each_entry(mode, &connector->probed_modes, head) { - if (mode->hdisplay == hpref && - mode->vdisplay == vpref) - mode->type |= DRM_MODE_TYPE_PREFERRED; - } -} -EXPORT_SYMBOL(drm_set_preferred_mode); - static bool is_hdmi2_sink(const struct drm_connector *connector) { /* diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index ac9a406250c5..01aa44e87534 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -2754,3 +2754,25 @@ bool drm_mode_is_420(const struct drm_display_info *display, drm_mode_is_420_also(display, mode); } EXPORT_SYMBOL(drm_mode_is_420); + +/** + * drm_set_preferred_mode - Sets the preferred mode of a connector + * @connector: connector whose mode list should be processed + * @hpref: horizontal resolution of preferred mode + * @vpref: vertical resolution of preferred mode + * + * Marks a mode as preferred if it matches the resolution specified by @hpref + * and @vpref. + */ +void drm_set_preferred_mode(struct drm_connector *connector, + int hpref, int vpref) +{ + struct drm_display_mode *mode; + + list_for_each_entry(mode, &connector->probed_modes, head) { + if (mode->hdisplay == hpref && + mode->vdisplay == vpref) + mode->type |= DRM_MODE_TYPE_PREFERRED; + } +} +EXPORT_SYMBOL(drm_set_preferred_mode); diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 54cc6f04a708..5bd6b6eb6c57 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -426,8 +426,6 @@ enum hdmi_quantization_range drm_default_rgb_quant_range(const struct drm_display_mode *mode); int drm_add_modes_noedid(struct drm_connector *connector, int hdisplay, int vdisplay); -void drm_set_preferred_mode(struct drm_connector *connector, - int hpref, int vpref); int drm_edid_header_is_valid(const void *edid); bool drm_edid_block_valid(u8 *raw_edid, int block, bool print_bad_edid, diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h index c613f0abe9dc..b9bb92e4b029 100644 --- a/include/drm/drm_modes.h +++ b/include/drm/drm_modes.h @@ -467,6 +467,8 @@ bool drm_mode_is_420_also(const struct drm_display_info *display, const struct drm_display_mode *mode); bool drm_mode_is_420(const struct drm_display_info *display, const struct drm_display_mode *mode); +void drm_set_preferred_mode(struct drm_connector *connector, + int hpref, int vpref); struct drm_display_mode *drm_analog_tv_mode(struct drm_device *dev, enum drm_connector_tv_mode mode,