From nobody Fri Dec 19 21:47:53 2025 Received: from mail-oi1-f172.google.com (mail-oi1-f172.google.com [209.85.167.172]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 621F46FAF for ; Wed, 6 Mar 2024 00:43:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.172 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685834; cv=none; b=NZsSiKVpNOVwj1dhAgwVgYbSBK9mjqkzxAZtRZC7PBzGiKHmXoY/mTtzddDXuiBYeXqbZ/qNZNDmfrZFHl+85TMWbO3uxIO7j3OPoqfBCLno3mMTHpAyMoiitw8M1f9W6nSznFavCT3Qx8+6sZ9TOWjQgUiAJqMtB8MR9I26Xq8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685834; c=relaxed/simple; bh=+gMAu/mH8Zbo9TI1zOpILsB3HJUn23XAjsmJee8sbgE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=PY1Ris8zM2dDBEAOBmXWwBAgYlgZJqRgBlN05hrrR4RC81ppzu/tq0luO73rr8ILAqoALLEtxfnzEy0MK6Yz8i3RubhXdGAJSdMxnkMusJwcKjePY4Fb84zSg/Nqwm3rj5pq/ttRneuaHHqEIyNJ0+RekCdhPJS373sQeXKkfgo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=C9eZZF2i; arc=none smtp.client-ip=209.85.167.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="C9eZZF2i" Received: by mail-oi1-f172.google.com with SMTP id 5614622812f47-3c1a2f7e302so3443816b6e.0 for ; Tue, 05 Mar 2024 16:43:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709685831; x=1710290631; 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=MwnVHHF+SAy7EA+lave/HwOmjTm+ySnhWai82DKOimc=; b=C9eZZF2iy1N33E7Zzza8p6Y8NX7HrESwhJnsSqCa6+wOXWJLhHKRbsGX6wmbfnUuAF pZRaeSwLp8gI4sfBP/lKAYgCnwBsL4YW777g0XFA2TIoRIl45k9ZIJMiwQssTa3pCPB+ +lHGp7VMh2XOdhM8Ie+CxagN3trd4sLWCSjbs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709685831; x=1710290631; 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=MwnVHHF+SAy7EA+lave/HwOmjTm+ySnhWai82DKOimc=; b=n89lfDqcrFyt/prqQanI5mi2IlxoDzcSt332Ju+pa7Tl/xiG5ZKL4PlX9VY+3u9AL1 evQkNblsu7qDXP7as0oZ4uHSWeF+ybT5XGtTM4+E2MtqyAERNYHBxSCEhzzCml/aRx0B pdBrBp4j60BKwsJg+wU0mWu26IU9vtFwB9pwkksi12kFIU8aJ3iyqkqQ1T0QBuiOQBr3 Q2S2J1HBAX7t3q2zmQAaDLh4A6f8ecKhNZcbnNTC/frDruNroloFF+zHEqQYDAtux+Va GnAUWc+Tgp/lM36kp70T8psArA5q89roktLpznY35uXc9Zq78k06kz4ccGcaXSARFsTa lztg== X-Forwarded-Encrypted: i=1; AJvYcCU0+LOC9Ew3uzJH1cQIE40V65xn+EebETa4946v4Dy6ivJ5a3RPgXlMZ+BZUYzSvRorCdEjiJixxWE7KscwKEfSoPt4Nc0tEMQS0FO7 X-Gm-Message-State: AOJu0YzzTUcEfPKJMW7h/WHzcbH+kvR34DKvdnViQZTwCB6bTc7SO6sY +hrVimGzcXj4MkxLE2uuI+OeVsVocE5MVqLXkyQ9zL84n/fls2xi+3nJ2rtr0g== X-Google-Smtp-Source: AGHT+IEohVRqWaXH8EBXFArEg9r3SrVjJiR1PWflATvQ2Oat0xAfK/zbvZ2qASv1MelHpAUDLJQEZg== X-Received: by 2002:a05:6808:4286:b0:3c1:f46c:d796 with SMTP id dq6-20020a056808428600b003c1f46cd796mr3054966oib.34.1709685831519; Tue, 05 Mar 2024 16:43:51 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:29bc:b3d:1ba8:cf52]) by smtp.gmail.com with ESMTPSA id x37-20020a631725000000b005dc48e56191sm8512885pgl.11.2024.03.05.16.43.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 16:43:51 -0800 (PST) From: Hsin-Yi Wang To: Jani Nikula , Dmitry Baryshkov , 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 1/5] drm_edid: Add a function to get EDID base block Date: Tue, 5 Mar 2024 16:34:01 -0800 Message-ID: <20240306004347.974304-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240306004347.974304-1-hsinyi@chromium.org> References: <20240306004347.974304-1-hsinyi@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It's found that some panels have variants that they share the same panel id although their EDID and names are different. Besides panel id, now we need more information from the EDID base block to distinguish these panel variants. Add drm_edid_read_base_block() to return the EDID base block, which is wrapped in struct drm_edid. Caller can further use it to get panel id or check if the block contains certain strings, such as panel name. Signed-off-by: Hsin-Yi Wang --- v3->v4: change drm_edid_read_base_block return type to drm_edid. --- drivers/gpu/drm/drm_edid.c | 63 +++++++++++++++++++------------ drivers/gpu/drm/panel/panel-edp.c | 8 +++- include/drm/drm_edid.h | 3 +- 3 files changed, 46 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 923c4423151c..f9e09f327f81 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2770,58 +2770,71 @@ static u32 edid_extract_panel_id(const struct edid = *edid) } =20 /** - * drm_edid_get_panel_id - Get a panel's ID through DDC - * @adapter: I2C adapter to use for DDC + * drm_edid_get_panel_id - Get a panel's ID from EDID + * @drm_edid: EDID that contains panel ID. * - * This function reads the first block of the EDID of a panel and (assuming + * This function uses the first block of the EDID of a panel and (assuming * that the EDID is valid) extracts the ID out of it. The ID is a 32-bit v= alue * (16 bits of manufacturer ID and 16 bits of per-manufacturer ID) that's * supposed to be different for each different modem of panel. * + * Return: A 32-bit ID that should be different for each make/model of pan= el. + * See the functions drm_edid_encode_panel_id() and + * drm_edid_decode_panel_id() for some details on the structure of= this + * ID. + */ +u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid) +{ + return edid_extract_panel_id(drm_edid->edid); +} +EXPORT_SYMBOL(drm_edid_get_panel_id); + +/** + * drm_edid_read_base_block - Get a panel's EDID base block + * @adapter: I2C adapter to use for DDC + * + * This function returns the drm_edid containing the first block of the ED= ID of + * a panel. + * * This function is intended to be used during early probing on devices wh= ere * more than one panel might be present. Because of its intended use it mu= st - * assume that the EDID of the panel is correct, at least as far as the ID - * is concerned (in other words, we don't process any overrides here). + * assume that the EDID of the panel is correct, at least as far as the ba= se + * block is concerned (in other words, we don't process any overrides here= ). + * + * Caller should call drm_edid_free() after use. * * NOTE: it's expected that this function and drm_do_get_edid() will both * be read the EDID, but there is no caching between them. Since we're only * reading the first block, hopefully this extra overhead won't be too big. * - * Return: A 32-bit ID that should be different for each make/model of pan= el. - * See the functions drm_edid_encode_panel_id() and - * drm_edid_decode_panel_id() for some details on the structure of= this - * ID. + * WARNING: Only use this function when the connector is unknown. For exam= ple, + * during the early probe of panel. The EDID read from the function is tem= porary + * and should be replaced by the full EDID returned from other drm_edid_re= ad. + * + * Return: Pointer to allocated EDID base block, or NULL on any failure. */ - -u32 drm_edid_get_panel_id(struct i2c_adapter *adapter) +const struct drm_edid *drm_edid_read_base_block(struct i2c_adapter *adapte= r) { enum edid_block_status status; void *base_block; - u32 panel_id =3D 0; - - /* - * There are no manufacturer IDs of 0, so if there is a problem reading - * the EDID then we'll just return 0. - */ =20 base_block =3D kzalloc(EDID_LENGTH, GFP_KERNEL); if (!base_block) - return 0; + return NULL; =20 status =3D edid_block_read(base_block, 0, drm_do_probe_ddc_edid, adapter); =20 edid_block_status_print(status, base_block, 0); =20 - if (edid_block_status_valid(status, edid_block_tag(base_block))) - panel_id =3D edid_extract_panel_id(base_block); - else + if (!edid_block_status_valid(status, edid_block_tag(base_block))) { edid_block_dump(KERN_NOTICE, base_block, 0); + kfree(base_block); + return NULL; + } =20 - kfree(base_block); - - return panel_id; + return drm_edid_alloc(base_block, EDID_LENGTH); } -EXPORT_SYMBOL(drm_edid_get_panel_id); +EXPORT_SYMBOL(drm_edid_read_base_block); =20 /** * drm_get_edid_switcheroo - get EDID data for a vga_switcheroo output diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/pane= l-edp.c index 745f3e48f02a..d094cfc43da8 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -766,6 +766,7 @@ static const struct edp_panel_entry *find_edp_panel(u32= panel_id); static int generic_edp_panel_probe(struct device *dev, struct panel_edp *p= anel) { struct panel_desc *desc; + const struct drm_edid *base_block; u32 panel_id; char vend[4]; u16 product_id; @@ -795,8 +796,11 @@ static int generic_edp_panel_probe(struct device *dev,= struct panel_edp *panel) goto exit; } =20 - panel_id =3D drm_edid_get_panel_id(panel->ddc); - if (!panel_id) { + base_block =3D drm_edid_read_base_block(panel->ddc); + if (base_block) { + panel_id =3D drm_edid_get_panel_id(base_block); + drm_edid_free(base_block); + } else { dev_err(dev, "Couldn't identify panel via EDID\n"); ret =3D -EIO; goto exit; diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 7923bc00dc7a..9686a7cee6a6 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -410,7 +410,8 @@ struct edid *drm_do_get_edid(struct drm_connector *conn= ector, void *data); struct edid *drm_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter); -u32 drm_edid_get_panel_id(struct i2c_adapter *adapter); +const struct drm_edid *drm_edid_read_base_block(struct i2c_adapter *adapte= r); +u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid); struct edid *drm_get_edid_switcheroo(struct drm_connector *connector, struct i2c_adapter *adapter); struct edid *drm_edid_duplicate(const struct edid *edid); --=20 2.44.0.278.ge034bb2e1d-goog From nobody Fri Dec 19 21:47:53 2025 Received: from mail-pl1-f181.google.com (mail-pl1-f181.google.com [209.85.214.181]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A1B41FA4 for ; Wed, 6 Mar 2024 00:43:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.181 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685834; cv=none; b=sFcdjj23tvsHkvLLzsDvNe+Zn2o8lLijh+Kx4IRfqONkxJMEAq4ayVIPeV1kHxsJfaLMO09ztYtT9NujlUuucb/YlFaJqYJHh+gYtWeYOTLvar7Qf+ftIQmsmXpdFihwlOrIN+ZN6y6iZbWKBNizNcv3OtvIYWrK6MeXBYKYUDk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685834; c=relaxed/simple; bh=tvXKCl/cgCPvM8IGb1vVMNKL43VABDwfLcZaqcnYUV8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=nO+leog+yVO65Pzaql0Xw1QZ3GDQKPkK35AGK17Ig3yl4XobrvInmYJyAkehp0PQfRJO/2eWsOwK7P7SdcNSN86/IWDnoeYRDCHjofOkX/fWLYjuoYcKmStBMap2H+dzNxEJhOHYhaC5buylaUis9Oh0943PdLXAzCSuOdo1A/4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=nyjzAGGT; arc=none smtp.client-ip=209.85.214.181 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="nyjzAGGT" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1dc3b4b9b62so2657735ad.1 for ; Tue, 05 Mar 2024 16:43:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709685832; x=1710290632; 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=1jdDSZHjVilOHoD9Mz88hwX3pgYSN/T59roGid0+2HE=; b=nyjzAGGTSnxxw5a/KRuUR9R/3+iOONC3E5+Clq8l5LqdH9EnEB2DRWgQa9B58+N89D u5bOEpGoOCJ2bGpuexlvypcjxGvUZ5lSx2kVgu9+wtd9lvDbxKEAWch8yis2Wxo16Sez SLjh3l+rPvdBaJwQP5ZvlCRdrF+E7YJhtBikg= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709685832; x=1710290632; 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=1jdDSZHjVilOHoD9Mz88hwX3pgYSN/T59roGid0+2HE=; b=nu9jTtraJabX/+VKE+88grlRIlhL7am4u8sc/vT/MnfzYLkzgssRUnaKb0NIKFyaOj C7fXjzYK5oKyjCVJuWLd+TJMRcO7y3ftODKPBTthLzqz7cbiJ2MLWdOI/TlvkloW1P37 mxeLM+LZVfTjMKds7oP6y0XhkVAkwa+kD8v94uPLX/zcA8tk4aWhqLESZZaMqhCEVwLX FUYXel1ud+QmVo9IZ9OUFRt8GYHHnHgX11h5azX69SAWWOXjIxbSuXW3mjHmKPsouUq4 xiC1n6JaBDit32raU1BvLb40lfnkaNyhSkkuAyd83SYY2gqIJ8gg9JXC59KU/zUTe8P8 n22A== X-Forwarded-Encrypted: i=1; AJvYcCXmfpoasU4EJPoTTZY8hoIHVsqbS5XPeBCzNLJnUVqXhDd7FwP/VplHRhzfTbPZFx6gfXN+nZoAuWH3wxPU5uDkFjchsYusFrwH1lvG X-Gm-Message-State: AOJu0Yxcjc5jN1/ThK4dqzJ2/AO53y7WXfROEN+6/AP7lxjlceZ7wt35 gayYM2tIXCTK6XErzJpha0iy/L4nrgVOTUNRB0CIC5I/+OQ/eGY+50yCOGjBtw== X-Google-Smtp-Source: AGHT+IHpeCSw6qFXG6z+qH6Amd+u9YxeuylmnfupBVB5t2dOKqVPQdY/9+/kxV/f5BbAsu5vN5zylA== X-Received: by 2002:a17:902:e741:b0:1dc:b7d2:3f28 with SMTP id p1-20020a170902e74100b001dcb7d23f28mr5058993plf.32.1709685832378; Tue, 05 Mar 2024 16:43:52 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:29bc:b3d:1ba8:cf52]) by smtp.gmail.com with ESMTPSA id x37-20020a631725000000b005dc48e56191sm8512885pgl.11.2024.03.05.16.43.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 16:43:52 -0800 (PST) From: Hsin-Yi Wang To: Jani Nikula , Dmitry Baryshkov , 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/5] drm/edid: Add a function to match EDID with identity Date: Tue, 5 Mar 2024 16:34:02 -0800 Message-ID: <20240306004347.974304-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240306004347.974304-1-hsinyi@chromium.org> References: <20240306004347.974304-1-hsinyi@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Create a type drm_edid_ident as the identity of an EDID. Currently it contains panel id and monitor name. Create a function that can match a given EDID and an identity: 1. Reject if the panel id doesn't match. 2. If name is not null in identity, try to match it in the detailed timing blocks. Note that some panel vendors put the monitor name after EDID_DETAIL_MONITOR_STRING. Signed-off-by: Hsin-Yi Wang --- v3->v4: 1. add a type drm_edid_ident 2. match name -> match identity. Modify function to use edid iterators. --- drivers/gpu/drm/drm_edid.c | 76 ++++++++++++++++++++++++++++++++++++++ include/drm/drm_edid.h | 8 ++++ 2 files changed, 84 insertions(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index f9e09f327f81..5e7e69e0e345 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -102,6 +102,11 @@ struct detailed_mode_closure { int modes; }; =20 +struct drm_edid_ident_closure { + const struct drm_edid_ident *ident; + bool matched; +}; + #define LEVEL_DMT 0 #define LEVEL_GTF 1 #define LEVEL_GTF2 2 @@ -5455,6 +5460,77 @@ drm_parse_hdmi_vsdb_audio(struct drm_connector *conn= ector, const u8 *db) connector->audio_latency[0], connector->audio_latency[1]); } =20 +static void +match_identity(const struct detailed_timing *timing, void *data) +{ + struct drm_edid_ident_closure *closure =3D data; + unsigned int i, j; + const char *str =3D closure->ident->name; + unsigned int buflen =3D strlen(str); + unsigned int size =3D ARRAY_SIZE(timing->data.other_data.data.str.str); + + if (buflen > size || + !(is_display_descriptor(timing, EDID_DETAIL_MONITOR_NAME) || + is_display_descriptor(timing, EDID_DETAIL_MONITOR_STRING))) + return; + + for (i =3D 0; i < buflen; i++) { + char c =3D timing->data.other_data.data.str.str[i]; + + if (c !=3D str[i] || c =3D=3D '\n') + break; + } + + if (i =3D=3D buflen) { + /* Allow trailing white spaces. */ + for (j =3D i; j < size; j++) { + char c =3D timing->data.other_data.data.str.str[j]; + + if (c =3D=3D '\n') { + closure->matched =3D true; + return; + } else if (c !=3D ' ') { + break; + } + } + if (j =3D=3D size) { + closure->matched =3D true; + return; + } + } +} + +/** + * drm_edid_match_identity - match drm_edid with given identity + * @drm_edid: EDID + * @ident: the EDID identity to match with + * + * Check if the EDID matches with the given identity. + * + * Return: True if the given identity matched with EDID, false otherwise. + */ +bool drm_edid_match_identity(const struct drm_edid *drm_edid, + const struct drm_edid_ident *ident) +{ + if (!drm_edid || edid_extract_panel_id(drm_edid->edid) !=3D ident->panel_= id) + return false; + + /* Match with name only if it's not NULL. */ + if (ident->name) { + struct drm_edid_ident_closure closure =3D { + .ident =3D ident, + .matched =3D false, + }; + + drm_for_each_detailed_block(drm_edid, match_identity, &closure); + + return closure.matched; + } + + return true; +} +EXPORT_SYMBOL(drm_edid_match_identity); + static void monitor_name(const struct detailed_timing *timing, void *data) { diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 9686a7cee6a6..01825a8954b6 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -312,6 +312,12 @@ struct edid { u8 checksum; } __packed; =20 +/* EDID matching */ +struct drm_edid_ident { + u32 panel_id; + const char *name; +}; + #define EDID_PRODUCT_ID(e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8)) =20 /* Short Audio Descriptor */ @@ -412,6 +418,8 @@ struct edid *drm_get_edid(struct drm_connector *connect= or, struct i2c_adapter *adapter); const struct drm_edid *drm_edid_read_base_block(struct i2c_adapter *adapte= r); u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid); +bool drm_edid_match_identity(const struct drm_edid *drm_edid, + const struct drm_edid_ident *ident); struct edid *drm_get_edid_switcheroo(struct drm_connector *connector, struct i2c_adapter *adapter); struct edid *drm_edid_duplicate(const struct edid *edid); --=20 2.44.0.278.ge034bb2e1d-goog From nobody Fri Dec 19 21:47:53 2025 Received: from mail-oi1-f169.google.com (mail-oi1-f169.google.com [209.85.167.169]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3994C6FD0 for ; Wed, 6 Mar 2024 00:43:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.169 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685835; cv=none; b=mtlDG3JDevBZC9SgPI+RYdTXRTmXa717KezPhQS2VmDtRBG9WkDXHhVweULlvqKKlq4vi3JxGBUBTEhseQBHaP9/RHgPw9UjpYSA+MmDAwn7AppQPYdYf7oPOOR8RbG5m3u10NWesCTP5nhv+vnVzPfxz7OwfNuTrE4oz74ZpT4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685835; c=relaxed/simple; bh=dIL9j9slboWzHrUIW8e3XcVKVmlUcIC6yHxtLGAdPFU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=JgEaKIZB7UgNZJEqk8GUam6ZqD+0l15I9VKn7GsDOBzxSBwEiYwzlNqPLMxx6f6Rdq3aankM3JuEDKoEROnnRT2D4KFYkqp1BcJ4rOUFbTvk6IbS//utZHnrKH2oSUr0Ig4sIyl2KD9Lol6UXkFtvHGAXFiTZGiPc5bCHS1OjJY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=S43xP0dm; arc=none smtp.client-ip=209.85.167.169 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="S43xP0dm" Received: by mail-oi1-f169.google.com with SMTP id 5614622812f47-3c1e992f060so1829158b6e.0 for ; Tue, 05 Mar 2024 16:43:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709685833; x=1710290633; 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=EmN32yDBtw8o7MT20mOBDUzK3nXP1eK8tU0sZE85v7Q=; b=S43xP0dmGWUvhMJ4tj/gXST/Ga0wu3MLXatmFLz3yXkYq6P7ASkfkxrosyrRS8TLNe FuPB/1Rfxdtj6lYKZZs1AQeFF2mmU/smlQ81/0MCA6e3Khlo6mLWHgoDEJA6GU1c9aYJ oh3rBFDj5zll47bYWPHn1RMq8jsfhTwjQ1S7g= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709685833; x=1710290633; 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=EmN32yDBtw8o7MT20mOBDUzK3nXP1eK8tU0sZE85v7Q=; b=kwAFZWrJWS3nHZyKpn6ZmiBvWXagz5BVRJjcP7Q6G63Yw4kioiainLHfEArNcqvkjy JxXLgnPFvxQo0xtQz+dBOuCARG2HGRchdp9HYfoRse0UIgE4Rpw+adZcK6bdOOpBEqnD MeSwZ/d7+9yp+voeNtf8Hz2tqkoVQE8+kYCtqBpAyOvLijdQ/ytvsqPYxAiTbu4CYf70 70eX288OG/6OU4woEQv+kxOX7DaRViQdTVuF4JTowHYEHiCVl4j1WebHfLSpn850MNgR XLDJVZwq4/Y6oiOgg38xLLi6jwWyireqoDT3FaD4H6SCicE6UiASao93mb6DGYSHNrXz ew8w== X-Forwarded-Encrypted: i=1; AJvYcCV+IhaJXlGz/zvMPy8qXShXvapo1lrtZz2RXzpSqYtGkMvQ3eN+NA7gIRm3OtVTjlU03Hp8DaWw3EVJ5qx3/sf0Rq/L+WzC/Ia4XEFl X-Gm-Message-State: AOJu0Yym/GpiUj0Pnn5i0w0pYlvfiEh6qaI4gL7qURYYzCvv1wwVhv0Z X2giCDkpv08lksFELU8prv6ztl2eNpqyecy1+3Ku9HvTIAujumKwsIAK6LWBhA== X-Google-Smtp-Source: AGHT+IF9JDWMnbkfo7qAITIq4vU3d+C8vqidkBtNkEVN4h5JsUh1v6Vd9HjSE/5hv0doQQPhuxukSg== X-Received: by 2002:a05:6808:610:b0:3c2:1ab4:3323 with SMTP id y16-20020a056808061000b003c21ab43323mr472567oih.51.1709685833369; Tue, 05 Mar 2024 16:43:53 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:29bc:b3d:1ba8:cf52]) by smtp.gmail.com with ESMTPSA id x37-20020a631725000000b005dc48e56191sm8512885pgl.11.2024.03.05.16.43.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 16:43:53 -0800 (PST) From: Hsin-Yi Wang To: Jani Nikula , Dmitry Baryshkov , 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 3/5] drm/edid: Match edid quirks with identity Date: Tue, 5 Mar 2024 16:34:03 -0800 Message-ID: <20240306004347.974304-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240306004347.974304-1-hsinyi@chromium.org> References: <20240306004347.974304-1-hsinyi@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Currently edid quirks are matched by panel id only. Modify it to match with identity so it's easier to be extended for more complex matching if required. Suggested-by: Jani Nikula Signed-off-by: Hsin-Yi Wang Reviewed-by: Jani Nikula --- v4: new Per discussion https://lore.kernel.org/lkml/87a5nd4tsg.fsf@intel.com/ --- drivers/gpu/drm/drm_edid.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 5e7e69e0e345..93a49b262dbe 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -114,13 +114,15 @@ struct drm_edid_ident_closure { =20 #define EDID_QUIRK(vend_chr_0, vend_chr_1, vend_chr_2, product_id, _quirks= ) \ { \ - .panel_id =3D drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_2= , \ - product_id), \ + .ident =3D { \ + .panel_id =3D drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, \ + vend_chr_2, product_id), \ + }, \ .quirks =3D _quirks \ } =20 static const struct edid_quirk { - u32 panel_id; + const struct drm_edid_ident ident; u32 quirks; } edid_quirk_list[] =3D { /* Acer AL1706 */ @@ -2921,16 +2923,17 @@ EXPORT_SYMBOL(drm_edid_duplicate); * @drm_edid: EDID to process * * This tells subsequent routines what fixes they need to apply. + * + * Return: A u32 represents the quirks to apply. */ static u32 edid_get_quirks(const struct drm_edid *drm_edid) { - u32 panel_id =3D edid_extract_panel_id(drm_edid->edid); const struct edid_quirk *quirk; int i; =20 for (i =3D 0; i < ARRAY_SIZE(edid_quirk_list); i++) { quirk =3D &edid_quirk_list[i]; - if (quirk->panel_id =3D=3D panel_id) + if (drm_edid_match_identity(drm_edid, &quirk->ident)) return quirk->quirks; } =20 --=20 2.44.0.278.ge034bb2e1d-goog From nobody Fri Dec 19 21:47:53 2025 Received: from mail-oi1-f170.google.com (mail-oi1-f170.google.com [209.85.167.170]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F0F9A79F2 for ; Wed, 6 Mar 2024 00:43:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685836; cv=none; b=S80FBHyuD2ngQneloJ1qIBOJdmLGvyfGvYdVTQbcZgn0hC6xNs9ARpbmuTcHFjPbNGBx8eJCwR90jMnflAujCdQ+O+FX6KmcE7zIV5uv2bjCTlLmmV9bVlRGTA5bFzoiv+vw/jH1Mw5gCObk4bkxj0KuHfgEkewp1yxVCsM7bCg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685836; c=relaxed/simple; bh=Ok/aCchxSjxpYR3ue2nZb0tuuaMyxZyT7DkB2/pntc4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AHfHMkOZ6jU/XQB0D605HQzxhpN5xad+E9tKrNsA2G02P44zEleQrURgV199DMFbjiXY6AutzUpPAfYbiQ7Ln0XotGJ6KXNGKa/UTaveCbNIW83rKDz5sUWoowgR6uZU8Da7JdQNtHR1nyt/+sVNpG1fEP2wyefkcgMj0y5hC5k= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=jijq+vUt; arc=none smtp.client-ip=209.85.167.170 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="jijq+vUt" Received: by mail-oi1-f170.google.com with SMTP id 5614622812f47-3c1ea425a0fso1651932b6e.3 for ; Tue, 05 Mar 2024 16:43:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709685834; x=1710290634; 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=j07CQ2B9VSDqAzaDJZq3q/Yl1tEHZa3IBFEiQqTUDBc=; b=jijq+vUtOoAHKVYVnCpLTgdwx6ZQ4XP2xzgZc9UHd3svWFMatmTzIMCETTQ4ZWOxgS I2eP+gmm+eEr7qCDIjaaXPNAm4VRu9sU9680GOzphabSVKhElwjQK844mBkxYN6xIQ14 0HcldcaQ/hbWNawqUIJms9CvtTBsE3xkT6W8o= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709685834; x=1710290634; 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=j07CQ2B9VSDqAzaDJZq3q/Yl1tEHZa3IBFEiQqTUDBc=; b=E83FwZ1Z+yjeIQOjGQAuJAItHfh/JiZEONRSisyvC7tUNygSQskK4isuK7PGR1erYk A3A4SYn3cUkKz0qJgxTw7LnjNOUeOo0vM2hamZZsLzHEjN7nPvoPWunUqBzaxzcTxDDp N1GR/58/OVMK0I3d1A/RBW+UCbFr3pt/fv6SGXFQQHPQZ5Q2gb4/RvjTVK0Em8TGAyqw XUIhpekrkjtdhSXkZL5sWRqXk5Bm8yWk6ytQcJ5gB4MiwvUHqe/WJCRhuJtRtfFdXUs/ RXdHRsf7asGGjHYaaeOHZw6DSfqQVRMQxgNcLOUvsVG+bnOnoR1ouj3EQaztOUWoc0AT p3fw== X-Forwarded-Encrypted: i=1; AJvYcCXrSZj2fRyh9Bw7PO1G3USvKQgDwBMEobCZgSbpj/2IRCRkSr5HltNqZgXkfspr+rfNDEdn3xsBbRNbJJ+Lw1BxNnEAsUT0IBDM9oo1 X-Gm-Message-State: AOJu0Yy53tVQh+ipX0apOp2ytAFZf4jSITkBtEcqqBnbovrPa0UJwDkE cJTdoWHWgdoA2EEdstCLmIFglYJNpGLltjNXgBF0cK1CuqEsqhPpA3ukCN1pRMaJt24e2J7Um0c = X-Google-Smtp-Source: AGHT+IGVnGKEsExHxbPRiJmGh3KBiVOW4N6JErxuzUZyiTZ6ITHKHl+QpRGST85Fo1jkHYkBxJWVAg== X-Received: by 2002:aca:1208:0:b0:3c1:ea81:64e9 with SMTP id 8-20020aca1208000000b003c1ea8164e9mr3292594ois.44.1709685834206; Tue, 05 Mar 2024 16:43:54 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:29bc:b3d:1ba8:cf52]) by smtp.gmail.com with ESMTPSA id x37-20020a631725000000b005dc48e56191sm8512885pgl.11.2024.03.05.16.43.53 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 16:43:54 -0800 (PST) From: Hsin-Yi Wang To: Jani Nikula , Dmitry Baryshkov , 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 4/5] drm/panel-edp: Match edp_panels with panel identity Date: Tue, 5 Mar 2024 16:34:04 -0800 Message-ID: <20240306004347.974304-5-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240306004347.974304-1-hsinyi@chromium.org> References: <20240306004347.974304-1-hsinyi@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" It's found that some panels have variants that they share the same panel id although their EDID and names are different. When matching generic edp panels, we should first match with both panel identity, which contains both panel id and panel name. If not found, match with panel id only. Signed-off-by: Hsin-Yi Wang --- v3->v4: combine name and id to identity. --- drivers/gpu/drm/panel/panel-edp.c | 45 ++++++++++++++++--------------- 1 file changed, 24 insertions(+), 21 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/pane= l-edp.c index d094cfc43da8..fb70e97a2e71 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -210,15 +210,12 @@ struct panel_desc { * struct edp_panel_entry - Maps panel ID to delay / panel name. */ struct edp_panel_entry { - /** @panel_id: 32-bit ID for panel, encoded with drm_edid_encode_panel_id= (). */ - u32 panel_id; + /** @ident: edid identity used for panel matching. */ + const struct drm_edid_ident ident; =20 /** @delay: The power sequencing delays needed for this panel. */ const struct panel_delay *delay; =20 - /** @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; }; @@ -691,7 +688,7 @@ static int detected_panel_show(struct seq_file *s, void= *data) else if (!p->detected_panel) seq_puts(s, "HARDCODED\n"); else - seq_printf(s, "%s\n", p->detected_panel->name); + seq_printf(s, "%s\n", p->detected_panel->ident.name); =20 return 0; } @@ -761,7 +758,7 @@ static void panel_edp_parse_panel_timing_node(struct de= vice *dev, dev_err(dev, "Reject override mode: No display_timing found\n"); } =20 -static const struct edp_panel_entry *find_edp_panel(u32 panel_id); +static const struct edp_panel_entry *find_edp_panel(u32 panel_id, const st= ruct drm_edid *edid); =20 static int generic_edp_panel_probe(struct device *dev, struct panel_edp *p= anel) { @@ -799,7 +796,6 @@ static int generic_edp_panel_probe(struct device *dev, = struct panel_edp *panel) base_block =3D drm_edid_read_base_block(panel->ddc); if (base_block) { panel_id =3D drm_edid_get_panel_id(base_block); - drm_edid_free(base_block); } else { dev_err(dev, "Couldn't identify panel via EDID\n"); ret =3D -EIO; @@ -807,7 +803,9 @@ static int generic_edp_panel_probe(struct device *dev, = struct panel_edp *panel) } drm_edid_decode_panel_id(panel_id, vend, &product_id); =20 - panel->detected_panel =3D find_edp_panel(panel_id); + panel->detected_panel =3D find_edp_panel(panel_id, base_block); + + drm_edid_free(base_block); =20 /* * We're using non-optimized timings and want it really obvious that @@ -840,7 +838,7 @@ static int generic_edp_panel_probe(struct device *dev, = struct panel_edp *panel) panel->detected_panel =3D ERR_PTR(-EINVAL); } else { dev_info(dev, "Detected %s %s (%#06x)\n", - vend, panel->detected_panel->name, product_id); + vend, panel->detected_panel->ident.name, product_id); =20 /* Update the delay; everything else comes from EDID */ desc->delay =3D *panel->detected_panel->delay; @@ -1930,17 +1928,21 @@ static const struct panel_delay delay_200_500_e50_p= o2e200 =3D { =20 #define EDP_PANEL_ENTRY(vend_chr_0, vend_chr_1, vend_chr_2, product_id, _d= elay, _name) \ { \ - .name =3D _name, \ - .panel_id =3D drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_2= , \ - product_id), \ + .ident =3D { \ + .name =3D _name, \ + .panel_id =3D drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_= 2, \ + product_id), \ + }, \ .delay =3D _delay \ } =20 #define EDP_PANEL_ENTRY2(vend_chr_0, vend_chr_1, vend_chr_2, product_id, _= delay, _name, _mode) \ { \ - .name =3D _name, \ - .panel_id =3D drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_2= , \ - product_id), \ + .ident =3D { \ + .name =3D _name, \ + .panel_id =3D drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_= 2, \ + product_id), \ + }, \ .delay =3D _delay, \ .override_edid_mode =3D _mode \ } @@ -2087,15 +2089,16 @@ static const struct edp_panel_entry edp_panels[] = =3D { { /* sentinal */ } }; =20 -static const struct edp_panel_entry *find_edp_panel(u32 panel_id) +static const struct edp_panel_entry *find_edp_panel(u32 panel_id, const st= ruct drm_edid *edid) { const struct edp_panel_entry *panel; =20 - if (!panel_id) - return NULL; + for (panel =3D edp_panels; panel->ident.panel_id; panel++) + if (drm_edid_match_identity(edid, &panel->ident)) + return panel; =20 - for (panel =3D edp_panels; panel->panel_id; panel++) - if (panel->panel_id =3D=3D panel_id) + for (panel =3D edp_panels; panel->ident.panel_id; panel++) + if (panel->ident.panel_id =3D=3D panel_id) return panel; =20 return NULL; --=20 2.44.0.278.ge034bb2e1d-goog From nobody Fri Dec 19 21:47:53 2025 Received: from mail-oi1-f171.google.com (mail-oi1-f171.google.com [209.85.167.171]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0F5B1DDA8 for ; Wed, 6 Mar 2024 00:43:55 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.167.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685837; cv=none; b=UjvOOL7KzUufAGWH0c3fymyrt23phbgOElfmq5oabyYsyfMZdSBZB9pcA8Os5Uhcjn62tRLmYOtRK2k+xXEJ98JE4+VnhZp9APiREEfkUejap4fqzbp44vg12bptiVnTWVjrUbOZTUdnzLlLXZCUJXPJ2zcUwiw8cOZz/UhU6wk= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709685837; c=relaxed/simple; bh=ZB+JxsmgjsLXjT4A8pwUfLxc5wjMafQmYvaibiZNEjI=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=SS5zVa5uGI7WKkc82EPJNQy1s9rB4uted8gg+3bFYJ2ibbRhpE29c/kltvY4e5AwW1ckMFTFyAkpzcbHFnTRi4kJCgp/+J+Di4QD8PkfKeGmVWgTOTM2YUK8OqZnlyOriERxqElX1GpI6/0JvvNJCjiJTSlXyBSbk4lArafZAaQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org; spf=pass smtp.mailfrom=chromium.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b=hbHntp/1; arc=none smtp.client-ip=209.85.167.171 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=chromium.org Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="hbHntp/1" Received: by mail-oi1-f171.google.com with SMTP id 5614622812f47-3c1ea5e54d3so189247b6e.0 for ; Tue, 05 Mar 2024 16:43:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709685835; x=1710290635; 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=hYTrgZgcMnGwzTHQ0raTPV6Zr3av/0t0vLxqDGbq+dE=; b=hbHntp/1YrXqW9cbxg90cWvzXqLiYgkFUO4bncJG0w+ndfLEmBcEJXaHUnNSbNR0b/ p6quUhsteDsjpZ4k1eWzVZZXrcu5gFmQMIb6YHT7KQJv/0FNZ9ELYE5ehMpjoRDQ9utC AM0FcFdkpBH+5hWm9qNz9B2MKi2/454RGtXws= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709685835; x=1710290635; 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=hYTrgZgcMnGwzTHQ0raTPV6Zr3av/0t0vLxqDGbq+dE=; b=bw8itGOMuyLm6gtnsSZ6DBWaa6fhhnF2RVDxn+xyFg4hhmmIajneHipVSF64Z8/UvL FnTuFl3nfNezxggPqYjOgUvBhv5HjStTRnfcxLx3IYmnhAcsly1cBwfn12Wuf14mV89X HpI99exSfVWLaYbGQDTPSdAXTGW/ymr3ptW9LEP+UZaTH6H/SUhpT+PxBfSr2SPIz0F6 e8PWbLvjelQ47mn0vr2znOg0jVuuPpte3MEnnMJPJoBnsVZMPo0LVxFUBoBBzA+v4Fvd DFA3WEdCV0+xgfXnV2c9YXYnBA3ojfjNnISZ8jB/CUWYuZI1U2eJKpGQvCgUa+GoTien 3VRA== X-Forwarded-Encrypted: i=1; AJvYcCUBDK+jm8G+ONYrAY/NOwS7f208RArMlngmZylPc3WW8blMpZxrBFpnwzVLaJKEco3kjfiNUrL8/lNo6tW9tM3gStRmoIEHKs08zW/U X-Gm-Message-State: AOJu0YxS78eh0l9nTrJKT6Qg8NivAG3vTWsW05YgS1YFG56ozYyF2OLc NacIOb+u2Mxiyz3NEj66HVNqHSE84mhUWeKLmHAoaK8Z/QGndzFYQ4vY+Y8Cqg== X-Google-Smtp-Source: AGHT+IEnBwCzfwvZftrY1cUSm8yx44TS6umhWaiFT1TsIPhxo+eKQUM29yFatyjGk7F35NHZ6+gzsQ== X-Received: by 2002:a05:6808:9b0:b0:3c1:db6b:aa7c with SMTP id e16-20020a05680809b000b003c1db6baa7cmr3045373oig.1.1709685835241; Tue, 05 Mar 2024 16:43:55 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:29bc:b3d:1ba8:cf52]) by smtp.gmail.com with ESMTPSA id x37-20020a631725000000b005dc48e56191sm8512885pgl.11.2024.03.05.16.43.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 05 Mar 2024 16:43:54 -0800 (PST) From: Hsin-Yi Wang To: Jani Nikula , Dmitry Baryshkov , 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 5/5] drm/panel-edp: Fix AUO 0x405c panel naming and add a variant Date: Tue, 5 Mar 2024 16:34:05 -0800 Message-ID: <20240306004347.974304-6-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240306004347.974304-1-hsinyi@chromium.org> References: <20240306004347.974304-1-hsinyi@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" There are 2 different AUO panels using the same panel id. One of the variants requires using overridden modes to resolve glitching issue as described in commit 70e0d5550f5c ("drm/panel-edp: Add auo_b116xa3_mode"). Other variants should use the modes parsed from EDID. Signed-off-by: Hsin-Yi Wang --- v4->v5: no change --- drivers/gpu/drm/panel/panel-edp.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/pane= l-edp.c index fb70e97a2e71..9db04457fb4d 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -1007,6 +1007,19 @@ static const struct panel_desc auo_b101ean01 =3D { }, }; =20 +static const struct drm_display_mode auo_b116xa3_mode =3D { + .clock =3D 70589, + .hdisplay =3D 1366, + .hsync_start =3D 1366 + 40, + .hsync_end =3D 1366 + 40 + 40, + .htotal =3D 1366 + 40 + 40 + 32, + .vdisplay =3D 768, + .vsync_start =3D 768 + 10, + .vsync_end =3D 768 + 10 + 12, + .vtotal =3D 768 + 10 + 12 + 6, + .flags =3D DRM_MODE_FLAG_NVSYNC | DRM_MODE_FLAG_NHSYNC, +}; + static const struct drm_display_mode auo_b116xak01_mode =3D { .clock =3D 69300, .hdisplay =3D 1366, @@ -1966,7 +1979,9 @@ static const struct edp_panel_entry edp_panels[] =3D { 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_ENTRY('A', 'U', 'O', 0x405c, &auo_b116xak01.delay, "B116XAN04.0= "), + EDP_PANEL_ENTRY2('A', 'U', 'O', 0x405c, &auo_b116xak01.delay, "B116XAK01.= 0 ", + &auo_b116xa3_mode), EDP_PANEL_ENTRY('A', 'U', 'O', 0x435c, &delay_200_500_e50, "Unknown"), 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"), --=20 2.44.0.278.ge034bb2e1d-goog