Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp103447rdf; Thu, 2 Nov 2023 15:14:33 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFde1XfoIOthTBIcM8lKq2xRB4qwbc28SbAatxW158PLObxHlqN5QMHLeFKkarT49i9Zkl5 X-Received: by 2002:a05:6a20:734b:b0:16b:7602:15b1 with SMTP id v11-20020a056a20734b00b0016b760215b1mr20304416pzc.12.1698963273347; Thu, 02 Nov 2023 15:14:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1698963273; cv=none; d=google.com; s=arc-20160816; b=dSHvZLSpGc7IDMeYt4wTcCDnSVOsmLWQmLRf8/x6bvK/5mlxhfIro+X1aomvTwZAp7 +rTZKI8QX6KCdK1YtOPSyd4v3Eoqlg/jfk4uSm4n3fwCWA2BVJBt7/QYui1fIi4ebcHC CgdCr0io5NVd2/KzvrwYK5Yd6aGN9Yqrtzzz2QSFH7TvpG6YBcNAirAfO9/eSoTry1HT evAYFwqF6zgGyNKhamfUNkmzs76FfV22QsXkbdpq5H6x/QoAWp3Im1KMIKEfoD0cGzwB 1gPv0FG0QrJjRRNwTsBxzXHkC5/dryYhhmBWuzSl9xNvZBFhdhpfVX26m6U9rN93DGTu YO4w== 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=QorWcfM+G5ADWypzN9KpHRHW7tbG66Yho+IlCrrLtv4=; fh=xm4V3i9y7SNKSixHUbMvMEPgDl0W8xdNniziEWdXVkQ=; b=dDrXQ8pK7zkQHb2kruF4CZwkZ3TxKATc4t1FSZJh1UCSteEWlIlD/t84H0c/0pfSnn jsEBWQHB6yZ9sB7yHbKLoIVkFl6cAMvwRUBJr7dIsjXn3o01RKPKfheMJL7LHTndHf6P 3oc/HCtv/RsSaVfLSBfjsDPV9B8atAz5KIIVd1rG+CwTT2kZRFevCLT+O3Q/6U+Co6H1 SHEdDjwFfrBXxmxoDcVvOA/lt6OP2h4frmw7QONu7fA2ujbCrEXN/+jp5DldiUC80Eo9 /yDTNKt3TIb0yWJkGw7ETAJEK1mitmDbPy+/BuVUGtr2emKGYZ3qG5femRmrtNaN//rv LmoQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="UjpK2O/2"; 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 h10-20020a170902f54a00b001c9d4f08c3asi348670plf.277.2023.11.02.15.14.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 15:14:33 -0700 (PDT) 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="UjpK2O/2"; 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 BCC898116E79; Thu, 2 Nov 2023 15:14:19 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1377456AbjKBWNa (ORCPT + 99 others); Thu, 2 Nov 2023 18:13:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:45612 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234346AbjKBWNX (ORCPT ); Thu, 2 Nov 2023 18:13:23 -0400 Received: from mail-pf1-x435.google.com (mail-pf1-x435.google.com [IPv6:2607:f8b0:4864:20::435]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A34B919E for ; Thu, 2 Nov 2023 15:13:17 -0700 (PDT) Received: by mail-pf1-x435.google.com with SMTP id d2e1a72fcca58-692c02adeefso1487124b3a.3 for ; Thu, 02 Nov 2023 15:13:17 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1698963197; x=1699567997; 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=QorWcfM+G5ADWypzN9KpHRHW7tbG66Yho+IlCrrLtv4=; b=UjpK2O/20UxRHAnF+mAiRr2TlU6w+oKdCBITl5a6jyOajucsSpo45YYMENMNAOGMGX 8f5Bt6TKXE8VFCzw0SEzCdz/HitfIDakp7Y/s21ofmNKrjebk+nairx4af2C5rHt1Qe4 7z2DBFYxKAv5yToS3W3MnOHTLMraTA2+RFdCQ= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1698963197; x=1699567997; 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=QorWcfM+G5ADWypzN9KpHRHW7tbG66Yho+IlCrrLtv4=; b=Lx783JXmkqZwIr0IkSwAZa10IYm4HfAmeotq6Xno7y0hGOQxS2QFlXEecc7vHAKMWt ICDbDN2C9N23IqbQmJLE5m1sadi31TSnF3KUDzG/M/GTDhB+R0QnrxDny+zYw4VZfZy0 XA4ffv1XryKNeBVXhO+ADV7Tx/+rqMDILE4cbjMhM6BBEAA9QFhQZV1tB3QC2yJj0nDD 861HEoX/lF5Px6MYil3CN6P64kPj2vYVj3xGToQYLi15lfPKMCtyUEb8pLmfdAF+1gVZ pmMYS9XzMyBGeu4+geOCjfWLfnpVzYLASmo4kTGYWrtXCboYxO5d9+xUhAUHjsBKeycS AeRA== X-Gm-Message-State: AOJu0YyIdc1ksz/3lm67ZfZKDpG0GPdO5go3bxrneUBAcW+Lq/PIWGFN xTSXL2HjIAXG+fLVMwTdMwx43g== X-Received: by 2002:a05:6a00:1152:b0:6be:2bfa:6290 with SMTP id b18-20020a056a00115200b006be2bfa6290mr18056636pfm.8.1698963197065; Thu, 02 Nov 2023 15:13:17 -0700 (PDT) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:6ec1:79de:6e50:d6fa]) by smtp.gmail.com with ESMTPSA id y6-20020a63ce06000000b00565e96d9874sm196057pgf.89.2023.11.02.15.13.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 02 Nov 2023 15:13:16 -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 v2 2/4] drm/panel-edp: Add override_edid_mode quirk for generic edp Date: Thu, 2 Nov 2023 14:47:48 -0700 Message-ID: <20231102221309.1971910-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231102221309.1971910-1-hsinyi@chromium.org> References: <20231102221309.1971910-1-hsinyi@chromium.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.3 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, URIBL_BLOCKED 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]); Thu, 02 Nov 2023 15:14:20 -0700 (PDT) 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 --- v1->v2: no change --- drivers/gpu/drm/panel/panel-edp.c | 68 ++++++++++++++++++++++++++++--- 1 file changed, 63 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index 599a949d74d1..0fb439b5efb1 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,25 @@ 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) { + mode->type |= DRM_MODE_TYPE_DRIVER | DRM_MODE_TYPE_PREFERRED; + drm_mode_set_name(mode); + drm_mode_probed_add(connector, mode); + return 1; + } + + dev_err(panel->base.dev, "failed to add additional mode\n"); + + return 0; +} + static int panel_edp_get_non_edid_modes(struct panel_edp *panel, struct drm_connector *connector) { @@ -568,6 +590,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 +600,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 +984,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 +1925,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 +1951,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"), -- 2.42.0.869.gea05f2083d-goog