From patchwork Tue Nov 7 20:41:54 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 162724 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:aa0b:0:b0:403:3b70:6f57 with SMTP id k11csp504130vqo; Tue, 7 Nov 2023 12:46:58 -0800 (PST) X-Google-Smtp-Source: AGHT+IEEHaGpJINo0I7K1U2zWG65CiM2fvmUzUhn2XOylTkkIqCl5lPKgdR0aW5pYJtsl0cNHjLe X-Received: by 2002:a05:6358:e490:b0:168:ec55:d164 with SMTP id by16-20020a056358e49000b00168ec55d164mr39372890rwb.25.1699390018088; Tue, 07 Nov 2023 12:46:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699390018; cv=none; d=google.com; s=arc-20160816; b=PK3nBlF0AizWmbJfk2iMqnnJNUTHwtlZs5ArabuDpbaw/NK4RK293Rwc3L8jsJVQWP 9NBMjoc2jDj+me1jEluzJEdWZlSNPtaD3rh0WhMxAaZEK+kq3FMoTNnhXXCoBawCwMXI jgc/dUY6DqbUIWf6qWMyRYDc+0L8Eb3gcboG8c3Nu7YmEu/A5HWqgelJa+1mC+WZqjOS 5Lb3asqLgijCVbWZzlVA2Ia83ORNBqsIlr69IncGiS1PYm9q7uQAHgCk30AwiylxyHx+ /ExOFIBik0NtLmG+zjkO0XrL9Qp2PLLhx/rqno+4Bvc9cC+FwvseX1dpzPI7iwYQYmgA jsMA== 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=IVj66de+ZU4J9B/JF+Kuq5s4IrsGcC8ZccXdAT8ojUQ=; fh=QSF6wZwxRRIGJ9Ybx1nP+GUhkXoPhy52zPZ6csROsqc=; b=p4a4LsIOlt3Li1WEFGPxki90Vh6MhHkR718azIsSQoJBexpWSepRfs929c+FPW3ZfM IUFbbfivEN3bMSO93tiztAh9tqCx7g3kjf8F4H2oNjFvgCm3F3dO3BQnRjRIfdCZnwP2 7umPEjtcetzkx/UnzhUvbtJHqvNZghOVGSl04R8/7vvUmKds/uBT4sqTeqjZZGm8qbEs NzCUWNez4s9zup99TKXkBV2b4J8ZgjU8XphyEOKQjwLbxtmg8mpr/ORgp/mIG0l9dCCn T26iF1TlgSHSua78Cd8Dvh3PY7kz42vP8Yel3D8XrD7oMwfnl6YE+vYspVDLr6oLZJXI cohg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=dQ9ny+J5; 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 snail.vger.email (snail.vger.email. [2620:137:e000::3:7]) by mx.google.com with ESMTPS id o8-20020a656a48000000b005b8fb1e0312si3717847pgu.248.2023.11.07.12.46.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:46:58 -0800 (PST) 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=dQ9ny+J5; 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 1B36981DE207; Tue, 7 Nov 2023 12:46:42 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at snail.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344003AbjKGUqf (ORCPT + 32 others); Tue, 7 Nov 2023 15:46:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59864 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1343923AbjKGUqZ (ORCPT ); Tue, 7 Nov 2023 15:46:25 -0500 Received: from mail-oo1-xc33.google.com (mail-oo1-xc33.google.com [IPv6:2607:f8b0:4864:20::c33]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA5F710DA for ; Tue, 7 Nov 2023 12:46:22 -0800 (PST) Received: by mail-oo1-xc33.google.com with SMTP id 006d021491bc7-586940ee5a5so3115791eaf.0 for ; Tue, 07 Nov 2023 12:46:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699389982; x=1699994782; 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=IVj66de+ZU4J9B/JF+Kuq5s4IrsGcC8ZccXdAT8ojUQ=; b=dQ9ny+J5se6mk/zmI8+Sk1x8Yx0u348RvKK/irMbfXRS/RU3T8JR/KXTPaVK++1Q1x vFMvfYTYjVKzm0EIp/5pO82ZtFpcc58jMRAMrCG+rrsh87aF02imWt3TE9vxR7OtqM+3 i+mUWmtd7L0iVK34Y7xNE4e+Sd9NeY4YbU73k= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699389982; x=1699994782; 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=IVj66de+ZU4J9B/JF+Kuq5s4IrsGcC8ZccXdAT8ojUQ=; b=qQ4KnDQE4+dDidM0PBaSTS+bLeIfUgBSPS6JNej6O+E+rxtMVB7shIWmMvKKqSOdd1 2dSQFMRQH9raX9rK92amr/u9APQa4LYgxasAoviMSRoHGUotEdhBUWl+CQEHQHxxPQ/+ ZqPYIAZucf+lsIKfCDnNutEZLScbmIgLs/X3sedTA5EvVfIqMbQ9y7GaGeQnhcIpPVU8 cEj/mO0un5sSx2wqnljPhr5v9C/5BODDd6LbWLiD7nWetu/U4VwegH+Z2kepGJIxdUo/ qrLxqNqt5Uq0oN00EGvcnzcx4siPFEnhn8iFT/fU18YZv/tHIqhRIhGDR6LwCYUeWV1n 6v7w== X-Gm-Message-State: AOJu0YwGnZ9f9TD7AaKrfovmDM5RVCkZ+6rOyQm8zGMUeBB2y54IfxAB KuAmbPjgASx0KXHQowhsLy5FgQ== X-Received: by 2002:a05:6358:786:b0:169:4c8a:7ebf with SMTP id n6-20020a056358078600b001694c8a7ebfmr44973063rwj.7.1699389982185; Tue, 07 Nov 2023 12:46:22 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:586c:80a1:e007:beb9]) by smtp.gmail.com with ESMTPSA id e7-20020a630f07000000b005ab46970aaasm1750211pgl.17.2023.11.07.12.46.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Nov 2023 12:46:21 -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 v6 4/5] drm/panel-edp: Add override_edid_mode quirk for generic edp Date: Tue, 7 Nov 2023 12:41:54 -0800 Message-ID: <20231107204611.3082200-5-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231107204611.3082200-1-hsinyi@chromium.org> References: <20231107204611.3082200-1-hsinyi@chromium.org> MIME-Version: 1.0 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]); Tue, 07 Nov 2023 12:46:42 -0800 (PST) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1781939587222674633 X-GMAIL-MSGID: 1781939587222674633 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 --- no change. --- drivers/gpu/drm/panel/panel-edp.c | 67 ++++++++++++++++++++++++++++--- 1 file changed, 62 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index 599a949d74d1..c0c24d94c3a0 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); @@ -950,6 +983,19 @@ static const struct panel_desc auo_b101ean01 = { }, }; +static const struct drm_display_mode auo_b116xa3_mode = { + .clock = 70589, + .hdisplay = 1366, + .hsync_start = 1366 + 40, + .hsync_end = 1366 + 40 + 40, + .htotal = 1366 + 40 + 40 + 32, + .vdisplay = 768, + .vsync_start = 768 + 10, + .vsync_end = 768 + 10 + 12, + .vtotal = 768 + 10 + 12 + 6, + .flags = DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, +}; + static const struct drm_display_mode auo_b116xak01_mode = { .clock = 69300, .hdisplay = 1366, @@ -1878,6 +1924,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 @@ -1895,9 +1950,11 @@ static const struct edp_panel_entry edp_panels[] = { EDP_PANEL_ENTRY('A', 'U', 'O', 0x239b, &delay_200_500_e50, "B116XAN06.1"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x255c, &delay_200_500_e50, "B116XTN02.5"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x403d, &delay_200_500_e50, "B140HAN04.0"), - EDP_PANEL_ENTRY('A', 'U', 'O', 0x405c, &auo_b116xak01.delay, "B116XAK01.0"), + EDP_PANEL_ENTRY2('A', 'U', 'O', 0x405c, &auo_b116xak01.delay, "B116XAK01.0", + &auo_b116xa3_mode), EDP_PANEL_ENTRY('A', 'U', 'O', 0x582d, &delay_200_500_e50, "B133UAN01.0"), - EDP_PANEL_ENTRY('A', 'U', 'O', 0x615c, &delay_200_500_e50, "B116XAN06.1"), + EDP_PANEL_ENTRY2('A', 'U', 'O', 0x615c, &delay_200_500_e50, "B116XAN06.1", + &auo_b116xa3_mode), EDP_PANEL_ENTRY('A', 'U', 'O', 0x635c, &delay_200_500_e50, "B116XAN06.3"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x639c, &delay_200_500_e50, "B140HAK02.7"), EDP_PANEL_ENTRY('A', 'U', 'O', 0x8594, &delay_200_500_e50, "B133UAN01.0"),