From nobody Fri Dec 19 21:47:54 2025 Received: from mail-pl1-f175.google.com (mail-pl1-f175.google.com [209.85.214.175]) (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 2610F3399A for ; Thu, 7 Mar 2024 23:06:58 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.175 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709852820; cv=none; b=UVcI6IgxCMVJ+/DFjTyEc75F8Qg1QPLf1xeoYysmBDCBzVj8RgbUM8eMbIfF5e3Z/+5+eC8t40P/QcJlgGHNhpYFu3PD9IlOqXbSzwnNfUivoqAM5L3Jx9joIsTEOTQz8VLO+VqoEEuEjjyiyGJ1gEPPuryxTl1kk1ljamhEsXI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709852820; c=relaxed/simple; bh=MjSkz/TlOSJIo82vuIfgNbPQjG6/UIhXqTeY6iKQhq8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=W1J3QRoLiae6IxwzWB7pZsse3ebDtN9lkWNiEkJykCH44lqV+oLhTwgar1mMfzwdhObBSXsUL9syX2ZgZTBbCj9tt7Mfmd1Nww1y2XzrydEZR7iQkIRqjdoem+lhNI9iSfZobc0e289tBVtA6ysyM3cvB/GVSbLrXztBbPhAngk= 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=hL7ace2o; arc=none smtp.client-ip=209.85.214.175 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="hL7ace2o" Received: by mail-pl1-f175.google.com with SMTP id d9443c01a7336-1dd68d4cff1so474415ad.2 for ; Thu, 07 Mar 2024 15:06:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709852818; x=1710457618; 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=wkLCh/y3IjSBIuB7VpYySGCB+kkdSKNkvE8IPrhfDCM=; b=hL7ace2oZwa59j7VNM0QqZnWviWqb/rJtY70ppt8hJEbJfUz48S0rJPrkA1N+v4TyJ DEN9bRRz6xb1YbEEZSH6vw4pOlm6nrGP/xnvW2gBVM7R7efIqGaWSlC+2laG+hyI8DK5 Mejwti3FhCcCYfqoCOF3Tfz/o2tH2jHa8b0d0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709852818; x=1710457618; 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=wkLCh/y3IjSBIuB7VpYySGCB+kkdSKNkvE8IPrhfDCM=; b=VyNxBG0o7P4dxxRquXVsdGNuqPo6wj2jTegYGvj0z35Vhg+Qv5/mv9Sla96dN7hL7b 3ldpzYeRWeCgBoAiKW2MWV7dId1+Io1Oe4d2Hw1mLLzd+ZqRcSBbC5fYkanJAFrFqppc y+6k/JnJgjcmNOxbkfHvnyodvrzbOZS2Bd0T5Joz/drhzDjYz1NtLQBU8ged3DrEc5jZ C2vAdqWbMLsG9w1h+djUzxo7QgCfkiNgKhEa0q/NffOJDAzjh5KCZIfN6EMjtDm+ntA0 cXt71F+k2Jp3VbtPugLj6xVn6Qosn2Yb0ynFnMEglMxeo2yoxhgYQ1Wi9v9xMbBD5nmr C6mA== X-Forwarded-Encrypted: i=1; AJvYcCXDf+MzPUDibdoNgnyLW/+ec3BwsR/s0yImjOLA8FU3bvDsP40T6rRjmYOk3a+9pUQR1u9vyBtVLNO42pqKIkVFBgkZQXJqA23wiuRz X-Gm-Message-State: AOJu0YwmYXwt5CqPKT97Ger1IKSFceAmK/RzwZJ+ndXR/AV219kqqCCh wAm5fTQQlOk4hfm+kYuxOgEtPBubydD1/5Gecf80CYMqEWWUsRZXyqgkR1y9ng== X-Google-Smtp-Source: AGHT+IF2gvDVIYxcgS8kfWnjSoptKcy1MM6/6fHNuxZ8umM7rh3jijEYYGJernNayoi6EgPjGatHJw== X-Received: by 2002:a17:902:cf0f:b0:1dc:f157:51ba with SMTP id i15-20020a170902cf0f00b001dcf15751bamr11928254plg.35.1709852818332; Thu, 07 Mar 2024 15:06:58 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:bf8f:10d4:f877:bee3]) by smtp.gmail.com with ESMTPSA id h19-20020a170902f2d300b001db63cfe07dsm15196654plc.283.2024.03.07.15.06.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 15:06:58 -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 v6 1/5] drm_edid: Add a function to get EDID base block Date: Thu, 7 Mar 2024 14:57:41 -0800 Message-ID: <20240307230653.1807557-2-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240307230653.1807557-1-hsinyi@chromium.org> References: <20240307230653.1807557-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. Merge drm_edid_get_panel_id() and edid_extract_panel_id() into one function. Signed-off-by: Hsin-Yi Wang Reviewed-by: Douglas Anderson Reviewed-by: Jani Nikula --- v5->v6:=20 1. squash v5 2/6 into this patch. 2. check edid size. --- drivers/gpu/drm/drm_edid.c | 71 ++++++++++++++++++------------- drivers/gpu/drm/panel/panel-edp.c | 8 +++- include/drm/drm_edid.h | 3 +- 3 files changed, 50 insertions(+), 32 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 1ad94473e400..284255a0315e 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -2743,8 +2743,27 @@ const struct drm_edid *drm_edid_read(struct drm_conn= ector *connector) } EXPORT_SYMBOL(drm_edid_read); =20 -static u32 edid_extract_panel_id(const struct edid *edid) +/** + * drm_edid_get_panel_id - Get a panel's ID from EDID + * @drm_edid: EDID that contains panel ID. + * + * 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. Return 0 if the EDID size is less than a base block. + */ +u32 drm_edid_get_panel_id(const struct drm_edid *drm_edid) { + const struct edid *edid =3D drm_edid->edid; + + if (drm_edid->size < EDID_LENGTH) + return 0; + /* * We represent the ID as a 32-bit number so it can easily be compared * with "=3D=3D". @@ -2762,60 +2781,54 @@ static u32 edid_extract_panel_id(const struct edid = *edid) (u32)edid->mfg_id[1] << 16 | (u32)EDID_PRODUCT_ID(edid); } +EXPORT_SYMBOL(drm_edid_get_panel_id); =20 /** - * drm_edid_get_panel_id - Get a panel's ID through DDC + * drm_edid_read_base_block - Get a panel's EDID base block * @adapter: I2C adapter to use for DDC * - * This function reads 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. + * 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 @@ -2868,7 +2881,7 @@ EXPORT_SYMBOL(drm_edid_duplicate); */ static u32 edid_get_quirks(const struct drm_edid *drm_edid) { - u32 panel_id =3D edid_extract_panel_id(drm_edid->edid); + u32 panel_id =3D drm_edid_get_panel_id(drm_edid); const struct edid_quirk *quirk; int i; =20 diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/pane= l-edp.c index 3fb5fcd326a4..fe51680feb61 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 70ae6c290bdc..8b233865b085 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -565,7 +565,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:54 2025 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 13AC53D3BB for ; Thu, 7 Mar 2024 23:06:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709852821; cv=none; b=oMA33FPATM8yKk1+3oO0vAp9SZW3KULo7bNbb0xkE707w1PmzixuQk4i4Hs3m43lKRKZvP0tWAgtAud9nrBN/WBzMGspR63Dh1vQwQGCG4KyOBXBRXUUuD0+ATzCzX5Pw47t589nzoFlcxoA1Pf5tl2E+jZ1cxLaCuonuTM1x4M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709852821; c=relaxed/simple; bh=zouM2k1CYoagABxzGcy6uv8QYPhVehi1ieqNzFnTmZg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=XBkc2YtRZihMsZJ3RTKVHEWMgLNr+mZerCgibhkfXw7vR0TAGFeVFUgRpa3fN/zzda0AUOs6bxA3gJDH7ybJBUl6grw1GsEYc6ZiilWRdFcSZZZgEe22FWbtMXVgxmvD/PRY95osEe0nSKci0HDY+F5LslKYooW/LiYHkx1w5qo= 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=HvYP1IXL; arc=none smtp.client-ip=209.85.214.178 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="HvYP1IXL" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1dcab44747bso12082015ad.1 for ; Thu, 07 Mar 2024 15:06:59 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709852819; x=1710457619; 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=HYEZNIcMNd/BeaNkmjBMYO1g1hMPvuNRl+gv7+BprBg=; b=HvYP1IXLbTTd1zYcpdDCa1sBKW+dQiZwqMwP9oN6B09EBXcec5d5KjHa5LFfY30aw/ av6bGFXB3Khz2t7TF0vt59JLiMFh8z6urW03yjgTRxYtrjzQhoRUJFOOlXHMtkhysfLz sIhsISMpWmSc8GwZki8lU4kWwEriNdbCJK4m0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709852819; x=1710457619; 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=HYEZNIcMNd/BeaNkmjBMYO1g1hMPvuNRl+gv7+BprBg=; b=F0Qs5tvNIHKV/O2+jShRBvPj3HtiJ0f/g+o98RRWsYvOCafqyfnrhqR7E/JMANLma4 9zai1h6KeQLUX5FZqVLpxjbGE6b3uNvq7onZonrUDDpKhHrkKdHZlIBzTOt+/wvQqOs0 HAkMyjyoXP6mG6g/74ijgnyIQeEo3WegtMvsj5NdhU+FOczbqEmp+S9pWrcE82RW8rPb wUsbwtqi+wutMgZExx5OEeUL+bEvIv2EHxdk4fegreq/vs8uANDK7ieZno+QdMpbGU7n TNSvvx6u/mAYTAMprtH+dS9I7cEo7baHNffrYAG/cvpF/rzeFzNQzfN8K/iNFn0gv6Qa xYKg== X-Forwarded-Encrypted: i=1; AJvYcCXGJu0XTIPmNugYPxCcrpOd/n3EHwCvF6Ck41tR27kGidNQ+Zs4AuTr6RkWK/6l0kE/wmUJGZ/zkj18ff6LPQtxoOlQ0xkEwr6/c+99 X-Gm-Message-State: AOJu0Yx2UYQ0wfmejNGeD+F8kPz3CZlh8HN8KEEmgR4J4LGkrOZ4uU7M XmweI+KRZrorE8fs52UUd6y0NGg1ZuVDD1fUDDte5b2r6ExHfJ6kotIBmaNNqQ== X-Google-Smtp-Source: AGHT+IH4JN/Y0kdeG70rMVv9p/9iS1bg9i0S07bplO9mD21xLH7uN7ZRgi0aG8PNT/zsDNvLmvr2xQ== X-Received: by 2002:a17:902:c146:b0:1dc:b874:583f with SMTP id 6-20020a170902c14600b001dcb874583fmr8850154plj.38.1709852819245; Thu, 07 Mar 2024 15:06:59 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:bf8f:10d4:f877:bee3]) by smtp.gmail.com with ESMTPSA id h19-20020a170902f2d300b001db63cfe07dsm15196654plc.283.2024.03.07.15.06.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 15:06:58 -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 v6 2/5] drm/edid: Add a function to match EDID with identity Date: Thu, 7 Mar 2024 14:57:42 -0800 Message-ID: <20240307230653.1807557-3-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240307230653.1807557-1-hsinyi@chromium.org> References: <20240307230653.1807557-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 Reviewed-by: Douglas Anderson Reviewed-by: Jani Nikula --- v5->v6: finalize the trailing white space and/or NUL decision: Allow only white space before \n. --- drivers/gpu/drm/drm_edid.c | 65 ++++++++++++++++++++++++++++++++++++++ include/drm/drm_edid.h | 9 ++++++ 2 files changed, 74 insertions(+) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 284255a0315e..58fe35058181 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -100,6 +100,11 @@ struct detailed_mode_closure { int modes; }; =20 +struct drm_edid_match_closure { + const struct drm_edid_ident *ident; + bool matched; +}; + #define LEVEL_DMT 0 #define LEVEL_GTF 1 #define LEVEL_GTF2 2 @@ -5408,6 +5413,66 @@ 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_match_closure *closure =3D data; + unsigned int i; + const char *name =3D closure->ident->name; + unsigned int name_len =3D strlen(name); + const char *desc =3D timing->data.other_data.data.str.str; + unsigned int desc_len =3D ARRAY_SIZE(timing->data.other_data.data.str.str= ); + + if (name_len > desc_len || + !(is_display_descriptor(timing, EDID_DETAIL_MONITOR_NAME) || + is_display_descriptor(timing, EDID_DETAIL_MONITOR_STRING))) + return; + + if (strncmp(name, desc, name_len)) + return; + + for (i =3D name_len; i < desc_len; i++) { + if (desc[i] =3D=3D '\n') + break; + /* Allow white space before EDID string terminator. */ + if (!isspace(desc[i])) + return; + } + + closure->matched =3D true; +} + +/** + * drm_edid_match - 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(const struct drm_edid *drm_edid, + const struct drm_edid_ident *ident) +{ + if (!drm_edid || drm_edid_get_panel_id(drm_edid) !=3D ident->panel_id) + return false; + + /* Match with name only if it's not NULL. */ + if (ident->name) { + struct drm_edid_match_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); + 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 8b233865b085..5e3fc8c83a31 100644 --- a/include/drm/drm_edid.h +++ b/include/drm/drm_edid.h @@ -367,6 +367,13 @@ struct edid { u8 checksum; } __attribute__((packed)); =20 +/* EDID matching */ +struct drm_edid_ident { + /* ID encoded by drm_edid_encode_panel_id() */ + u32 panel_id; + const char *name; +}; + #define EDID_PRODUCT_ID(e) ((e)->prod_code[0] | ((e)->prod_code[1] << 8)) =20 /* Short Audio Descriptor */ @@ -567,6 +574,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(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:54 2025 Received: from mail-pl1-f178.google.com (mail-pl1-f178.google.com [209.85.214.178]) (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 B238B3E480 for ; Thu, 7 Mar 2024 23:07:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709852822; cv=none; b=cSfW6ZPCkODEpq3vEfi1Yh5+icfhpvMnHpaEHuM28Fe9d5f8Zx8W4wYQxKPgaxfYrZZYHdA0tWWSxy09aGpmf/OBPEG4wM86usATaCkQoe0+EmzF4bIqgiuFuHahPOQJrM2UdIPQJSfdEW2rTNaplZSBLLd4sLbIk77coRKETs0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709852822; c=relaxed/simple; bh=IOqtw8i65TliM1M9qhk2LNGe7LbBpuKoQAi1rapUIoY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oIhXX5erN41AZg+BqpnzgMdgMIDrvThZdd70E+68JuSRd1yvc39sF7FuIiimpACZZCM43hN3vMLViCuv6Ey6OOo0iHCediWtQoB6DLE2wymRMQr/zKt0GJRFHSwxmxg9AeKIuAJ9p+Un8VOmMt+8Dwm918hqXWrIRBSP27h2Spg= 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=HwlcahBI; arc=none smtp.client-ip=209.85.214.178 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="HwlcahBI" Received: by mail-pl1-f178.google.com with SMTP id d9443c01a7336-1dd2dca2007so1429225ad.2 for ; Thu, 07 Mar 2024 15:07:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709852820; x=1710457620; 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=DhMzn7mAql0qeAQCBndfDWvU8yMf9cLlH/SFDDXTa5Q=; b=HwlcahBIRcj8hNMTmEJQ0J4q9gcD2laz69uuArWYkgdRTisDdKnCQWoiCypbTczC+d bCW86WP5CXuyRyw0EPt9gdWMxlG0clyZ0wpm1PLHN3EFkOx1ZYk7VTw+zcgQpZ1YJ/q2 QSfF9Y1m8hMKBlL9gGbYYrCmDTJypS6r525eY= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709852820; x=1710457620; 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=DhMzn7mAql0qeAQCBndfDWvU8yMf9cLlH/SFDDXTa5Q=; b=oWCPPqBa72LVGsftZDmT1KhCsjMLqI5MwBka5GZHDhVXAAX8XubiS6t6Obf9Ser0lL XGU9MfqRb+KzAHuyPPmRVjZb3l3rqvIO64Nq0QoJ6t0r2Wcsbnx5JaE1wftDhCWAXX54 ety3zm9tXX0yjSXbNPfQ+KvDQlVAvfeIWrihdrmUi+KU1/r443DjYNeLj306DjHu/gyQ arteYqOc7Hr9o+6d1UHS7Oe9cCvOvQTfon1/bG61HWAKiR94HEIeHoytuyfQSsy7sCDV Vd2UzJAsWNbCiWdPBC8qvUEQvgf0nzFw6y2BzR+VWLfJbzWEzYWfP8vERiArNcIbDTUw KCWw== X-Forwarded-Encrypted: i=1; AJvYcCW+m/ycCrJzVEHdvrN7hfwUXTMNkjahZUwGM00nTgwI5GgyClN8sWVoS8xNmad/YV5Fs9YUsqvaTRpY4wM1R/zuXwyeS51avgeJz00W X-Gm-Message-State: AOJu0Yziwo2IJc87PB/jQXBpYvj3O++CNj0LPjO9sZDpN2ow/uCoZzsp yquvRTWRkIbf6ksVcNQnbbvM+iiMeOSBBTgSGP4bCfuSvs8Xqf7qUfCehEMWOA== X-Google-Smtp-Source: AGHT+IGM8Dqm/6+6/lxZ8pSJg338UR6F0X81KWVG5uRhl9oNBtnBdU4y50jzsgc9NatZRGXMVzuApQ== X-Received: by 2002:a17:902:e806:b0:1dc:b063:34ac with SMTP id u6-20020a170902e80600b001dcb06334acmr11901220plg.21.1709852820139; Thu, 07 Mar 2024 15:07:00 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:bf8f:10d4:f877:bee3]) by smtp.gmail.com with ESMTPSA id h19-20020a170902f2d300b001db63cfe07dsm15196654plc.283.2024.03.07.15.06.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 15:06:59 -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 v6 3/5] drm/edid: Match edid quirks with identity Date: Thu, 7 Mar 2024 14:57:43 -0800 Message-ID: <20240307230653.1807557-4-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240307230653.1807557-1-hsinyi@chromium.org> References: <20240307230653.1807557-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. Signed-off-by: Hsin-Yi Wang Reviewed-by: Jani Nikula Reviewed-by: Douglas Anderson --- 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 58fe35058181..4abc50516cda 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -112,13 +112,15 @@ struct drm_edid_match_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 */ @@ -2883,16 +2885,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 drm_edid_get_panel_id(drm_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(drm_edid, &quirk->ident)) return quirk->quirks; } =20 --=20 2.44.0.278.ge034bb2e1d-goog From nobody Fri Dec 19 21:47:55 2025 Received: from mail-pl1-f170.google.com (mail-pl1-f170.google.com [209.85.214.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 A41A141C6A for ; Thu, 7 Mar 2024 23:07:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.170 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709852823; cv=none; b=c31Cykr1RTXHyFgaa1NK8yZsZ1T9CEz0R1wh9cBvlMjnw4FgE9y1wsP7EOGoYXMfrsj/BmNqvryIcVnIqTgcIlOiJgMnahpqY3ZOBAIFmn1bACyfn7glqvKK5uUmQIAFAFt9PxRapvNkRtkOxmnK2UK3WFliP+r32AUTeCyom3Q= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709852823; c=relaxed/simple; bh=kb9bxub8TItIW7WdLtYnLTeYMFRFguGXIAzWxunEwlo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=KEsJECiErDj7l6O31er9iNaHPAyM2m7CynUtVf5zmGxwQNv1OImkGhDxIQqxxiDY2wkFYhXvLojYSv6WumCege8+e9Zn6XyZVr5HOeOEfGDI07y7eUVG1i7Q/EHy0vGmrOK1+GmtSfxRMBA06eoKPKR9HJ6+sIhJBvLwmWzRNeI= 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=G41LXorD; arc=none smtp.client-ip=209.85.214.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="G41LXorD" Received: by mail-pl1-f170.google.com with SMTP id d9443c01a7336-1dc1ff58fe4so11108405ad.1 for ; Thu, 07 Mar 2024 15:07:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709852821; x=1710457621; 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=kB/qX4HZuCvCcxbPmER5bpPaaStWtmbIuwHw3vs9CPk=; b=G41LXorDEmU+q7cDo8TDsHt8HSFh/FOt/MAaab98yokfEyzFCtjINPR6CWeoA3P99c ceGYSj0tsP0hLFS05GfFWjpduOZBOvrimuRpxRpVh+hum6t8TSwy5+/OLse5eaMegYvP OmGWtSrC16Mr7QuXODHx6r1NKKOLGQ8+uKKtA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709852821; x=1710457621; 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=kB/qX4HZuCvCcxbPmER5bpPaaStWtmbIuwHw3vs9CPk=; b=nDn1YdaOhYC6QxiTjXiCsfu9T73oKVznsnwQpEGEsdpDiLq3GGVpJCXuEOK9+dMryI kVUfo57EmQNEimdTHAcFLuqJI8hKCJ05ZBUPRzwB+USKWxMN5bBnSnLvzbb5E51A4DIF vWimcYWmNa3PTRRao/n5L5Fz+Q2MOvT+PYNuOdmn/HCd+pH5DtPz5bTru5iXGNBsPgeX GfZotl/tmFZZpL3KjWiARsdVk0YjHU/LJY8BMsKKcpq43G/Vnzn1hcyoYqIKmDO5phhK 8a/+fdkjylMhnSpf5//4Aug18zZ2pKcy8bw+Y69d6VNXL7ncGSDFk7/IbkrrtCAilO+6 7ZIg== X-Forwarded-Encrypted: i=1; AJvYcCWknYJN6pdFaS1xI9DgxLNLd1aTHUUqZ/BrdvKZSeG/wDLgHmyH/7ysN/z1LeTt3RA9SqQQwwGqLff3tIZGYKohryI0y58PobSv5Zd3 X-Gm-Message-State: AOJu0YxNGwNFwsvLRfANUM/txppqU8xetPy1sNf23xcq8XzgSrIMWPej kuFiaVPjE+VHgxay28vOGsuDC4ycr9udaJnOed1faHheCeZOuMKy4FDPVArYqA== X-Google-Smtp-Source: AGHT+IEl2SKEsnIe/1ux3kSFRla9XwGixgGKsomT1jpfmaa9qvtDZ24gCTCnu2EwFPABsHHlxklyGg== X-Received: by 2002:a17:902:d58d:b0:1dc:bb8e:d28f with SMTP id k13-20020a170902d58d00b001dcbb8ed28fmr2842865plh.66.1709852821077; Thu, 07 Mar 2024 15:07:01 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:bf8f:10d4:f877:bee3]) by smtp.gmail.com with ESMTPSA id h19-20020a170902f2d300b001db63cfe07dsm15196654plc.283.2024.03.07.15.07.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 15:07:00 -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 v6 4/5] drm/panel-edp: Match edp_panels with panel identity Date: Thu, 7 Mar 2024 14:57:44 -0800 Message-ID: <20240307230653.1807557-5-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240307230653.1807557-1-hsinyi@chromium.org> References: <20240307230653.1807557-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 Reviewed-by: Douglas Anderson --- v5->v6: add some comments. --- drivers/gpu/drm/panel/panel-edp.c | 50 +++++++++++++++++++------------ 1 file changed, 31 insertions(+), 19 deletions(-) diff --git a/drivers/gpu/drm/panel/panel-edp.c b/drivers/gpu/drm/panel/pane= l-edp.c index fe51680feb61..7f749b17df85 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; @@ -1954,17 +1952,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 \ } @@ -2111,15 +2113,25 @@ 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; =20 - for (panel =3D edp_panels; panel->panel_id; panel++) - if (panel->panel_id =3D=3D panel_id) + /* + * Match with identity first. This allows handling the case where + * vendors incorrectly reused the same panel ID for multiple panels that + * need different settings. If there's no match, try again with panel + * ID, which should be unique. + */ + for (panel =3D edp_panels; panel->ident.panel_id; panel++) + if (drm_edid_match(edid, &panel->ident)) + return panel; + + 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:55 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 9601D47F6B for ; Thu, 7 Mar 2024 23:07:02 +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=1709852824; cv=none; b=SFYuME+guFd5Ts6maUY3Br9z87lFW/vC0zur9Vy1xG9Y4/KVSyN1AJMgAabRsa1MzChBAUQi7D/yPj0RI+SprTW66AMAllhwhLB5t4+OUNrtbZKUCMyTUeJSA10K0IbJTVi9BYEBcFE2rSmnKAtiS2De781b8ujyDl/rdR9qZno= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1709852824; c=relaxed/simple; bh=82Xm1OUy3Pwr9GyVUKBDPccvDca/D/PxTSR2Lol/SRc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=kMWBv6/BshadG0uOl6M7+TBRSbVSRSuB5k3uw0zGWlN4wGathy83NadkkXz2NSwxqtM1Xsvf6QCD8UL1NULRJVwbQx5918/tLcMCj2jRs3vo9fm5C/r8y1bC4MN6nlY4MNTCuVZW9CMXO044bvw0sXh9EK/802VzwJX4k3TFAEg= 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=LpYD4zuJ; 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="LpYD4zuJ" Received: by mail-pl1-f181.google.com with SMTP id d9443c01a7336-1dd178fc492so9975775ad.2 for ; Thu, 07 Mar 2024 15:07:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; t=1709852822; x=1710457622; 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=XiUQw1ZTVNc5PMf1jcXsUl5pNMmYncCeRdBmheYnxcM=; b=LpYD4zuJjiByG/rlfuvItgBudWRyyB30ePQu1fmCW1xb/Am4LqbJ/YM+DawfNUaoB4 H7fh0+pxnX1GHieC1Mc8NjVrOGg5BGIb9f5DAgYhYqxS5YlUTvK6GmWlTwTnazNehiGM vOmMe/WVZZuJkw4Gqn2RDYe9bLuJCZugTm0I0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709852822; x=1710457622; 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=XiUQw1ZTVNc5PMf1jcXsUl5pNMmYncCeRdBmheYnxcM=; b=Yxa5S3WQGZPQE4CTfpR3oMqWBwg/ip5t1NneCqwndp5zQT6cf7j+1OaDzO7FFl+V66 w0n9x+ZYPajgZ1mAoAyGFEhuiVf3zE1qHTwwyTa2VOpjTnplQ0BbIRkOmp1SUirryWML DemAn/seTnIW2HsmFPo6AgXOQCkKAvbFGiTnfwU6pLgUnq1ecIsSixUD3t4Q6hr8efmx B8Vj/vENEbDfCHJFCajtx9xjN+jU4XyMio0nB8pKRU8HQaKwHsEd39XHEdTb+o7lnmhB k9N5iqJfj+W9YX4CLfnoOdmpSlNKhMprf2yaFvhiWWY8TCkOsTh3VP7mjuMVFNhvY6Om boag== X-Forwarded-Encrypted: i=1; AJvYcCVGRfVBVcMLvP4qPSpv/9DRbroThfU5YvkUhOwsMPC/U2BSEPlEQrv9jhxN+iaawkLCbnNqkWVgLsUYX1oer7n0+nUZP6emU/Nqt9aV X-Gm-Message-State: AOJu0YxgDLrS4+HR2QnjqIMe8D4Qb8+9elET7TJQxGiwK1TCpODmL46G 0sQKbYfrqaxoayVxklCRAqGaoaX5elfcUZv8r6Pu2m0vBlV+H9pRCc/Oasc16w== X-Google-Smtp-Source: AGHT+IHoYt0E9CsIcSAwhLVXdVdiYr8vP/Y4N6g58/0g0X9YeIdqoKrM/CVpefcc0EVSlKAUOt/Mmg== X-Received: by 2002:a17:902:f690:b0:1dd:46ca:be1 with SMTP id l16-20020a170902f69000b001dd46ca0be1mr4634856plg.55.1709852821963; Thu, 07 Mar 2024 15:07:01 -0800 (PST) Received: from hsinyi.sjc.corp.google.com ([2620:15c:9d:2:bf8f:10d4:f877:bee3]) by smtp.gmail.com with ESMTPSA id h19-20020a170902f2d300b001db63cfe07dsm15196654plc.283.2024.03.07.15.07.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Mar 2024 15:07:01 -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 v6 5/5] drm/panel-edp: Fix AUO 0x405c panel naming and add a variant Date: Thu, 7 Mar 2024 14:57:45 -0800 Message-ID: <20240307230653.1807557-6-hsinyi@chromium.org> X-Mailer: git-send-email 2.44.0.278.ge034bb2e1d-goog In-Reply-To: <20240307230653.1807557-1-hsinyi@chromium.org> References: <20240307230653.1807557-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 Reviewed-by: Douglas Anderson --- v5->v6: remove trailing white space. --- 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 7f749b17df85..c7f81dd9023f 100644 --- a/drivers/gpu/drm/panel/panel-edp.c +++ b/drivers/gpu/drm/panel/panel-edp.c @@ -1009,6 +1009,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, @@ -1990,7 +2003,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