From patchwork Fri Feb 23 22:29:17 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 205719 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp880369dyb; Fri, 23 Feb 2024 14:41:05 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWjqyhTGtN4kKU/BlcuLaXEFH9oixlR066DRH9PNnsbAqafjJ37Nc9NNN07/KDrS7MTXqcHQCfxuLukDbUDMNEHvI2FJA== X-Google-Smtp-Source: AGHT+IHQnnJMgt+pqQ6gbZFFWweTabIuXo03ZEPYHZAv0OjRieEOvwM2vHh7TxJpys5T2hrl6vVo X-Received: by 2002:a05:6a20:c78f:b0:1a0:8c9c:acfa with SMTP id hk15-20020a056a20c78f00b001a08c9cacfamr1346505pzb.34.1708728065667; Fri, 23 Feb 2024 14:41:05 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708728065; cv=pass; d=google.com; s=arc-20160816; b=VQbKUNNDnFOZyC9aoj3Y12/kp9h79n7guTWQKNkOsHARHUzcnQm0nJNCB/BmRpbets qqQaMTEHP4U0BTWdG0kOIYTtuX61uXrqo+bLmk5L8hw59YMnw4VAPsz4UZ35nKi07q8Y TtzwNZ9T4bqX67+8Yv8vVaNjjKY5jYtNb0b5ZWXjkppK8eLI6a2p4EgSEqF8kYFSq2Fu 07zgN4CAMslct/lwB0OcD7lmJTwp7Y7fOh/6PUBP2swzmM80Ln/9RdvzXP3FTja+C0fh 7aWOCroPOuOmvMkqb4xOakHLnZI8sXERd9uwOr8erhaTuTWZ5+6bkTzfy4Q8slZaJELV r4aA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=j2NLOgJvFk9/xpCgoWWX0mwY7XC1SqoEPJetQl38NRg=; fh=aQYrFfOEQUVXz3UEt8TCHW0rQeO8SzGrahOjK1Zy04M=; b=jW5HABuwj7KQW3KFS4KwXZ3XCKJ7bPWy55kgZP7cEFTfzNsx1281XqwX/rCTXQs2ML xBnqty9muZDZ4V3GQciNHM/FIokzJWjgMCNTJv4sr4epewFAI8xd8zN4crVf4plvfAyH S5XlkOsWv74gWWkVlGPZlr10sygtt1YIJWCCRUryBNsWugiZi5GjV+3MOmB9Le1WbzHN KynmXNfFKfw8XImbL8wJxMsU58qeDYEeUwkPMN1u2gGnUfDcEKYHeRz9C0bBKrO/UvGs 7flgTmCIFLyVQqj/YAuShnK0SQvBt6F/A0KFQjSWc4RVK9k7lUmXnQbqDmWO8TTwB2zE psJA==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cpu4ndIt; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-79275-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79275-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [139.178.88.99]) by mx.google.com with ESMTPS id x64-20020a636343000000b005d412d0f51esi12780669pgb.661.2024.02.23.14.41.05 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 14:41:05 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-79275-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) client-ip=139.178.88.99; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b=cpu4ndIt; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-79275-ouuuleilei=gmail.com@vger.kernel.org designates 139.178.88.99 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79275-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id 72275288504 for ; Fri, 23 Feb 2024 22:40:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8A72514EFC9; Fri, 23 Feb 2024 22:40:22 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="cpu4ndIt" Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.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 65B9F143C63 for ; Fri, 23 Feb 2024 22:40:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.171 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708728007; cv=none; b=M6hWLNFmjp9uZGz8D+jF9gDpCFxy2YxOUG0H43rzKNs/MskD4sBmvlUUv7OrQAWVFgUx+ewyS5UcSuzo2zxPYBLUxAnVknsXz4wMr95vTxFtlwfkX0Eee1+jg0M0nj0/hS7AAxzWuI+LuzzAPbdbziu4r3bHEL39wSOreXs9q0M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708728007; c=relaxed/simple; bh=ZGM0H9OX6IuYQLFMOB8tArMAbsmHZckmY8VWfmMOH+0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=G3ZpgZSiHmoa1WwUTb+Su2vw1+0glKsCblDJn91cPpMMrUU0DU9Bg9SPhyWdXarjXVwD2yxx4tXrJl56TU+S/bLz+MSbX2ENEybRzq4e5YdGj2RbnpoNqIcc7D+y0WqfFOphLgw8yAZkYPEuEEDENBS24ArUJyAztqABnsHb9Ac= 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=cpu4ndIt; arc=none smtp.client-ip=209.85.215.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 Received: by mail-pg1-f171.google.com with SMTP id 41be03b00d2f7-5cedfc32250so1277353a12.0 for ; Fri, 23 Feb 2024 14:40:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1708728003; x=1709332803; 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=j2NLOgJvFk9/xpCgoWWX0mwY7XC1SqoEPJetQl38NRg=; b=cpu4ndIt16D5/QrGZ6s67ePQzuC2xQc8W2t8TcoIXfeQpxWN+nVbhXIB4re+qdjKte thBi8YZdynxnmZ6eECAuP1F3WAjYlrFPCicTS9WFUyv7o3+IuEbqVqCYPquNp/bPwVO4 HqNRRLO9/iGBgOreXYOhJMYmqFKAF0S2vYAaw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708728003; x=1709332803; 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=j2NLOgJvFk9/xpCgoWWX0mwY7XC1SqoEPJetQl38NRg=; b=FEQahFM731n67qDc0tV99lvj6dP+KErCWjvPDEH97NXdrvQL6tjXIb23fu/0DB8aWZ kKQX+1U3Uhjf9rGUKiQvtgTMZyM5aVkxItVXVoORRfCLp6YJTHbIGB4lJBx0QbK+ZfDF /TiB+aG3+yU5DhSYA+rJ6ggZINCELrYPN4NNEwMkJcLh2na7uYEENwg4JKLWVQti6go+ l746vw3dD/r94IeaVb7ruOvUPgdxzgujltumwhdPmgHWJb9NQFVl+D518Bas357RJePK v2BKBJEFFtQQg1S+F94gZHr6gVR/1/mRsvsoRsdLftrnGlZ/BbFL6mx+LdQBIrZVWlGI UUxQ== X-Forwarded-Encrypted: i=1; AJvYcCUA+kj9ysENdUqPkuZrEBkwvBoNW6KR7C2yQDevIeeQR77QdW4Va5z75mid52YTCSTRTB0QVtagf/a3gsa84QSr/QhEl2Z+beIEuMd8 X-Gm-Message-State: AOJu0Yy6Ramdjp/laUDXD1pKPKisQPoBWhjjQGEeZiPFyPutLhieHTdf AldKyrdEbRSN9/urcsulv/4+cUbQEGCe3MlESP0zlrYXWZkOj6pZkyzvIi2rUA== X-Received: by 2002:a17:90b:380d:b0:299:2da5:a843 with SMTP id mq13-20020a17090b380d00b002992da5a843mr1194908pjb.14.1708728003603; Fri, 23 Feb 2024 14:40:03 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:8ff9:a089:c05c:9af]) by smtp.gmail.com with ESMTPSA id cz4-20020a17090ad44400b002966a13f2e9sm2032873pjb.37.2024.02.23.14.40.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 14:40:03 -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 1/2] drm_edid: Add a function to get EDID base block Date: Fri, 23 Feb 2024 14:29:17 -0800 Message-ID: <20240223223958.3887423-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog In-Reply-To: <20240223223958.3887423-1-hsinyi@chromium.org> References: <20240223223958.3887423-1-hsinyi@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791731240050627633 X-GMAIL-MSGID: 1791731240050627633 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 the hash of entire EDID base block to distinguish these panel variants. Add drm_edid_get_base_block to returns the EDID base block, so caller can further use it to get panel id and/or the hash. Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson --- drivers/gpu/drm/drm_edid.c | 55 +++++++++++++++++-------------- drivers/gpu/drm/panel/panel-edp.c | 8 +++-- include/drm/drm_edid.h | 3 +- 3 files changed, 38 insertions(+), 28 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 923c4423151c..55598ca4a5d1 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2770,58 +2770,63 @@ static u32 edid_extract_panel_id(const struct edid *edid) } /** - * 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 base block + * @base_bock: EDID base block 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 value * (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 panel. + * 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(void *base_block) +{ + return edid_extract_panel_id(base_block); +} +EXPORT_SYMBOL(drm_edid_get_panel_id); + +/** + * drm_edid_get_base_block - Get a panel's EDID base block + * @adapter: I2C adapter to use for DDC + * + * This function returns the first block of the EDID of a panel. + * * This function is intended to be used during early probing on devices where * more than one panel might be present. Because of its intended use it must - * 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 base + * block is concerned (in other words, we don't process any overrides here). * * 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 panel. - * See the functions drm_edid_encode_panel_id() and - * drm_edid_decode_panel_id() for some details on the structure of this - * ID. + * Caller should free the base block after use. */ - -u32 drm_edid_get_panel_id(struct i2c_adapter *adapter) +void *drm_edid_get_base_block(struct i2c_adapter *adapter) { enum edid_block_status status; void *base_block; - u32 panel_id = 0; - - /* - * There are no manufacturer IDs of 0, so if there is a problem reading - * the EDID then we'll just return 0. - */ base_block = kzalloc(EDID_LENGTH, GFP_KERNEL); if (!base_block) - return 0; + return NULL; status = edid_block_read(base_block, 0, drm_do_probe_ddc_edid, adapter); edid_block_status_print(status, base_block, 0); - if (edid_block_status_valid(status, edid_block_tag(base_block))) - panel_id = 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); + return NULL; + } - kfree(base_block); - - return panel_id; + return base_block; } -EXPORT_SYMBOL(drm_edid_get_panel_id); +EXPORT_SYMBOL(drm_edid_get_base_block); /** * 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/panel-edp.c index bd71d239272a..f6ddbaa103b5 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -763,6 +763,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 *panel) { struct panel_desc *desc; + void *base_block; u32 panel_id; char vend[4]; u16 product_id; @@ -792,8 +793,11 @@ static int generic_edp_panel_probe(struct device *dev, struct panel_edp *panel) goto exit; } - panel_id = drm_edid_get_panel_id(panel->ddc); - if (!panel_id) { + base_block = drm_edid_get_base_block(panel->ddc); + if (base_block) { + panel_id = drm_edid_get_panel_id(base_block); + kfree(base_block); + } else { dev_err(dev, "Couldn't identify panel via EDID\n"); ret = -EIO; goto exit; diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h index 7923bc00dc7a..56b60f9204d3 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 *connector, 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); +void *drm_edid_get_base_block(struct i2c_adapter *adapter); +u32 drm_edid_get_panel_id(void *base_block); struct edid *drm_get_edid_switcheroo(struct drm_connector *connector, struct i2c_adapter *adapter); struct edid *drm_edid_duplicate(const struct edid *edid); From patchwork Fri Feb 23 22:29:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hsin-Yi Wang X-Patchwork-Id: 205718 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7300:a81b:b0:108:e6aa:91d0 with SMTP id bq27csp880229dyb; Fri, 23 Feb 2024 14:40:41 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCX2hvtcMK7x22tbS6+//Gc3HaWnxyacr0iYAdrn/FW9yVWBi1oOWsrIdfHpNd5aIwD4/Kpx7lzEtjP/fNMadILW4PTXvA== X-Google-Smtp-Source: AGHT+IEZXPGizK/kpbtR62G18ILTdS47G8UO9a38bTXQRS9H9sQfjZ+1OQop/ST48ipnfmiNTdTX X-Received: by 2002:a17:906:34cb:b0:a3f:7e1:5166 with SMTP id h11-20020a17090634cb00b00a3f07e15166mr516525ejb.10.1708728041545; Fri, 23 Feb 2024 14:40:41 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708728041; cv=pass; d=google.com; s=arc-20160816; b=WjGy4G+/ZZ6RmugSiM4eOpbwS8MIXu4XMIQVPV73SG/wgmSqHHtIfcmlKlKiHpMJQv pq4WgPEh6z5s3LwjKHNX3pkESzlTG4R5mdhAcSet8q1myCzFav+9MukUqB3eOvvUbYv4 ssaVDEgAYAeeN2aR0E5g/bXbSheHuX4ppi6mvnd/dTGQWsSoRxr4jMbSeHYXy8LjyoKV OPwTH0Jmvydby8A16Rh6gNFrz5QXX9foP8Bk+BmUlRWfNaY2GL5Ynzxm7QqpM2TjiFUU H1gZqVNjADjfinbvQAI7xu9mTOYMy0WTnMPXC+CQ0xKRNSK8VfZXQ0xeDaQSwkta48KG UxVg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=OtJto2Kd/SieW6LbOckqb66w6924YRC023lFGaAJu7I=; fh=59i6o5L4n6nQxkcOysYKmwVAbYK0IWypjCRS4WXG/D8=; b=nJnDuzHb6ZAl7bZNBY/9YvBYs1ztwl6E/NDNLIKQ5Tn7BK4yk5ynX5amnYo9MIWU7k 3uDR6KKgWcvm4LS6JUt8HkX0O/aoqTVbn0wpHvmPmWQ571yJfeigu6XOCRMrsgzrirM2 GGwqPDzxhamkCt6eoZSCvaZvEBognqX79CW2xdrh3H4y9Kv7n0qzkAPTE2nyq1I8GML7 JlH5SLtAO/6eTNJKNtwIUcPtzrmk+XpOsYgiXsdIgs6u8NdIuCWK/qnMV8cNAoTp1ZL/ AFwJdpfNEcnQI9Aqm1KEdKT18Mi/FK0JBQ+CZzQ5ZpeSNEMiHtN0/lOsCkS2PSt5d07L 3Tug==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="MriA/p38"; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-79274-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79274-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [147.75.80.249]) by mx.google.com with ESMTPS id u26-20020a170906c41a00b00a3f80081696si15361ejz.241.2024.02.23.14.40.41 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 14:40:41 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-79274-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249; Authentication-Results: mx.google.com; dkim=pass header.i=@chromium.org header.s=google header.b="MriA/p38"; arc=pass (i=1 spf=pass spfdomain=chromium.org dkim=pass dkdomain=chromium.org dmarc=pass fromdomain=chromium.org); spf=pass (google.com: domain of linux-kernel+bounces-79274-ouuuleilei=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) smtp.mailfrom="linux-kernel+bounces-79274-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=chromium.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id 05EF41F24BAD for ; Fri, 23 Feb 2024 22:40:41 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1B91B14A0BE; Fri, 23 Feb 2024 22:40:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=chromium.org header.i=@chromium.org header.b="MriA/p38" Received: from mail-pj1-f54.google.com (mail-pj1-f54.google.com [209.85.216.54]) (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 499B5145B1B for ; Fri, 23 Feb 2024 22:40:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.54 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708728006; cv=none; b=JmbGrA0/9cNKL24f2b1NYETVWboQRekYoPzNTWnAFrZBWQcSN/uuyFNQJ2RT5q7TGt4OOa2kkMZRozLe3SngWaA3n4/4E+FEH29vxnj9hJEyrAONi4Dvx6O3iKpXlXhFAyvLJowUNl+EBwo1WGzd0WEkojYe3PSFVDkdXltU1p8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708728006; c=relaxed/simple; bh=Pjl8ko0DWDowcGUxGWXv4KdIPeEjmRIMNi+B2vSNeiQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=K8miZBrT9GI1pVZv5oURBHRE8YfVTf0XfLkO1s8lv6EQ0P2e3fNB5SN/GNq+8aPfgNFcgubCGjbEeQc6tR/sl6qwwpRgEKEtkrlAymaNerKup7u46rFX7RcEFEeunO6AOrJRhIVq4FjjT4ZF/8U1dfrwN6onRE+xzkRcO12g8Sc= 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=MriA/p38; arc=none smtp.client-ip=209.85.216.54 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 Received: by mail-pj1-f54.google.com with SMTP id 98e67ed59e1d1-29a2d0f69a6so1016132a91.3 for ; Fri, 23 Feb 2024 14:40:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1708728004; x=1709332804; 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=OtJto2Kd/SieW6LbOckqb66w6924YRC023lFGaAJu7I=; b=MriA/p38et10AfvSKffP3yy21UKPkzln1pQrU+V9qBRGzuXuMiFIAyVhAMSOMmrO4T 6ZSM09OJi5OBR9MHGa+Gjsb3SpaGyTE7yIj8YqCH4kXw8jUQVNiUyO2lM0Te4A7V0/nU dcHizdcjjM9pGYEY3RQa4+/+jUEe058lapUHw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1708728004; x=1709332804; 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=OtJto2Kd/SieW6LbOckqb66w6924YRC023lFGaAJu7I=; b=iBwv005lqSTNrGWK31/sIjUej+g5U8OsvQuQe2f7e/L856IijQS2sA4ikl6teABdRB NKvw2ED5RBL6EkQmwpcD125uNCFWNY19VR5iNq2AsbQH1hWKXmyHY4KLLYPdKC4lcib+ aDpv6kFUiY2CCiI6x/T4pv93pab14cEGjpYpLH6EcHb4fEMoYaWcCqADcO3SKYKAS215 HIm/vfWImUkTw/vNVPm5AcLpqqZabFBoAWi2rwh3nJYKp/8g3/diTM2xu/YtD53rYdum k+n5w3Rw7VzcZyXkyn+NAngPARFzyfi+CSd+HV9ENRN54JTzJMXxsEaMuHF7z6cATGYu uAcg== X-Forwarded-Encrypted: i=1; AJvYcCUKlHUltXpWBUlvYT+4eD4HA+qliNbiEvfx9m7PAar7uf5OjIVaKKI7QLPpV3xQaZXcduo/P21cBZR34g6rxPJA9p/hXYynZMF1/tOQ X-Gm-Message-State: AOJu0YyBZsin1cw9hsJ/OYe1EuSHvM4P1FScAUKJK8Cfk/fm6Cnueh87 r/9KcLsAeuEGr8T7A8RNybsPYEHXkDqFW5l6G9k53HqiqvRuGldXfYu6unUhfA== X-Received: by 2002:a17:90b:4f4a:b0:299:96fe:1135 with SMTP id pj10-20020a17090b4f4a00b0029996fe1135mr997780pjb.44.1708728004586; Fri, 23 Feb 2024 14:40:04 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:8ff9:a089:c05c:9af]) by smtp.gmail.com with ESMTPSA id cz4-20020a17090ad44400b002966a13f2e9sm2032873pjb.37.2024.02.23.14.40.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Feb 2024 14:40:04 -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 2/2] drm/panel: panel-edp: Match with panel hash for overridden modes Date: Fri, 23 Feb 2024 14:29:18 -0800 Message-ID: <20240223223958.3887423-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog In-Reply-To: <20240223223958.3887423-1-hsinyi@chromium.org> References: <20240223223958.3887423-1-hsinyi@chromium.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791731214877968975 X-GMAIL-MSGID: 1791731214877968975 It's found that some panels have variants that they share the same panel id although their EDID and names are different. 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. For example, AUO 0x405c B116XAK01.0, it has at least 2 different variants that EDID and panel name are different, but using the same panel id. One of the variants require using overridden mode. Same case for AUO 0x615c B116XAN06.1. Add such entries and use the hash of the EDID to match the panel needs the overridden modes. Signed-off-by: Hsin-Yi Wang --- drivers/gpu/drm/panel/panel-edp.c | 52 +++++++++++++++++++++++++++---- 1 file changed, 46 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/panel-edp.c index f6ddbaa103b5..42c430036846 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -21,6 +21,7 @@ * DEALINGS IN THE SOFTWARE. */ +#include #include #include #include @@ -213,6 +214,9 @@ struct edp_panel_entry { /** @panel_id: 32-bit ID for panel, encoded with drm_edid_encode_panel_id(). */ u32 panel_id; + /** @panel_hash: the CRC32 hash of the EDID base block. */ + u32 panel_hash; + /** @delay: The power sequencing delays needed for this panel. */ const struct panel_delay *delay; @@ -758,13 +762,13 @@ static void panel_edp_parse_panel_timing_node(struct device *dev, dev_err(dev, "Reject override mode: No display_timing found\n"); } -static const struct edp_panel_entry *find_edp_panel(u32 panel_id); +static const struct edp_panel_entry *find_edp_panel(u32 panel_id, u32 panel_hash); static int generic_edp_panel_probe(struct device *dev, struct panel_edp *panel) { struct panel_desc *desc; void *base_block; - u32 panel_id; + u32 panel_id, panel_hash; char vend[4]; u16 product_id; u32 reliable_ms = 0; @@ -796,15 +800,17 @@ static int generic_edp_panel_probe(struct device *dev, struct panel_edp *panel) base_block = drm_edid_get_base_block(panel->ddc); if (base_block) { panel_id = drm_edid_get_panel_id(base_block); + panel_hash = crc32_le(~0, base_block, EDID_LENGTH) ^ 0xffffffff; kfree(base_block); } else { dev_err(dev, "Couldn't identify panel via EDID\n"); ret = -EIO; goto exit; } + drm_edid_decode_panel_id(panel_id, vend, &product_id); - panel->detected_panel = find_edp_panel(panel_id); + panel->detected_panel = find_edp_panel(panel_id, panel_hash); /* * We're using non-optimized timings and want it really obvious that @@ -1006,6 +1012,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, @@ -1926,11 +1945,13 @@ static const struct panel_delay delay_200_500_e50_po2e200 = { .delay = _delay \ } -#define EDP_PANEL_ENTRY2(vend_chr_0, vend_chr_1, vend_chr_2, product_id, _delay, _name, _mode) \ +#define EDP_PANEL_ENTRY2(vend_chr_0, vend_chr_1, vend_chr_2, product_id, \ + _hash, _delay, _name, _mode) \ { \ .name = _name, \ .panel_id = drm_edid_encode_panel_id(vend_chr_0, vend_chr_1, vend_chr_2, \ product_id), \ + .panel_hash = _hash, \ .delay = _delay, \ .override_edid_mode = _mode \ } @@ -2077,13 +2098,32 @@ static const struct edp_panel_entry edp_panels[] = { { /* sentinal */ } }; -static const struct edp_panel_entry *find_edp_panel(u32 panel_id) +/* + * Similar to edp_panels, this table lists panel variants that require using + * overridden modes but have the same panel id as one of the entries in edp_panels. + * + * Sort first by vendor, then by product ID. + */ +static const struct edp_panel_entry edp_panels_variants[] = { + EDP_PANEL_ENTRY2('A', 'U', 'O', 0x405c, 0xa9951478, &auo_b116xak01.delay, + "B116XAK01.0", &auo_b116xa3_mode), + EDP_PANEL_ENTRY2('A', 'U', 'O', 0x615c, 0x109b75b3, &delay_200_500_e50, + "B116XAN06.1", &auo_b116xa3_mode), + + { /* sentinal */ } +}; + +static const struct edp_panel_entry *find_edp_panel(u32 panel_id, u32 panel_hash) { const struct edp_panel_entry *panel; - if (!panel_id) + if (!panel_id || !panel_hash) return NULL; + for (panel = edp_panels_variants; panel->panel_id; panel++) + if (panel->panel_id == panel_id && panel->panel_hash == panel_hash) + return panel; + for (panel = edp_panels; panel->panel_id; panel++) if (panel->panel_id == panel_id) return panel;