Received: by 2002:a05:7412:8521:b0:e2:908c:2ebd with SMTP id t33csp2435857rdf; Mon, 6 Nov 2023 14:19:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IFXd1/4EmILdmM87v7nwZf82Qy/O5BCLGQdy5lvp+v+wH73MXqevBfdMatGJBUElOxYzyea X-Received: by 2002:a05:6871:8897:b0:1e9:a050:3d60 with SMTP id tg23-20020a056871889700b001e9a0503d60mr749800oab.48.1699309140459; Mon, 06 Nov 2023 14:19:00 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699309140; cv=none; d=google.com; s=arc-20160816; b=MFuhcbmaW/M+StjzdeHukNDgb6uiwpJepgiJThkJde96sPtPY07jf0t8PN7GzKM2iu /9lzQkm+mCsmSaBMFbafpD+YpT/AVoyDPsIQNmR/jJGBnF2istnbA1B2f8y63lhyaXr/ ruV2O1Xnthoi/J6a3reDzi6qmlXEZxh13jzexGlKLK++1P6sW5hDk0gxeTG6yGj1gZXB FCQhuTZks4FBdt+o0GJtwER5+PhPv3pos0CZV6Ql2YasL2ci1IskupZGveBfPw3jWQXq TzAOcJVYv/nkEm5/SmjZX5y+MjgG8LsfLZdhiU0QY9y0XO6YaEq9nFR3MIq+sL2gqtEO zcXw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:subject:message-id:date:from:in-reply-to :references:mime-version:dkim-signature; bh=ebVVlSH5A/RaybVZDxdMNnaR50LgXmfcVpTsk4uB9cU=; fh=Q3LDYctwRsW0uzxH0Sz9u60c63QZ7Sjr7LEoiXYWz18=; b=Mkt4ISOrEw5fY169x5FjGSjCgzPftYXM6YNc4mkyiMjd7xjn+u8kKGbrD2BpCZfE4Z 8P5ilcum8pruwUfbkRTV95ZBPc2vGwCY4Ef+oyXVPIIfB57mr0u8Ekyd6J0geiKdhGQi SiMKK9p5inAYvKazxtb4bFtTMMphKTFJ7VWc0JOTsztO5CgIHrMgm6LrYdFbH8YF5N3J nmseRL9OJKoJK4S/xiLGM3rSkTALNZhwqKez6kTKvdQWBK/MaFeDC6fxtx3oFN3zoXnW c8xWiSN7xG8UJ4biRJ/fe5boCYcKY+2MEI/P8/XxF9cc7a+n3xd9Ce/wHOFT+EX6eHGH MwVw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u25IKeAN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id v202-20020a6361d3000000b00578a43e3b0bsi636689pgb.655.2023.11.06.14.19.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Nov 2023 14:19:00 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=u25IKeAN; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id D1CEE8041FEC; Mon, 6 Nov 2023 14:18:57 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233269AbjKFWSf (ORCPT + 99 others); Mon, 6 Nov 2023 17:18:35 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50242 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233243AbjKFWSe (ORCPT ); Mon, 6 Nov 2023 17:18:34 -0500 Received: from mail-yw1-x112e.google.com (mail-yw1-x112e.google.com [IPv6:2607:f8b0:4864:20::112e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 91BD1183 for ; Mon, 6 Nov 2023 14:18:31 -0800 (PST) Received: by mail-yw1-x112e.google.com with SMTP id 00721157ae682-5af6c445e9eso59426927b3.0 for ; Mon, 06 Nov 2023 14:18:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1699309111; x=1699913911; darn=vger.kernel.org; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ebVVlSH5A/RaybVZDxdMNnaR50LgXmfcVpTsk4uB9cU=; b=u25IKeAN5fBEv/kB1VyihGBWn11QTo+20e2viNOebupcOCiVTBU5NcFuq+q95WDywk KE0oG/XJbzp2H3wsdI5wTy45CWeQF/nXC6L0HbyCTddHk1j9hTJB3dypRktn9jvw8qeE XqS8s9yk/AQGYIomCJtl5v9I54y3hR5z4LIL2jEUpL2QopdsyoUuQ0gJYf8rynkFmlCt R+O4QvL2HWugRYyBi/R6E9QDP7or6TnKUECoyR51mvLNx5mIFLyQ6zCRNfPMDRkGBLON Fu7BCml7lsbmgQrDpujkVlLWqnr9jKN6O7OdYxNj16Bsyinzbj6ulaG2KV4rc//ZKeqM Sefg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699309111; x=1699913911; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ebVVlSH5A/RaybVZDxdMNnaR50LgXmfcVpTsk4uB9cU=; b=RRV1O7r+hjiXeMOgibf6os32k6flQMy7ImQT+gb8iSiF3i8jQE4GS8yFCX5NS/rC15 knViJh0+2nEyOO7NabJ7gv8Q3F8tHKEM1wPIgu3SZZoBU5ozQePtvc5kv41nMv//Pk29 YJcVSZLSVSYR7QJAI4e+vjA4U//BGlXvWF8UyHgw6DjZA3KUutOywQCpW0rmf/HlKMxi +/7U/Jvrh7Tjtq4sOvUv5m4FIvF66BEvYJJwXBmx7RxEQsT7QWguO+I828Ep4wtAmXxV Linesjejhn3EkpqNKy+1UGUWFu6BQkd23Aj2XIVwUFMEUaoSUtTLMw1jzCb5gG1bv+7M AlFg== X-Gm-Message-State: AOJu0Yx5t9dWLybwPN6g6KhyFsfQtsA0mHKmG5YBZBmCsmt1dMzy1NV2 LOK9U8yAt3HBKzJCdEDSjZso8xurWTedBotkC4kJSA== X-Received: by 2002:a0d:e809:0:b0:59f:6675:7771 with SMTP id r9-20020a0de809000000b0059f66757771mr11712763ywe.35.1699309110717; Mon, 06 Nov 2023 14:18:30 -0800 (PST) MIME-Version: 1.0 References: <20231106210337.2900034-1-hsinyi@chromium.org> <20231106210337.2900034-3-hsinyi@chromium.org> In-Reply-To: <20231106210337.2900034-3-hsinyi@chromium.org> From: Dmitry Baryshkov Date: Tue, 7 Nov 2023 00:18:19 +0200 Message-ID: Subject: Re: [PATCH v4 2/3] drm/panel-edp: Add override_edid_mode quirk for generic edp To: Hsin-Yi Wang Cc: Douglas Anderson , Neil Armstrong , linux-kernel@vger.kernel.org, Maxime Ripard , dri-devel@lists.freedesktop.org, Thomas Zimmermann , Jessica Zhang , Sam Ravnborg Content-Type: text/plain; charset="UTF-8" X-Spam-Status: No, score=-0.9 required=5.0 tests=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 agentk.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 (agentk.vger.email [0.0.0.0]); Mon, 06 Nov 2023 14:18:58 -0800 (PST) On Mon, 6 Nov 2023 at 23:03, Hsin-Yi Wang wrote: > > 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; Nit: it is more typical to handle error cases as conditionals. This means: if (!mode) { dev_err(); return 0; } mode->type |= ... drm_mode_set_name(); drm_mode_probed_add(); return 1; > +} > + > 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 > -- With best wishes Dmitry