From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AF3F6456292 for ; Fri, 31 Jul 2026 16:25:19 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785515120; cv=none; b=LdpM+2KVD9DI6YbtQTPsXYG89r31RWWz6fsKeD2eFMLQr1owNSGFHGu/vKXG/K4qNtLijXePPrVVT8CjXLJaHJDR9Ww+NgibmtVFbYM0AwfR/cNlvQsTqoZZ6q635jDz7nXj2R1rw45X3FdsbI1pzP33wIfGCO411cHNW5kbnlM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785515120; c=relaxed/simple; bh=1nNh1pofFgo0X/U42cccchgE9VhKKv4iquC/fSsDqIs=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=On7F5KB5drEpWdGkm0ICW4WNijs+ruTpTyudPsbZfdQQlFa9rjo2MDlfTBADB8Z+/CotiWeb9WKIJ8sTzlQ6IfKmBwxgyQHn8tANBvpUKB/ZbWnXqiy0rM6ORltpz3t24cNkDha2/SAl/6R4KyoZyvCmdECKFBkFPLmrEITCO8o= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Iv+tlRcD; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Iv+tlRcD" Received: by smtp.kernel.org (Postfix) with ESMTPSA id D73F31F00ACA; Fri, 31 Jul 2026 16:25:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1785515119; bh=4Dua2oRzEd3qWqS0s7QuhIiYxaLatK0jo7+/oIbwofk=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Iv+tlRcDZpR36WiKWuiWXQEgbEU0VqZTOFlZ4seBITPm4DdcIudjBH/5Oj/1tqTIH l132VTCghVbCkBzOmpkOw84IeNf0vlcnN5M41IXUjXB97HhTO3krmVuORJY35RYEG7 0yP6fKgpQurZAJdmtD+yYVv38h3EWe1vURAcXlptZOfLzMWY4inJb6PjMb7MuadolR iHx4BCNOAe9PofMnhyMNupMYPMKu0bC0DSfwcEAtV5+HXdv+xQuMUCiyT+4y2xKC5r E9yri91djZreDk8PVK48Qpd712+Pn2aVY1y8g5oufoWPhTY2F4MmJ9nZAWL/uOvoSK wEbXeg+j/XR5A== From: Sasha Levin To: stable@vger.kernel.org Cc: Jani Nikula , Dave Airlie , Sasha Levin Subject: [PATCH 6.1.y] drm/displayid: fix Tiled Display Topology ID size Date: Fri, 31 Jul 2026 12:25:17 -0400 Message-ID: <20260731162517.788544-1-sashal@kernel.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <2026072926-sandbox-plexiglas-bd5e@gregkh> References: <2026072926-sandbox-plexiglas-bd5e@gregkh> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit From: Jani Nikula [ Upstream commit 90c0486a82e27393f9eaf3bb350f51a0bd38cb6b ] The Tiled Display Topology ID of a DisplayID Tiled Display Topology Data Block consists of three fields: - Tiled Display Manufacturer/Vendor ID Field (3 bytes) - Tiled Display Product ID Code Field (2 bytes) - Tiled Display Serial Number Field (4 bytes) i.e. a total of 9 bytes, not 8. The DisplayID Tiled Display Topology ID is used as the tile group identifier. Update both struct displayid_tiled_block topology_id member and struct drm_tile_group group_data member to full 9 bytes. The group data was missing the last byte of the serial number. I don't know whether there are known bug reports that might be linked to this, but it's plausible the last byte could be the differentiating part for the tile groups, and fewer tile groups might have been created than intended. Fixes: b49b55bd4fba ("drm/displayid: add displayid defines and edid extension (v2)") Fixes: 138f9ebb9755 ("drm: add tile_group support. (v3)") Cc: Dave Airlie Cc: stable@vger.kernel.org # v3.19+ Reviewed-by: Dave Airlie Link: https://patch.msgid.link/20260610141549.555605-1-jani.nikula@intel.com Signed-off-by: Jani Nikula Signed-off-by: Sasha Levin --- drivers/gpu/drm/drm_connector.c | 12 ++++++------ include/drm/drm_connector.h | 6 +++--- include/drm/drm_displayid.h | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/drm_connector.c b/drivers/gpu/drm/drm_connector.c index e5c1572f720b..e49e2b0da659 100644 --- a/drivers/gpu/drm/drm_connector.c +++ b/drivers/gpu/drm/drm_connector.c @@ -2902,7 +2902,7 @@ EXPORT_SYMBOL(drm_mode_put_tile_group); /** * drm_mode_get_tile_group - get a reference to an existing tile group * @dev: DRM device - * @topology: 8-bytes unique per monitor. + * @topology_id: 9-byte unique ID per monitor. * * Use the unique bytes to get a reference to an existing tile group. * @@ -2910,14 +2910,14 @@ EXPORT_SYMBOL(drm_mode_put_tile_group); * tile group or NULL if not found. */ struct drm_tile_group *drm_mode_get_tile_group(struct drm_device *dev, - const char topology[8]) + const char topology_id[9]) { struct drm_tile_group *tg; int id; mutex_lock(&dev->mode_config.idr_mutex); idr_for_each_entry(&dev->mode_config.tile_idr, tg, id) { - if (!memcmp(tg->group_data, topology, 8)) { + if (!memcmp(tg->group_data, topology_id, sizeof(tg->group_data))) { if (!kref_get_unless_zero(&tg->refcount)) tg = NULL; mutex_unlock(&dev->mode_config.idr_mutex); @@ -2932,7 +2932,7 @@ EXPORT_SYMBOL(drm_mode_get_tile_group); /** * drm_mode_create_tile_group - create a tile group from a displayid description * @dev: DRM device - * @topology: 8-bytes unique per monitor. + * @topology_id: 9-byte unique ID per monitor. * * Create a tile group for the unique monitor, and get a unique * identifier for the tile group. @@ -2941,7 +2941,7 @@ EXPORT_SYMBOL(drm_mode_get_tile_group); * new tile group or NULL. */ struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev, - const char topology[8]) + const char topology_id[9]) { struct drm_tile_group *tg; int ret; @@ -2951,7 +2951,7 @@ struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev, return NULL; kref_init(&tg->refcount); - memcpy(tg->group_data, topology, 8); + memcpy(tg->group_data, topology_id, sizeof(tg->group_data)); tg->dev = dev; mutex_lock(&dev->mode_config.idr_mutex); diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h index 4d830fc55a3d..b8ef80e6ce39 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h @@ -1864,13 +1864,13 @@ struct drm_tile_group { struct kref refcount; struct drm_device *dev; int id; - u8 group_data[8]; + u8 group_data[9]; }; struct drm_tile_group *drm_mode_create_tile_group(struct drm_device *dev, - const char topology[8]); + const char topology_id[9]); struct drm_tile_group *drm_mode_get_tile_group(struct drm_device *dev, - const char topology[8]); + const char topology_id[9]); void drm_mode_put_tile_group(struct drm_device *dev, struct drm_tile_group *tg); diff --git a/include/drm/drm_displayid.h b/include/drm/drm_displayid.h index 49649eb8447e..8f4d4da3b246 100644 --- a/include/drm/drm_displayid.h +++ b/include/drm/drm_displayid.h @@ -108,7 +108,7 @@ struct displayid_tiled_block { u8 topo[3]; u8 tile_size[4]; u8 tile_pixel_bezel[5]; - u8 topology_id[8]; + u8 topology_id[9]; } __packed; struct displayid_detailed_timings_1 { -- 2.53.0