Received: by 2002:a05:7412:f589:b0:e2:908c:2ebd with SMTP id eh9csp1198123rdb; Wed, 1 Nov 2023 14:26:42 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGNTg7lL2Wr6Iqd3+TrxvV/W2HoBiJkdVMWZg7hneIWo65rPhyRUQaETLxnZJzrHT2wVyBy X-Received: by 2002:a05:6a20:258e:b0:159:c2d0:9fc6 with SMTP id k14-20020a056a20258e00b00159c2d09fc6mr20818643pzd.8.1698874001810; Wed, 01 Nov 2023 14:26:41 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698874001; cv=none; d=google.com; s=arc-20160816; b=oW+uOcDFmPXqxaAHje4qSfC/7VWMUJ0HYEo2p3Dez3HBCfAntZDosJxb6ASCQB7M+O Bt4GQpmtpnSr48GGyy7ZqMn2qilV1pAVwcgoVuF6Ohb+R6ygS99Rh3/L9gJNY1lxCwLL XB61qp7uUDC7JVeuJ4gDEjpYYJQp7lgkjC5Cbn/i99yjYHsz3kJFmzr1xARa+A1L7ypI JILl+oMIlHqn7B9827S3qlMS1YSlhjD96+CnN/uAdaYyMeBKN6jZ8I8+hkh22nkwy5vp Q520Ov2/8u8qcOVC3ON4VqllZzjSMtdfcEux+qY3QyKwOWIKpCaFImhIbaRN7aKQaO/v 6OUg== 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 :dkim-signature; bh=keM6xgaqk4y5F5Fy9cbvhHzonhRhCtU3xaG8qjxRs74=; fh=xm4V3i9y7SNKSixHUbMvMEPgDl0W8xdNniziEWdXVkQ=; b=CFD5ZdzcHstlReMr6uszZN42/BEZWzQ7XKrzrSgJIRYQv6tgNX451ncSX4Bnc3NovY NreTfQDpeNUDVT5IaSIEQz8tZzVXaTzqhxNwLf+wI8sQAD1BH6i98vcA7NDzjg8FSh2P WRk5+o8Wbi55tjcYCELvbh060HRcdJ87hH8uSlczMYmPK76CEdXXtmmdqRhpM33PGKtl DjKCv7LIvGOsecPjGwCaiYGpzVI9dc1KZDNcYwj51LIvBuQupjcOUF33IB4GQFZI0F8T PYcIGLSUTANTzr94xZL+IU79ClutCCDxhGPE00+NaYF5+lRoykZ+h24SZLLh6YCcAS7Q 0zAA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=UQVeKcZv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Return-Path: Received: from snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id f11-20020aa7968b000000b0068a6f6d9f7dsi2246827pfk.57.2023.11.01.14.26.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 14:26:41 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) client-ip=2620:137:e000::3:7; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=UQVeKcZv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:7 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by snail.vger.email (Postfix) with ESMTP id CF3118194773; Wed, 1 Nov 2023 14:26:29 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345464AbjKAV0V (ORCPT + 99 others); Wed, 1 Nov 2023 17:26:21 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35740 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345309AbjKAV0S (ORCPT ); Wed, 1 Nov 2023 17:26:18 -0400 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 64C2B110 for ; Wed, 1 Nov 2023 14:26:12 -0700 (PDT) Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-28098ebd5aeso309673a91.0 for ; Wed, 01 Nov 2023 14:26:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1698873972; x=1699478772; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=keM6xgaqk4y5F5Fy9cbvhHzonhRhCtU3xaG8qjxRs74=; b=UQVeKcZvDQWa0yPd7HLezvQmUCotcGHpxJA/Yc1N33qiJYBEQHfmenzJu8tANw7FBM UHFFQLwlOJFmd6aUCQSyh8ifrj0NFwtniTT+Ttt9GrnpfAo9DYGyeW/Sg/jFZ5svOTeC PrU1mecB07k1V3sVnnuYIWk0T2Xb19o1xPBnI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698873972; x=1699478772; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=keM6xgaqk4y5F5Fy9cbvhHzonhRhCtU3xaG8qjxRs74=; b=szg4ZH7lGjtpJ1zX14Yrlmwo4XPMjXvGY+ibWq/714WSmL9AWsV01Cn0MWX4N2jcIh Ms4auJaS2GpKYivgxyuuk6K4QGYQw4Fv0SgnEsm4g7IOXvpiCCnhhMRS08EXTJ3jiOtV R5hy6w6EMHvYId57vPUKBXz0fUTtAN5ok5zOCXJLVtaH8LuDJWHGUGsCQIp7q7pY1ZdZ ArwhyBQY49Qsja6bFf04JG2g4ZkWuO+zIDShdlyisBks3AWaJifaWXTwP9czlMcBYhMW +POqugcz7j5mkKvUdYU/RhU24nx3/pVb230Pc9dHUZE/BEfZVOCVtJynToU4F2CrITdc enyQ== X-Gm-Message-State: AOJu0YyemBoZBKbhx7PRu6M9dIB7m2dAhcNcc8Ony03SuG6IKt8ia0kK nERcq8TlUEJiOYTpwvPOm5s3bw== X-Received: by 2002:a17:90a:fc88:b0:280:18bd:ffe7 with SMTP id ci8-20020a17090afc8800b0028018bdffe7mr11725904pjb.48.1698873971885; Wed, 01 Nov 2023 14:26:11 -0700 (PDT) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:b410:473c:2b92:2e2e]) by smtp.gmail.com with ESMTPSA id ds21-20020a17090b08d500b00274262bcf8dsm1212976pjb.41.2023.11.01.14.26.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 01 Nov 2023 14:26:11 -0700 (PDT) From: Hsin-Yi Wang To: Douglas Anderson Cc: Neil Armstrong , Jessica Zhang , Sam Ravnborg , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Daniel Vetter , dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/3] drm/panel-edp: Choose correct preferred mode Date: Wed, 1 Nov 2023 14:20:11 -0700 Message-ID: <20231101212604.1636517-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231101212604.1636517-1-hsinyi@chromium.org> References: <20231101212604.1636517-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.5 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Wed, 01 Nov 2023 14:26:30 -0700 (PDT) If a non generic edp-panel is under aux-bus, the mode read from edid would still be selected as preferred and results in multiple preferred modes, which is ambiguous. If a hard-coded mode is present, unset the preferred bit of the modes read from edid. Signed-off-by: Hsin-Yi Wang --- drivers/gpu/drm/drm_modes.c | 16 ++++++++++++++++ drivers/gpu/drm/panel/panel-edp.c | 7 +++++-- include/drm/drm_modes.h | 1 + 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/drm_modes.c b/drivers/gpu/drm/drm_modes.c index ac9a406250c5..35927467f4b0 100644 --- a/drivers/gpu/drm/drm_modes.c +++ b/drivers/gpu/drm/drm_modes.c @@ -1933,6 +1933,22 @@ void drm_connector_list_update(struct drm_connector *connector) } EXPORT_SYMBOL(drm_connector_list_update); +/** + * drm_mode_unset_preferred - clear the preferred status on existing modes. + * @connector: the connector to update + * + * Walk the mode list for connector, clearing the preferred status on existing + * modes. + */ +void drm_mode_unset_preferred_modes(struct drm_connector *connector) +{ + struct drm_display_mode *cur_mode; + + list_for_each_entry(cur_mode, &connector->probed_modes, head) + cur_mode->type &= ~DRM_MODE_TYPE_PREFERRED; +} +EXPORT_SYMBOL_GPL(drm_mode_unset_preferred_modes); + static int drm_mode_parse_cmdline_bpp(const char *str, char **end_ptr, struct drm_cmdline_mode *mode) { diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index 0883ff312eba..b3ac473b2554 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -622,10 +622,13 @@ static int panel_edp_get_modes(struct drm_panel *panel, * and no modes (the generic edp-panel case) because it will clobber * the display_info that was already set by drm_add_edid_modes(). */ - if (p->desc->num_timings || p->desc->num_modes) + if (p->desc->num_timings || p->desc->num_modes) { + /* hard-coded modes present, unset preferred modes from edid. */ + drm_mode_unset_preferred_modes(connector); num += panel_edp_get_non_edid_modes(p, connector); - else if (!num) + } else if (!num) { dev_warn(p->base.dev, "No display modes\n"); + } /* * TODO: Remove once all drm drivers call diff --git a/include/drm/drm_modes.h b/include/drm/drm_modes.h index c613f0abe9dc..301817e00a15 100644 --- a/include/drm/drm_modes.h +++ b/include/drm/drm_modes.h @@ -560,6 +560,7 @@ void drm_mode_prune_invalid(struct drm_device *dev, struct list_head *mode_list, bool verbose); void drm_mode_sort(struct list_head *mode_list); void drm_connector_list_update(struct drm_connector *connector); +void drm_mode_unset_preferred_modes(struct drm_connector *connector); /* parsing cmdline modes */ bool -- 2.42.0.869.gea05f2083d-goog