Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp2478399rdf; Mon, 6 Nov 2023 16:02:34 -0800 (PST) X-Google-Smtp-Source: AGHT+IH2nqunCUaP3xyOcTjvpXzBBxZchjZX+ihvj+zCZVbfuyY3XaQrZv4OxcvNm6VkUG4kARJw X-Received: by 2002:a05:6808:14d1:b0:3ab:8956:ada4 with SMTP id f17-20020a05680814d100b003ab8956ada4mr32771784oiw.10.1699315354520; Mon, 06 Nov 2023 16:02:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699315354; cv=none; d=google.com; s=arc-20160816; b=xKj3xhBhS78AUNBox4mmtyp6VbJdLvDDmDHMrlKHzRpZnSERTevMq27wi6H8CYdSWC mFbHGLq8RGUxD+1rhpC+/CbU1K5Lz5wXPXcYiSgWLONGxl5UqYgpcWjHNAI/MZmph2O4 hn5Xq3Bw6ieleq9P68lSGVodM0FqdAAndxCrI7qSFguUUzJDjlDvl6ac59NQH5Q9x8ri MzF89pgY/fARm7hRhpGi2VRkLw0ClACZG/TpQ8TMIutJANHF2KtvRcf34Cs5jik3P+28 0ggrmODnnUQNKEf521dyI1alsOx2XoyxWeoEj5c8W4Fu6G4nrywMzIC2I2qFkyeKX50p nTIw== 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=9SxHcJHXQ0Dgu/1LSV/bZ2Cmouuh15UgwvxxZf23/GE=; fh=QSF6wZwxRRIGJ9Ybx1nP+GUhkXoPhy52zPZ6csROsqc=; b=O3bKVX9vVxWFuymwUYHmg0CdSkDDA6j8OtP6lz9tEy2nTPOA9kmO/ipIa4jiSTQDIs M4N6wm+X0cHH+dPneBCoZnLhsnP6EnABtQ5FHKw/XuE6QYtxbWhYp/svjXSqeAB7XP1L rCtJts3bM2J/TU2gLG/kZQzl1QXdFNcavTJ927Y2+Ik3pTzP6OyDb0BZGVaO6nqHCe08 Ex3P/+j/LKkhjRDt8inAKQeXWEdXQQ35wkM2x2Q2wLMhNee/dJH9R7BPSfjCkGb/yZVW xs8vJD19Vyn1X1KgKCbQuyh72pZE744cu5tZDnL+lvqjRIPOWoHPjibpITSIBNL3wKLO U5Ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Fg8IxiPH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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. [23.128.96.37]) by mx.google.com with ESMTPS id gs22-20020a0568083c9600b003a85fa1ef7csi4004295oib.177.2023.11.06.16.02.34 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:02:34 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 as permitted sender) client-ip=23.128.96.37; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=Fg8IxiPH; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.37 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 4C4EF809E73A; Mon, 6 Nov 2023 16:00:55 -0800 (PST) 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 S233466AbjKGAAp (ORCPT + 99 others); Mon, 6 Nov 2023 19:00:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:56122 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233390AbjKGAAg (ORCPT ); Mon, 6 Nov 2023 19:00:36 -0500 Received: from mail-pg1-x534.google.com (mail-pg1-x534.google.com [IPv6:2607:f8b0:4864:20::534]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9E309B6 for ; Mon, 6 Nov 2023 16:00:33 -0800 (PST) Received: by mail-pg1-x534.google.com with SMTP id 41be03b00d2f7-5b9a7357553so3949435a12.0 for ; Mon, 06 Nov 2023 16:00:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699315233; x=1699920033; 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=9SxHcJHXQ0Dgu/1LSV/bZ2Cmouuh15UgwvxxZf23/GE=; b=Fg8IxiPHgClq5gddwW56nUKr9WjyiaYICR5LmF59h+UY9CE4YKZLzeKY4R3YEanS1Z LFdMQYhr4KSfgtU94qHpT22ifIwiASpsaUiOM5+zYMP0f9ornSz60hZvebXEGqsWlwIm NwTfSQTQ1QidMmMjuj8FfhACy4mqLeCacxpzA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699315233; x=1699920033; 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=9SxHcJHXQ0Dgu/1LSV/bZ2Cmouuh15UgwvxxZf23/GE=; b=jDTaQZPvMe1ThaeAfiJ5siIGTuOb2ILoHmNuDF/Mp/PeCh/VIpK1xcEeFsLZr44Abi jkjmj75GoAIToBqBy8R8HJXEa1Ov12nhPwtBUqXzg7pHR4rySP95Winzi9k9/yINnGg5 u63VZxewxMH8Jnl6NdCpPQ1uaJ//2U2Ul2rXj0Fbvdq14vF6C1PFiW2CSv2fGD91NyWZ +PdcgSzjYjhjw2VaOdM/hV8AjRiA4zO5lljbHCN1GLqJi26MZloogJmSirvofrbXp3Uk SuU3KhXGDvM6oPbCtp9oYxGD3baC1bNsdD0Jm4LBpK2k0sJf+tzVTuFzzuOWeNriJYW/ 08hQ== X-Gm-Message-State: AOJu0Yx+ESuYKFDX1Ko609t7JBj06vvFQTMYZu8rJNLkA3rl5iKimG5q WdLYpGfK5R9orsSd+LyyQhw9OQ== X-Received: by 2002:a05:6a21:790b:b0:181:125:e85c with SMTP id bg11-20020a056a21790b00b001810125e85cmr23690070pzc.53.1699315232986; Mon, 06 Nov 2023 16:00:32 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id fw11-20020a17090b128b00b00268b439a0cbsm5852866pjb.23.2023.11.06.16.00.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 16:00:32 -0800 (PST) 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, stable@vger.kernel.org Subject: [PATCH v5 4/4] drm/panel-edp: Avoid adding multiple preferred modes Date: Mon, 6 Nov 2023 15:51:35 -0800 Message-ID: <20231107000023.2928195-5-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107000023.2928195-1-hsinyi@chromium.org> References: <20231107000023.2928195-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 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 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-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (snail.vger.email [0.0.0.0]); Mon, 06 Nov 2023 16:00:55 -0800 (PST) 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 both hard-coded mode and edid exists, only add mode from hard-coded. Signed-off-by: Hsin-Yi Wang --- v4->v5: remove inapplicable comments. --- drivers/gpu/drm/panel/panel-edp.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index c0c24d94c3a0..006939cc3fee 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -589,6 +589,7 @@ static int panel_edp_get_modes(struct drm_panel *panel, { struct panel_edp *p = to_panel_edp(panel); int num = 0; + bool has_hard_coded_modes = p->desc->num_timings || p->desc->num_modes; bool has_override_edid_mode = p->detected_panel && p->detected_panel != ERR_PTR(-EINVAL) && p->detected_panel->override_edid_mode; @@ -599,7 +600,11 @@ static int panel_edp_get_modes(struct drm_panel *panel, if (!p->edid) p->edid = drm_get_edid(connector, p->ddc); - if (p->edid) { + /* + * If both edid and hard-coded modes exists, skip edid modes to + * avoid multiple preferred modes. + */ + if (p->edid && !has_hard_coded_modes) { if (has_override_edid_mode) { /* * override_edid_mode is specified. Use @@ -616,12 +621,7 @@ static int panel_edp_get_modes(struct drm_panel *panel, pm_runtime_put_autosuspend(panel->dev); } - /* - * Add hard-coded panel modes. Don't call this if there are no timings - * 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 (has_hard_coded_modes) num += panel_edp_get_non_edid_modes(p, connector); else if (!num) dev_warn(p->base.dev, "No display modes\n"); -- 2.42.0.869.gea05f2083d-goog