Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp2399819rdf; Mon, 6 Nov 2023 13:04:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IFz2a6jlixcuwUyKivvA0hOGh6bMJjRTQVlNfRnAdC7oDsKUL0iB2mduKup46JlCkX6k8Wc X-Received: by 2002:a05:6358:63a9:b0:169:8620:a228 with SMTP id k41-20020a05635863a900b001698620a228mr18782447rwh.3.1699304660975; Mon, 06 Nov 2023 13:04:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699304660; cv=none; d=google.com; s=arc-20160816; b=HqQ3qIW8M0ZpYu3p6Jke+InuJHqayBaPL02SWntLS3HHnijLnYhCZA5PcoPlL9VCMY +cbG9FN2xF9uLIbIcIHVpP4GUd1MYRyociDht7juVuv3rWUuR5mX7Xdy1aRGyu43GutR k/HcobYUbN3RilPOoo5J5jLIR/c/9WtSaVtI9NpUXkw5KIfNJgVUYLQQGtK66c05FuBe GlCpqr0jIeISdakvgR8y+gZLgSjI8EPe+hYdvE1Y3aYRl57bf4xUxPyaQQP5xsM7DSrU Ugfyf65OGd/mxEDwojU4IdB4v1oUmpFu1vBQxW1A4LMcIjyl8BSE+92HEifaR4zJnKTI z5cw== 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=0wWL7J6soKXZc65uu5mj0Qq7sACwpTaan+kzwOlzpWc=; fh=xm4V3i9y7SNKSixHUbMvMEPgDl0W8xdNniziEWdXVkQ=; b=isn7fHoHsYp90Q6gm+JTfyoQBLtMLo9RGVspA512UR1U2Nyihuglu5V6VUvCv0RJSz 0ty2A7xABb/t9wuW7R9QKD7QYWJzqJiQcohKEDX+xL9ZdDa3Ld/AQaUOiQsRHc4aMbmJ Y1HgvHmRE7dk0XXgsRgOevrPDVis4NcR3gihrS/tGrcI8FQXaY+kHHh3c/GoK+R4LrVC ajp6yRYyXVK1CH9tBMcWpK72ck6nDxELplMPQZlGK9MZ4eeeTMKscqcxH+QzEZkgH7dg Jof8ys/BbZwqlP3qgg+AMAajdtd/7a7h5ad+dLiejfpb7tpwG46hIGsikDo8a40QCmHc 0P8Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=VI0sYYNS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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. [23.128.96.35]) by mx.google.com with ESMTPS id m5-20020a6562c5000000b005ae598c71d8si460948pgv.900.2023.11.06.13.04.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 13:04:20 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 as permitted sender) client-ip=23.128.96.35; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=VI0sYYNS; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.35 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 D25F58049D0B; Mon, 6 Nov 2023 13:04:14 -0800 (PST) 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 S233087AbjKFVDt (ORCPT + 99 others); Mon, 6 Nov 2023 16:03:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:57186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233065AbjKFVDq (ORCPT ); Mon, 6 Nov 2023 16:03:46 -0500 Received: from mail-pf1-x431.google.com (mail-pf1-x431.google.com [IPv6:2607:f8b0:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4F436103 for ; Mon, 6 Nov 2023 13:03:43 -0800 (PST) Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-6b20a48522fso4197108b3a.1 for ; Mon, 06 Nov 2023 13:03:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1699304623; x=1699909423; 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=0wWL7J6soKXZc65uu5mj0Qq7sACwpTaan+kzwOlzpWc=; b=VI0sYYNSk0tKdSQHnfobUL3t72QrxPESqP8dl1JovWqzz3L//Sww4dVaOKEpAMcNba pX3pKpG1+05q4VJ1g7+xxldYZ7Y/GY9XWR2gzcDnHnrpT5sKB/herBcBCwjQyxv9r5a1 xoSytHDQCaduuNmluF6aO639qLCCkVsl7mk5U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699304623; x=1699909423; 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=0wWL7J6soKXZc65uu5mj0Qq7sACwpTaan+kzwOlzpWc=; b=hi7G8UWqeAju1rXuh0kfYWuMTXgIbGGqL7yGLVcq5KzoLHZOc8zUlylchXUNOofDai uPCcIVFah2r9DgnDVCgvv6CuM+gyFS8rQVAh7L1CdJ3o8f0xuCIMQSf1Jfhpei5MQTj+ gZ7QoKiH7iQxGBAVVcHMLYt9eCbqB+uDJmASMQDVr+6UTJ96FUVTRV0UNjMndWjXPTBf wM6Lbwwa9/IsJObQxLiHtEHFWksW6nqfBR/b4rmnBOtvaV+ahfSAER0Y3AJy1qR5pjXy agpYwDU3FKLK/wcEbN61Sqq6ei7Xej9InQNMRutUysDqNa297o8Wre4M3FxEZkdL6prj Bupw== X-Gm-Message-State: AOJu0YwR0OHyLZ7cI9euudf9upxadR6vWBU0ZLCMADd5JYj/TYEl6Pm1 suBqCpLDg11qvEDNoMCThuaCPg== X-Received: by 2002:a05:6a20:7d9e:b0:180:e2b8:3b05 with SMTP id v30-20020a056a207d9e00b00180e2b83b05mr19953860pzj.52.1699304622719; Mon, 06 Nov 2023 13:03:42 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:3374:ff6c:474e:a78]) by smtp.gmail.com with ESMTPSA id 11-20020a170902c14b00b001c75a07f62esm6291220plj.34.2023.11.06.13.03.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 13:03:42 -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 Subject: [PATCH v4 2/3] drm/panel-edp: Add override_edid_mode quirk for generic edp Date: Mon, 6 Nov 2023 13:00:51 -0800 Message-ID: <20231106210337.2900034-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231106210337.2900034-1-hsinyi@chromium.org> References: <20231106210337.2900034-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]); Mon, 06 Nov 2023 13:04:15 -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 --- v3->v4: 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