Received: by 2002:a05:7412:b130:b0:e2:908c:2ebd with SMTP id az48csp820068rdb; Fri, 17 Nov 2023 13:51:49 -0800 (PST) X-Google-Smtp-Source: AGHT+IFyKdrMuVlbgVEQiCPJLys/Pbij/OpaftnMOGLoEDHOXrR/JLji/pGB1Or0EbERSzm/XfjW X-Received: by 2002:a17:90b:1b0a:b0:280:74ce:ae8d with SMTP id nu10-20020a17090b1b0a00b0028074ceae8dmr810941pjb.20.1700257908761; Fri, 17 Nov 2023 13:51:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1700257908; cv=none; d=google.com; s=arc-20160816; b=broXNoM1zUoJi81aUDL7D9OmLrItzQpBObbCDHv7B4HvcouDgGJjPZSSFOPjpbfbGQ hBHvfn/SaVaVIM23LNFg7n6cZIBW+TqfLz+qCUi6AymiOk3MyEYa2xHBOjujotaqE+Ve PSkDuy5KxE7GxtDdT/GWup9h8j7kuxR1WFlWy4MYPIH7sEGwvukyNZYsMDpJ6JW1ot0j NzG476pCKHaDNdM6lGabibPYehmIZYdlkhf1JeMCehShkxMsR3iV15M8a7uh+EuQA/M4 BgCed/oZzIcks05jQj/C5pNhV9AM2MsKv2pqdPaA4bDNjZZkTlA2utEn8dvtA6XZ+zhS M8bQ== 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=e5wbvoHrw5gghSmYXqYsGypau9Ymfce8CXWliYyG7ds=; fh=QSF6wZwxRRIGJ9Ybx1nP+GUhkXoPhy52zPZ6csROsqc=; b=vnX3avGXPm3QxW+ZxRry5pN/c9BCT1mUF3enTDSOe4vWNHgVh1XaGNFEOyhTMZ4lDP tbmlI1NVKjTK4+ViPBSdHREo7LfaBm5Hu/juL11nLsrE9+QhNK4A++N2Yesa8UQEVn54 VV0orwRiRAB3MYVFYLJWOrnJEW26cY7AvDStAhmwRnDq7P+xtiiLZTvGn9yDaSmbI8F8 X78E0zOM9tPIRjcculE1KxXsGaGDHU+BezynO3v/lXG67k0csy88wMqRacWu/eL+GbVH 5QALffJcrwtoCCE23/JAvhBbwO5ha6BzLN8QqMLPAma/fxoU3euywrkxWxESJnMvCRH/ SLsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ZbocSEbc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id a6-20020a17090a854600b002840019a45fsi189292pjw.148.2023.11.17.13.51.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 13:51:48 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=ZbocSEbc; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id B71B283271EA; Fri, 17 Nov 2023 13:51:45 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232597AbjKQVvK (ORCPT + 99 others); Fri, 17 Nov 2023 16:51:10 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38902 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230379AbjKQVvG (ORCPT ); Fri, 17 Nov 2023 16:51:06 -0500 Received: from mail-pg1-x531.google.com (mail-pg1-x531.google.com [IPv6:2607:f8b0:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D7F03120 for ; Fri, 17 Nov 2023 13:51:02 -0800 (PST) Received: by mail-pg1-x531.google.com with SMTP id 41be03b00d2f7-5c184b3bbc4so1865015a12.1 for ; Fri, 17 Nov 2023 13:51:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1700257862; x=1700862662; 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=e5wbvoHrw5gghSmYXqYsGypau9Ymfce8CXWliYyG7ds=; b=ZbocSEbcPlefV57I+X8efa9kGoeh+19x5Vft2Hj3p98Q19Y4Mw09XVe0wqaGyVPJ1j 6HB3m81jpcwymK560uYgmAHgL6gGG80un2qIW/kMjQW4Vp+PnJGX0eUYD23Gnx/qOUJ0 /y2Tw+vQQB8bKIQfY96Rv9bllHtEjYehQt/sM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1700257862; x=1700862662; 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=e5wbvoHrw5gghSmYXqYsGypau9Ymfce8CXWliYyG7ds=; b=BB/0S4LEKd4JTb2PKpsKQznl/d0zaRXEGHw+8MlGfsOr2o6CsK49nXgOv3fF+YeVzA mNdmNQ0fG+UWYOnyMLFy46Toc1ha/agxxQ5DG05EhAenKW0VRyhGefbdp3X4+X3tG8G/ wWMOAjDJmi6/NT52HCY2StHDDhKx67lMD2s3EyTmN/urvVj9tXbhIRZErr1FemrrT4pU eujs+4+yh1e9wUM2axgnIszMovdJqXtvVpbintKgZ+EiXrd4EXpTozI4AbVUmVppvJ16 fy5paDPhPAvCjPom0gHUmZU9u8mgk4h5dah4jT5k/eEMtPT3F5WSVsqEO5y/kbx+D3Pt tR1Q== X-Gm-Message-State: AOJu0YzjNlWv4KIvzpVrMFRvxKBpBOnOl/m5fecuThJI9HJoelNgXNjh +rH0cNJ+qm1WUtNvUJnk54JA9g== X-Received: by 2002:a05:6a21:398d:b0:188:aea:2138 with SMTP id ad13-20020a056a21398d00b001880aea2138mr625516pzc.19.1700257862324; Fri, 17 Nov 2023 13:51:02 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:7ed:b095:f0ba:5801]) by smtp.gmail.com with ESMTPSA id x7-20020a17090aca0700b00256b67208b1sm3639587pjt.56.2023.11.17.13.51.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Nov 2023 13:51:01 -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 v7 1/3] drm/panel-edp: Add override_edid_mode quirk for generic edp Date: Fri, 17 Nov 2023 13:46:32 -0800 Message-ID: <20231117215056.1883314-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.43.0.rc0.421.g78406f8d94-goog In-Reply-To: <20231117215056.1883314-1-hsinyi@chromium.org> References: <20231117215056.1883314-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,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 groat.vger.email 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 (groat.vger.email [0.0.0.0]); Fri, 17 Nov 2023 13:51:45 -0800 (PST) Generic edp gets mode from edid. However, some panels report incorrect mode in this way, resulting in glitches on panel. Introduce a new quirk additional_mode to the generic edid to pick a correct hardcoded mode. Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson --- v6->v7: split usecase to another patch. --- drivers/gpu/drm/panel/panel-edp.c | 48 +++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 3 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index f22677373171..33535f6de343 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -203,6 +203,9 @@ struct edp_panel_entry { /** @name: Name of this panel (for printing to logs). */ const char *name; + + /** @override_edid_mode: Override the mode obtained by edid. */ + const struct drm_display_mode *override_edid_mode; }; struct panel_edp { @@ -301,6 +304,24 @@ static unsigned int panel_edp_get_display_modes(struct panel_edp *panel, return num; } +static int panel_edp_override_edid_mode(struct panel_edp *panel, + struct drm_connector *connector, + const struct drm_display_mode *override_mode) +{ + struct drm_display_mode *mode; + + mode = drm_mode_duplicate(connector->dev, override_mode); + if (!mode) { + dev_err(panel->base.dev, "failed to add additional mode\n"); + return 0; + } + + mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; + drm_mode_set_name(mode); + drm_mode_probed_add(connector, mode); + return 1; +} + static int panel_edp_get_non_edid_modes(struct panel_edp *panel, struct drm_connector *connector) { @@ -568,6 +589,9 @@ static int panel_edp_get_modes(struct drm_panel *panel, { struct panel_edp *p = to_panel_edp(panel); int num = 0; + bool has_override_edid_mode = p->detected_panel && + p->detected_panel != ERR_PTR(-EINVAL) && + p->detected_panel->override_edid_mode; /* probe EDID if a DDC bus is available */ if (p->ddc) { @@ -575,9 +599,18 @@ static int panel_edp_get_modes(struct drm_panel *panel, if (!p->edid) p->edid = drm_get_edid(connector, p->ddc); - - if (p->edid) - num += drm_add_edid_modes(connector, p->edid); + if (p->edid) { + if (has_override_edid_mode) { + /* + * override_edid_mode is specified. Use + * override_edid_mode instead of from edid. + */ + num += panel_edp_override_edid_mode(p, connector, + p->detected_panel->override_edid_mode); + } else { + num += drm_add_edid_modes(connector, p->edid); + } + } pm_runtime_mark_last_busy(panel->dev); pm_runtime_put_autosuspend(panel->dev); @@ -1849,6 +1882,15 @@ static const struct panel_delay delay_200_150_e200 = { .delay = _delay \ } +#define EDP_PANEL_ENTRY2(vend_chr_0, vend_chr_1, vend_chr_2, product_id, _delay, _name, _mode) \ +{ \ + .name = _name, \ + .panel_id = drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_2, \ + product_id), \ + .delay = _delay, \ + .override_edid_mode = _mode \ +} + /* * This table is used to figure out power sequencing delays for panels that * are detected by EDID. Entries here may point to entries in the -- 2.43.0.rc0.421.g78406f8d94-goog