From nobody Mon Feb 9 05:05:14 2026 Received: from mail-pg1-f173.google.com (mail-pg1-f173.google.com [209.85.215.173]) (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 79AC552F9B for ; Sun, 27 Oct 2024 07:51:20 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.173 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015483; cv=none; b=fFithxuHMz6mqZphVeuGHKfxzx3RGRTw7AmfuDesL/egEetnlyvUb7SQnnVAbMLUKG1jwaTVAOtHL7Ze1aw56WU1yuQEQqv2qZKxIvXNvGYAmdLQciST2VMVlHWzJ7dgnLW70i/45DjzTC9XEV0pt+u4eD/Dyzl0ol643EK4ynY= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015483; c=relaxed/simple; bh=190ulkEix2nV6LUZ/hPOLvwm0KTSFhVhb79PrfGzt60=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=k9BoXZ55708qhKGp12M2VLo/EU+Uem0Df/jnuJV75txPee3j4y1+sNMb3eJQP0EIR/Y+q5dhPtTP/1CmNS4xXNnndK1pw01K8UEHT07F7+k1/XU/OSu4HpU7K54tEyYH3yBKvKSV1syYQuOoxOq0hK4wWFs1XyQGgwzo9e8kvN0= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=PrGpVOMn; arc=none smtp.client-ip=209.85.215.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="PrGpVOMn" Received: by mail-pg1-f173.google.com with SMTP id 41be03b00d2f7-7ed9f1bcb6bso2156927a12.1 for ; Sun, 27 Oct 2024 00:51:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730015480; x=1730620280; 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=UmZ562TWvSEYWHmls9zLStGOVmuvMcWc95tM3sj3JQY=; b=PrGpVOMnJcO6Ze6OInCHnHYEokW0y/r06x/uVZ3WnkdOmVKS4Dx9FMxaGwFsgQdEGb B2pc4teNisiwgHF7+0eqIh8EGOo0lRGlNkRKhjbvpwIFt3cAmdCIlT4dSK+ANyYAB5Y/ s/e3GR04NT/wAOedT99+/FJlWtFwD5CHL8eGeimxr6bVslq2O5uYjW+4ZkjV36F8QvdP /ATRAVJf2oGRb/Viy+hCtktf/KHSXFStF0WGG99DLI/M+mlhrFd6bGE2C3TAOwGuAr1e rJsVabGZMLNq/VIOsgNPZGwLhuSoZaa2D9tGIBkjrujDUIetUxaEGcOot8NdE5JETMAR xcQg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730015480; x=1730620280; 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=UmZ562TWvSEYWHmls9zLStGOVmuvMcWc95tM3sj3JQY=; b=CqB0JjHTzwLhwGVVPnq2C0URHVWGydEWzZ/BpMxi6FyQLReQ6Y+4fSLQxvFI0Fsrcy 5tpI1MdnjyWI3s7NP/397fgkH9JMpSudkWZKffyleNY99fO8fQTjwoJ1Dc/va1qp0TR5 rxg8e8tqV9hJoZJfIXwjRhqAbfEMi2/wtv6XjSlfVLTooAsvmvbYn/uA1QxX6xMHQMmq SQAlxB412/7uTdeM+n6768XcOJHmX9h4iezjFdze/xirtDB1/BolMXso0oNwntqsQ/p5 0RRW8oJLQm+Avi0f/0KU8zz6qGS0c8Wm6KGR6NGn0OqNc3PILPoKtBRttOG+boeDc38D k3bQ== X-Forwarded-Encrypted: i=1; AJvYcCUpH9MWUcZ3Bs8v/dpuDCQqMI5oLTuAque7xzIiplVjoTEPdiYVJdNbLDBE2ePr3qSrER6ey6S64QUPubw=@vger.kernel.org X-Gm-Message-State: AOJu0YxlGx6viCqBZP3Tk4D4v+nDiHS/gjROg0OcN1VzZdR6WoH/bKic wU3lgQxhexHgCGS9zxvd01PIie+CrC1Q3VB+ZV4qyzQunFqmBZcB X-Google-Smtp-Source: AGHT+IGQOtCWxcizTXgrVFo4n+U3UJmE7USmLMCsyGi09knUS1pUdt+OcSuQZ9umOqmOBlQN2YlcjQ== X-Received: by 2002:a05:6a20:4c9b:b0:1d9:3b81:cdd3 with SMTP id adf61e73a8af0-1d9a83ab2d9mr5780061637.1.1730015479652; Sun, 27 Oct 2024 00:51:19 -0700 (PDT) Received: from fedora.. ([2405:201:d007:50c2:b7e7:6df3:9958:a45d]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7205794f9a1sm3785551b3a.90.2024.10.27.00.51.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 00:51:19 -0700 (PDT) From: Vamsi Krishna Brahmajosyula To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, jani.nikula@linux.intel.com Cc: skhan@linuxfoundation.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] drm/edid: convert drm_parse_hdmi_vsdb_video to use struct cea_db * Date: Sun, 27 Oct 2024 13:21:04 +0530 Message-ID: <20241027075108.14273-2-vamsikrishna.brahmajosyula@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> References: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> 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" Address the following FIXME: convert parsers to use struct cea_db in the parser drm_parse_hdmi_vsdb_video cea_db contains len and then data. Appropriately change the indices when referring to individual elements (db[n] becomes data[n-1]). Signed-off-by: Vamsi Krishna Brahmajosyula --- drivers/gpu/drm/drm_edid.c | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 855beafb76ff..e07e39c0caa0 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6259,32 +6259,33 @@ static void drm_parse_hdmi_forum_scds(struct drm_co= nnector *connector, } =20 static void drm_parse_hdmi_deep_color_info(struct drm_connector *connector, - const u8 *hdmi) + const struct cea_db *db) { struct drm_display_info *info =3D &connector->display_info; unsigned int dc_bpc =3D 0; + const u8 *hdmi =3D cea_db_data(db); =20 /* HDMI supports at least 8 bpc */ info->bpc =3D 8; =20 - if (cea_db_payload_len(hdmi) < 6) + if (cea_db_payload_len(db) < 6) return; =20 - if (hdmi[6] & DRM_EDID_HDMI_DC_30) { + if (hdmi[5] & DRM_EDID_HDMI_DC_30) { dc_bpc =3D 10; info->edid_hdmi_rgb444_dc_modes |=3D DRM_EDID_HDMI_DC_30; drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] HDMI sink does deep color= 30.\n", connector->base.id, connector->name); } =20 - if (hdmi[6] & DRM_EDID_HDMI_DC_36) { + if (hdmi[5] & DRM_EDID_HDMI_DC_36) { dc_bpc =3D 12; info->edid_hdmi_rgb444_dc_modes |=3D DRM_EDID_HDMI_DC_36; drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] HDMI sink does deep color= 36.\n", connector->base.id, connector->name); } =20 - if (hdmi[6] & DRM_EDID_HDMI_DC_48) { + if (hdmi[5] & DRM_EDID_HDMI_DC_48) { dc_bpc =3D 16; info->edid_hdmi_rgb444_dc_modes |=3D DRM_EDID_HDMI_DC_48; drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] HDMI sink does deep color= 48.\n", @@ -6302,7 +6303,7 @@ static void drm_parse_hdmi_deep_color_info(struct drm= _connector *connector, info->bpc =3D dc_bpc; =20 /* YCRCB444 is optional according to spec. */ - if (hdmi[6] & DRM_EDID_HDMI_DC_Y444) { + if (hdmi[5] & DRM_EDID_HDMI_DC_Y444) { info->edid_hdmi_ycbcr444_dc_modes =3D info->edid_hdmi_rgb444_dc_modes; drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] HDMI sink does YCRCB444 i= n deep color.\n", connector->base.id, connector->name); @@ -6312,7 +6313,7 @@ static void drm_parse_hdmi_deep_color_info(struct drm= _connector *connector, * Spec says that if any deep color mode is supported at all, * then deep color 36 bit must be supported. */ - if (!(hdmi[6] & DRM_EDID_HDMI_DC_36)) { + if (!(hdmi[5] & DRM_EDID_HDMI_DC_36)) { drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] HDMI sink should do DC_36= , but does not!\n", connector->base.id, connector->name); } @@ -6320,19 +6321,20 @@ static void drm_parse_hdmi_deep_color_info(struct d= rm_connector *connector, =20 /* HDMI Vendor-Specific Data Block (HDMI VSDB, H14b-VSDB) */ static void -drm_parse_hdmi_vsdb_video(struct drm_connector *connector, const u8 *db) +drm_parse_hdmi_vsdb_video(struct drm_connector *connector, const struct ce= a_db *db) { struct drm_display_info *info =3D &connector->display_info; u8 len =3D cea_db_payload_len(db); + const u8 *data =3D cea_db_data(db); =20 info->is_hdmi =3D true; =20 - info->source_physical_address =3D (db[4] << 8) | db[5]; + info->source_physical_address =3D (data[3] << 8) | data[4]; =20 if (len >=3D 6) - info->dvi_dual =3D db[6] & 1; + info->dvi_dual =3D data[5] & 1; if (len >=3D 7) - info->max_tmds_clock =3D db[7] * 5000; + info->max_tmds_clock =3D data[6] * 5000; =20 /* * Try to infer whether the sink supports HDMI infoframes. @@ -6340,7 +6342,7 @@ drm_parse_hdmi_vsdb_video(struct drm_connector *conne= ctor, const u8 *db) * HDMI infoframe support was first added in HDMI 1.4. Assume the sink * supports infoframes if HDMI_Video_present is set. */ - if (len >=3D 8 && db[8] & BIT(5)) + if (len >=3D 8 && data[7] & BIT(5)) info->has_hdmi_infoframe =3D true; =20 drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] HDMI: DVI dual %d, max TMD= S clock %d kHz\n", @@ -6412,7 +6414,7 @@ static void drm_parse_cea_ext(struct drm_connector *c= onnector, const u8 *data =3D (const u8 *)db; =20 if (cea_db_is_hdmi_vsdb(db)) - drm_parse_hdmi_vsdb_video(connector, data); + drm_parse_hdmi_vsdb_video(connector, db); else if (cea_db_is_hdmi_forum_vsdb(db) || cea_db_is_hdmi_forum_scdb(db)) drm_parse_hdmi_forum_scds(connector, data); --=20 2.47.0 From nobody Mon Feb 9 05:05:14 2026 Received: from mail-pf1-f178.google.com (mail-pf1-f178.google.com [209.85.210.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 70ED955887 for ; Sun, 27 Oct 2024 07:51:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.178 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015486; cv=none; b=MPfTVy+zFcaDoCFp72tjyi1CGkhsXz3gpCuFUmiMxFWXXFJOhxmAlkZ7h8ClWB+m1wf1hU8aTyyxhTYmNjdyJZ89Nw4AJfMliG1EF1OTO24ZMrTtYzQUmLXE/7vrkucodB65Et86pdMU9+uZ6+WZyO0OLA0QGCkQofO9FC1JRx4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015486; c=relaxed/simple; bh=em/8I6c3qdd19cHs/Y7FFzt6/b44wvDCtW1ZAQKODt8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RH3KU7ybXEyqZojEqy662ZU8YdhJrTEOUagp+t4IG1ambeD5LmDzLTZcfPMPLuNJg+66Dh8m2AgQVfDJcijpuYLsUFcqapmkm42vvOLiaGsGi7Mxu2IGipWvmPCyiBxgaJEdQSA2tVmamMgfHoKHwqZhb7yqzp+q7+xe0+kBHZY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=X5QHZrfe; arc=none smtp.client-ip=209.85.210.178 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="X5QHZrfe" Received: by mail-pf1-f178.google.com with SMTP id d2e1a72fcca58-71e52582cf8so2387553b3a.2 for ; Sun, 27 Oct 2024 00:51:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730015484; x=1730620284; 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=ZG1M3TOUyG+goANQU6k5RDo7M15PqSr1tl6HcqlXoB0=; b=X5QHZrfet6cYNf0a5xVPaCvRo1RZmrTGB+QauQp4apKlhBe7nL+3Rupzf2R3X/7D72 AIud/DrTy4BB9f0PG5e77LQJOwo1ljAXZmkSfEmZa5W6MHR+xSxvfOs6j3HTg1iasEnq fSAMb7YjPqHVAt5FXUjaUVNdH/OgVPEncymtfcr2uNEZ/ykMTTts3M/sc0NdZFvZznvB 2r3+/mP1bwugMpKGAdSnaY1JA/OE4BqZm8LKYQs0IGi4ZkLIOm/DYWJ3SpDIEfgFqtQ5 MwB2VgdWSacD75evp1mKZHq9ImcT7gQrotnA/6xm7NJnpN0dtNr87nfeS4ckqRdtFfvi CxcA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730015484; x=1730620284; 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=ZG1M3TOUyG+goANQU6k5RDo7M15PqSr1tl6HcqlXoB0=; b=map2RP51BAhr2xcmmRKHOhPh3Vbcs4YJpBTw+fTn0s2OrxIcLjV4a8n6LCO+KO60fx 0RxUkbKNh3gSBdKZo5R290ma6hvPE1nVv5I3Rbht/MoqM77AyXk2CA34lNc817zMuZ1b ybDKJHibDFP/hdRfukzsmA7knlJPpJB8NaqYWAXinAjqlDhFCp/M6UhFLkynR42SGpNf 3fbk+3ontLe2QeDAcYbYKruDCJJgbGqAYdTqwVlxU1z34tspd2vngagmPLGr0ZLLHltX 98u41WkMRTLwicagECdpofV4fhu3rBH4O2yVUDN7sd3Gws1fXg1/xgTP/M5MGr5wAIj+ FOKA== X-Forwarded-Encrypted: i=1; AJvYcCXrcbwAxqzwGi8Dc8joQbqw0vjOBh8KHEKVguv/WlHBEL1lARccBXeyb+e+xjSS9JlKpT2X+8uNG1gDyYo=@vger.kernel.org X-Gm-Message-State: AOJu0YyIc42PTpQ9uIC5MnKTn/58JFFmgll60dzKJLHFTssb2IA2PQTY 4REevE4bXGgHNQGJEE03Mf29jlOtmfFQOhgFq5m9iZfeOHBmD9dR X-Google-Smtp-Source: AGHT+IHIMFVfUloVq/h0b+q0MYGiJAE0Rd6mTPhC9+G2coAhYQIVYiwDm9CC3QiVWcu7OqTvAjY4fA== X-Received: by 2002:a05:6a00:c85:b0:71e:f4:dbc with SMTP id d2e1a72fcca58-7206309375fmr7351107b3a.25.1730015483426; Sun, 27 Oct 2024 00:51:23 -0700 (PDT) Received: from fedora.. ([2405:201:d007:50c2:b7e7:6df3:9958:a45d]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7205794f9a1sm3785551b3a.90.2024.10.27.00.51.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 00:51:22 -0700 (PDT) From: Vamsi Krishna Brahmajosyula To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, jani.nikula@linux.intel.com Cc: skhan@linuxfoundation.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] drm/edid: convert drm_parse_hdmi_forum_scds to use struct cea_db * Date: Sun, 27 Oct 2024 13:21:05 +0530 Message-ID: <20241027075108.14273-3-vamsikrishna.brahmajosyula@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> References: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> 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" Address the following FIXME: convert parsers to use struct cea_db in the parser drm_parse_hdmi_forum_scds and related methods cea_db contains len and then data. Appropriately change the indices when referring to individual elements (db[n] becomes data[n-1]). Signed-off-by: Vamsi Krishna Brahmajosyula --- drivers/gpu/drm/drm_edid.c | 56 ++++++++++++++++++++------------------ 1 file changed, 30 insertions(+), 26 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index e07e39c0caa0..f79d8fbdb62b 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6112,45 +6112,48 @@ void drm_get_max_frl_rate(int max_frl_rate, u8 *max= _lanes, u8 *max_rate_per_lane } =20 static void drm_parse_ycbcr420_deep_color_info(struct drm_connector *conne= ctor, - const u8 *db) + const struct cea_db *db) { u8 dc_mask; struct drm_hdmi_info *hdmi =3D &connector->display_info.hdmi; + const u8 *data =3D cea_db_data(db); =20 - dc_mask =3D db[7] & DRM_EDID_YCBCR420_DC_MASK; + dc_mask =3D data[6] & DRM_EDID_YCBCR420_DC_MASK; hdmi->y420_dc_modes =3D dc_mask; } =20 static void drm_parse_dsc_info(struct drm_hdmi_dsc_cap *hdmi_dsc, - const u8 *hf_scds) + const struct cea_db *db) { - hdmi_dsc->v_1p2 =3D hf_scds[11] & DRM_EDID_DSC_1P2; + const u8 *hf_scds =3D cea_db_data(db); + + hdmi_dsc->v_1p2 =3D hf_scds[10] & DRM_EDID_DSC_1P2; =20 if (!hdmi_dsc->v_1p2) return; =20 - hdmi_dsc->native_420 =3D hf_scds[11] & DRM_EDID_DSC_NATIVE_420; - hdmi_dsc->all_bpp =3D hf_scds[11] & DRM_EDID_DSC_ALL_BPP; + hdmi_dsc->native_420 =3D hf_scds[10] & DRM_EDID_DSC_NATIVE_420; + hdmi_dsc->all_bpp =3D hf_scds[10] & DRM_EDID_DSC_ALL_BPP; =20 - if (hf_scds[11] & DRM_EDID_DSC_16BPC) + if (hf_scds[10] & DRM_EDID_DSC_16BPC) hdmi_dsc->bpc_supported =3D 16; - else if (hf_scds[11] & DRM_EDID_DSC_12BPC) + else if (hf_scds[10] & DRM_EDID_DSC_12BPC) hdmi_dsc->bpc_supported =3D 12; - else if (hf_scds[11] & DRM_EDID_DSC_10BPC) + else if (hf_scds[10] & DRM_EDID_DSC_10BPC) hdmi_dsc->bpc_supported =3D 10; else /* Supports min 8 BPC if DSC 1.2 is supported*/ hdmi_dsc->bpc_supported =3D 8; =20 - if (cea_db_payload_len(hf_scds) >=3D 12 && hf_scds[12]) { + if (cea_db_payload_len(db) >=3D 12 && hf_scds[11]) { u8 dsc_max_slices; u8 dsc_max_frl_rate; =20 - dsc_max_frl_rate =3D (hf_scds[12] & DRM_EDID_DSC_MAX_FRL_RATE_MASK) >> 4; + dsc_max_frl_rate =3D (hf_scds[11] & DRM_EDID_DSC_MAX_FRL_RATE_MASK) >> 4; drm_get_max_frl_rate(dsc_max_frl_rate, &hdmi_dsc->max_lanes, &hdmi_dsc->max_frl_rate_per_lane); =20 - dsc_max_slices =3D hf_scds[12] & DRM_EDID_DSC_MAX_SLICES; + dsc_max_slices =3D hf_scds[11] & DRM_EDID_DSC_MAX_SLICES; =20 switch (dsc_max_slices) { case 1: @@ -6188,26 +6191,27 @@ static void drm_parse_dsc_info(struct drm_hdmi_dsc_= cap *hdmi_dsc, } } =20 - if (cea_db_payload_len(hf_scds) >=3D 13 && hf_scds[13]) - hdmi_dsc->total_chunk_kbytes =3D hf_scds[13] & DRM_EDID_DSC_TOTAL_CHUNK_= KBYTES; + if (cea_db_payload_len(db) >=3D 13 && hf_scds[12]) + hdmi_dsc->total_chunk_kbytes =3D hf_scds[12] & DRM_EDID_DSC_TOTAL_CHUNK_= KBYTES; } =20 /* Sink Capability Data Structure */ static void drm_parse_hdmi_forum_scds(struct drm_connector *connector, - const u8 *hf_scds) + const struct cea_db *db) { struct drm_display_info *info =3D &connector->display_info; struct drm_hdmi_info *hdmi =3D &info->hdmi; struct drm_hdmi_dsc_cap *hdmi_dsc =3D &hdmi->dsc_cap; + const u8 *hf_scds =3D cea_db_data(db); int max_tmds_clock =3D 0; u8 max_frl_rate =3D 0; bool dsc_support =3D false; =20 info->has_hdmi_infoframe =3D true; =20 - if (hf_scds[6] & 0x80) { + if (hf_scds[5] & 0x80) { hdmi->scdc.supported =3D true; - if (hf_scds[6] & 0x40) + if (hf_scds[5] & 0x40) hdmi->scdc.read_request =3D true; } =20 @@ -6220,11 +6224,11 @@ static void drm_parse_hdmi_forum_scds(struct drm_co= nnector *connector, * Lets check it out. */ =20 - if (hf_scds[5]) { + if (hf_scds[4]) { struct drm_scdc *scdc =3D &hdmi->scdc; =20 /* max clock is 5000 KHz times block value */ - max_tmds_clock =3D hf_scds[5] * 5000; + max_tmds_clock =3D hf_scds[4] * 5000; =20 if (max_tmds_clock > 340000) { info->max_tmds_clock =3D max_tmds_clock; @@ -6234,21 +6238,21 @@ static void drm_parse_hdmi_forum_scds(struct drm_co= nnector *connector, scdc->scrambling.supported =3D true; =20 /* Few sinks support scrambling for clocks < 340M */ - if ((hf_scds[6] & 0x8)) + if ((hf_scds[5] & 0x8)) scdc->scrambling.low_rates =3D true; } } =20 - if (hf_scds[7]) { - max_frl_rate =3D (hf_scds[7] & DRM_EDID_MAX_FRL_RATE_MASK) >> 4; + if (hf_scds[6]) { + max_frl_rate =3D (hf_scds[6] & DRM_EDID_MAX_FRL_RATE_MASK) >> 4; drm_get_max_frl_rate(max_frl_rate, &hdmi->max_lanes, &hdmi->max_frl_rate_per_lane); } =20 - drm_parse_ycbcr420_deep_color_info(connector, hf_scds); + drm_parse_ycbcr420_deep_color_info(connector, db); =20 - if (cea_db_payload_len(hf_scds) >=3D 11 && hf_scds[11]) { - drm_parse_dsc_info(hdmi_dsc, hf_scds); + if (cea_db_payload_len(db) >=3D 11 && hf_scds[10]) { + drm_parse_dsc_info(hdmi_dsc, db); dsc_support =3D true; } =20 @@ -6417,7 +6421,7 @@ static void drm_parse_cea_ext(struct drm_connector *c= onnector, drm_parse_hdmi_vsdb_video(connector, db); else if (cea_db_is_hdmi_forum_vsdb(db) || cea_db_is_hdmi_forum_scdb(db)) - drm_parse_hdmi_forum_scds(connector, data); + drm_parse_hdmi_forum_scds(connector, db); else if (cea_db_is_microsoft_vsdb(db)) drm_parse_microsoft_vsdb(connector, data); else if (cea_db_is_y420cmdb(db)) --=20 2.47.0 From nobody Mon Feb 9 05:05:14 2026 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) (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 1BCE77346D for ; Sun, 27 Oct 2024 07:51:27 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.215.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015490; cv=none; b=jCN70oKAs3e22kAoZ1oDOfNMnQ0I4hYMEC/d8Sw5qpaQz9hsdMbAViNSiP5/qgDiz4pOZEtjBMAMC+k16AbbbIjL5rnTebjKTAICSjO3VpUF8ak1fFz8TGux8aYESTFW7QjJpFrOe+BPHCwGIJ+J2B2+YeEcDQCm6KObjshjMXI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015490; c=relaxed/simple; bh=nhIxyCQYfb/pjLbh6iu5zVWZFBHtkKHs0QJxP7HhhyA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GFgEI7GIzRduFtmF/yYdwETerMR9LI6KXDc/mR+v3d5B7HGvn/97yqJ/wDHr9Atib1ATNNPfthOGi3n5jjLiUsTqdVA86Gt21DvNx76Gnpi3KeFfq94Wl3sbjAHOcXTk1YUQ5mBCFvPy+yyKdSLyiYXfvuw1W7Kt9wgkngTAVTY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=dF+rboRA; arc=none smtp.client-ip=209.85.215.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="dF+rboRA" Received: by mail-pg1-f182.google.com with SMTP id 41be03b00d2f7-7ea0ff74b15so2113466a12.3 for ; Sun, 27 Oct 2024 00:51:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730015487; x=1730620287; 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=nzgoY73OAH7IN4I8JIVtQ+45LcH7GhgBHjlXlGpHvfY=; b=dF+rboRAtAsVBu386RjRmSPB4D3dwt6iLw2w2ZLNSvITwHmMjy2BGeUE2wBeGi/ACf 5g6hJPw/R3b4h4J8aPZpla49XN5PKv/e74o17HdbB3l/nl3c6LSfri3/KLZco4VK3uAM /hDxywfACupnrw7QJpDEqYCvDGAVy6wiC12PBf9Kg3w5iofvZYZ9tlqjM7KLThyzuJa1 o6a11+WHyTkbHAK+EFSTa8DwuRkeNNN3f3jGE70IySrABm6Eabsi5vieJSj4HEBa8tLV UpqFAbMER6wGHrGZgKUZXLyBa4x4rCG+4A/yymuS2LvfRLgScz2d3OXZndUOuDFM5gmu 2BIQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730015487; x=1730620287; 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=nzgoY73OAH7IN4I8JIVtQ+45LcH7GhgBHjlXlGpHvfY=; b=qNJF4UtJJoXgxQIB6akP8tyK9vwFmTJ2IXLs/AsA6SBSwMdeKjkaZU1XT+Y6zPX3Yv mGgbZJdSuLPUZsc6PubPJK1amZBT+f1O+D0YeWFjOQi0rxIHPZw91GpPEFSV07yNY3KB Au6uMDBpQWNjGK/BJ0EZpLwlLaplCqiBi6JqD/jJaatzsJPChxdB8WhmNobC1tTk7dls n5F6HO+eHvLiQ2wxqrdHyPbjRcVbkC766jsPEoC8yEYVJHSKc/IQn4bJyu++rczIjYFL 7HMwtvTsjfTbQ8gsMQDmamg7X3cVSR+sYYUrJYTPs13/592OSiUbf6Kw9gFA7CFaytgA GQ3w== X-Forwarded-Encrypted: i=1; AJvYcCUsnN73WMUqEX23grCcoPooBjcCWJ4smflplRwK+GzjPq+aU+LSp4PKaaLh4sRRuX6XBVNd361r4yi4qV4=@vger.kernel.org X-Gm-Message-State: AOJu0Yzz7tA6XPb0nyc8AjEMANfAzIFKzURzOCGzwqXvXqCZnSQVGPCd NsqKHoOft+ejrfucTp7/BF1xtqEP6dThIgpKMEQ1VSfq0LuLqTWt6I92Wm5bC0I= X-Google-Smtp-Source: AGHT+IFIvv3jnR4vgZY784qrPZUlPI3xPYuwCE5+QmhB3umvWUCbhT9ijcuc5ukibYVcOx+Qde/7kQ== X-Received: by 2002:a05:6a21:1193:b0:1d9:61:e779 with SMTP id adf61e73a8af0-1d9a83ab127mr6572670637.4.1730015487264; Sun, 27 Oct 2024 00:51:27 -0700 (PDT) Received: from fedora.. ([2405:201:d007:50c2:b7e7:6df3:9958:a45d]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7205794f9a1sm3785551b3a.90.2024.10.27.00.51.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 00:51:26 -0700 (PDT) From: Vamsi Krishna Brahmajosyula To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, jani.nikula@linux.intel.com Cc: skhan@linuxfoundation.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] drm/edid: convert drm_parse_microsoft_vsdb to use struct cea_db * Date: Sun, 27 Oct 2024 13:21:06 +0530 Message-ID: <20241027075108.14273-4-vamsikrishna.brahmajosyula@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> References: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> 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" Address the following FIXME: convert parsers to use struct cea_db in the parser drm_parse_microsoft_vsdb cea_db contains len and then data. Appropriately change the indices when referring to individual elements (db[n] becomes data[n-1]). Signed-off-by: Vamsi Krishna Brahmajosyula --- drivers/gpu/drm/drm_edid.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index f79d8fbdb62b..e2ef07d00aaf 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6361,11 +6361,12 @@ drm_parse_hdmi_vsdb_video(struct drm_connector *con= nector, const struct cea_db * * https://docs.microsoft.com/en-us/windows-hardware/drivers/display/speci= alized-monitors-edid-extension */ static void drm_parse_microsoft_vsdb(struct drm_connector *connector, - const u8 *db) + const struct cea_db *db) { struct drm_display_info *info =3D &connector->display_info; - u8 version =3D db[4]; - bool desktop_usage =3D db[5] & BIT(6); + const u8 *data =3D cea_db_data(db); + u8 version =3D data[3]; + bool desktop_usage =3D data[4] & BIT(6); =20 /* Version 1 and 2 for HMDs, version 3 flags desktop usage explicitly */ if (version =3D=3D 1 || version =3D=3D 2 || (version =3D=3D 3 && !desktop= _usage)) @@ -6373,7 +6374,7 @@ static void drm_parse_microsoft_vsdb(struct drm_conne= ctor *connector, =20 drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] HMD or specialized display VSDB version %u: 0x%02= x\n", - connector->base.id, connector->name, version, db[5]); + connector->base.id, connector->name, version, data[4]); } =20 static void drm_parse_cea_ext(struct drm_connector *connector, @@ -6423,7 +6424,7 @@ static void drm_parse_cea_ext(struct drm_connector *c= onnector, cea_db_is_hdmi_forum_scdb(db)) drm_parse_hdmi_forum_scds(connector, db); else if (cea_db_is_microsoft_vsdb(db)) - drm_parse_microsoft_vsdb(connector, data); + drm_parse_microsoft_vsdb(connector, db); else if (cea_db_is_y420cmdb(db)) parse_cta_y420cmdb(connector, db, &y420cmdb_map); else if (cea_db_is_y420vdb(db)) --=20 2.47.0 From nobody Mon Feb 9 05:05:14 2026 Received: from mail-pl1-f176.google.com (mail-pl1-f176.google.com [209.85.214.176]) (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 0E2657DA88 for ; Sun, 27 Oct 2024 07:51:31 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.176 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015493; cv=none; b=pRdN/VwZDp0JXzUQZxxbJZsalyK87GzDKB5zg2t3zaZn9HUHGTeKIipRUo0+/u7CVZ8qFXo8D51hIPNhCUsHUhI26HBBc2DyXma9k10vNzD5hsZAFXrHf7t4O1mMi+0QWnnoGlaxWSDJk7A/2/DWCKsZdyHMzUycuNcAHVlT2nU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015493; c=relaxed/simple; bh=UUC8cC3TAMgwQ1yjoC8b/V5qpSb9de4BBZikaAxoqn4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B3gRGmJbmujSxWaN+tmZHjzFFAnAbNT+jfAxhZfNkuCJQRscaU6blCIaKlgAbClWsvMm331pcsxMFRfimrz0e8zDRcwVRyDWd+lp6mniefQ4jtsq2+oZKsfYb71SFFChDJT4K264G9Tpkwn3DeHxmJpQ59YiZyHbSg4ooIw4Ero= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=a747LVY5; arc=none smtp.client-ip=209.85.214.176 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="a747LVY5" Received: by mail-pl1-f176.google.com with SMTP id d9443c01a7336-20cdb889222so30666185ad.3 for ; Sun, 27 Oct 2024 00:51:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730015491; x=1730620291; 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=95caNnI7hgOLxEqas86hhjYPjq4p60okYGlZe1W9+VQ=; b=a747LVY5VzdvPurx0+fmJK56R/UOOVS72/R5Vei2zVmzPJ/HE/gpkkfoW0laBbZ9/q Q5ac2JsL8Ic/vO89PnTukxSRZWddG+fHQnufSzTcaJzSvOT8DWtwp9uBkLUhTCgc86rr YltsKN2HvGZEhnaMiesSx+yzMzqCMPbZvH9LUO4yzLFIjrHUL2CmT0xB4Q/KvDdipP85 H3GZjExGbGeJCX7e3ITi1CVkYj35avi4yFzSKaIsHRFo7vQeHrs9Yuo0iTcEn5EuJQpF BqHagnWmiJnYMFt90YaJ273RwRaBPNlW+h7PeI/cTqYkQyOKiQdgszLkt0S2ImQjVvg3 YZqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730015491; x=1730620291; 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=95caNnI7hgOLxEqas86hhjYPjq4p60okYGlZe1W9+VQ=; b=kwD9kr4YTHojy215me9eh31SGfFkMEPDz3WCjP3sDux/aRzYyZj4bQs8c5dxGmUKM8 Hh7iZm8Aa7w8v4B4daWVSKsHpV0vlbeZS5hBBznhINNTjh4mWscG9JsYNqeqYhCOPvVB 90rzEwp19sPWR0f6AKLISMmJhyKurIj+pQo4yWVMhzZa/Mu9VwkMs1VrJDx8oM/rnvFY BzzR1i644fzJiJs+Q3fc6bJF4rHiQHFSBAb4bGzF7oNiz1sLEnVFha0KFiV/le0zDWXf sdNnXCJurgfdujOGxnpFR0IKKOh7q2wXycSXumo1jO6lph+z6gImkH7ENt+N3zU5aHyB JEYg== X-Forwarded-Encrypted: i=1; AJvYcCVo6+0YQQrl4IJexViHLVrS7whmEIfm29ixO3w+oheTEoIXNK/PW4WnS4mPs/Gmw26j0PGfs2KALgM+wMU=@vger.kernel.org X-Gm-Message-State: AOJu0YzvYJ7TGWFwrsOfScU1QooYcHRNCtwL1Dvqv0iGWEXZISkPyZOu T/LeAoJTUT3AkN8j1M9ycIwT5Q0x1dXUI56XAu5HCflbWsb+/sZ2 X-Google-Smtp-Source: AGHT+IH7qS5niQmAAfTA2UGQJF1s0kcotIcMoHkxWCvAmGRljhi8/z+HxbR/00ppveIZ8SYyL8JZRA== X-Received: by 2002:a05:6a21:6282:b0:1cc:9f25:54d4 with SMTP id adf61e73a8af0-1d9a84d9ddfmr6268806637.38.1730015491155; Sun, 27 Oct 2024 00:51:31 -0700 (PDT) Received: from fedora.. ([2405:201:d007:50c2:b7e7:6df3:9958:a45d]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7205794f9a1sm3785551b3a.90.2024.10.27.00.51.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 00:51:30 -0700 (PDT) From: Vamsi Krishna Brahmajosyula To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, jani.nikula@linux.intel.com Cc: skhan@linuxfoundation.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] drm/edid: convert drm_parse_vcdb to use struct cea_db * Date: Sun, 27 Oct 2024 13:21:07 +0530 Message-ID: <20241027075108.14273-5-vamsikrishna.brahmajosyula@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> References: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> 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" Address the following FIXME: convert parsers to use struct cea_db in the parser drm_parse_vcdb cea_db contains len and then data. Appropriately change the indices when referring to individual elements (db[n] becomes data[n-1]). Signed-off-by: Vamsi Krishna Brahmajosyula --- drivers/gpu/drm/drm_edid.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index e2ef07d00aaf..d9fa994a3acc 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -6065,14 +6065,15 @@ static void parse_cta_y420vdb(struct drm_connector = *connector, } } =20 -static void drm_parse_vcdb(struct drm_connector *connector, const u8 *db) +static void drm_parse_vcdb(struct drm_connector *connector, const struct c= ea_db *db) { struct drm_display_info *info =3D &connector->display_info; + const u8 *data =3D cea_db_data(db); =20 drm_dbg_kms(connector->dev, "[CONNECTOR:%d:%s] CEA VCDB 0x%02x\n", - connector->base.id, connector->name, db[2]); + connector->base.id, connector->name, data[1]); =20 - if (db[2] & EDID_CEA_VCDB_QS) + if (data[1] & EDID_CEA_VCDB_QS) info->rgb_quant_range_selectable =3D true; } =20 @@ -6430,7 +6431,7 @@ static void drm_parse_cea_ext(struct drm_connector *c= onnector, else if (cea_db_is_y420vdb(db)) parse_cta_y420vdb(connector, db); else if (cea_db_is_vcdb(db)) - drm_parse_vcdb(connector, data); + drm_parse_vcdb(connector, db); else if (cea_db_is_hdmi_hdr_metadata_block(db)) drm_parse_hdr_metadata_block(connector, data); else if (cea_db_tag(db) =3D=3D CTA_DB_VIDEO) --=20 2.47.0 From nobody Mon Feb 9 05:05:14 2026 Received: from mail-pf1-f182.google.com (mail-pf1-f182.google.com [209.85.210.182]) (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 A1B03126C16 for ; Sun, 27 Oct 2024 07:51:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.210.182 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015497; cv=none; b=ITdWDol9bUK4HeuDCkIClVzNjrBhzPmRrQietxEsB9yxohLS7/Zxszl+gqdCxXqTj2pPq8be5dJGd/gCZOc0L1Pw2skAjSyYSJsAGL3KrAPMe6qq3kmbSpzk4D++QcmMkuVbDmQernPIb2SU/vJAzgCggO/9LgH7RchWXPqVn3M= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1730015497; c=relaxed/simple; bh=0tz+h/hAgKYZROcBZNAAejjPVBrffdAhZK9wYZf9Vxc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=M/ay0NYAdiLJFI8JfRvk4tCN/1wGgcQ/9LWKoTyRrQAyIzOPw1kztxfCGijlKG72fOmwfz0Gmkt8wzKNGGvMUW0jGErVVawOp8c844kqBkSoFPAPPOojALyeBgkIyznvLSpDyLtha15FL8glMoucOKLaUb+11HrDWyopZPK1tmc= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=Dlis9No5; arc=none smtp.client-ip=209.85.210.182 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Dlis9No5" Received: by mail-pf1-f182.google.com with SMTP id d2e1a72fcca58-71e6cec7227so2736461b3a.0 for ; Sun, 27 Oct 2024 00:51:35 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1730015495; x=1730620295; 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=zOn93d9tLichC+5tHiWOkakuU/3lAA1dF93RrhXoO/E=; b=Dlis9No5cbrosCCWIXuQkSyWv3CCAbfGBmOzgwBF2ek6RU6O6IpzWyLr5swrJ7YmQE 1eO+YNbGbYweJ6iD987Jr4+2AB8LvsKRUZ2e2qeNJ+WQzZjxQ+QKEfZRvc+o9XuG0UD6 r+aIWzfsyyx1u3p5LhNmk0aTAQ+P1SeS+u8lddfyyeSOkPfQSgyN7B4GIax5/CQW9F4g WhDX53KkezMTx3p0XMjYnh0StbKOF2l7Hn+NrahPoRpWQn0FSXsFTTW0O3ON4o39kZtt ackdJlXDTYbri0EGSsrggVW37KdBzlE4SX28gy1hZDBNaQ0qM1pCTi7n3t5MUvIUnAeS fkdA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1730015495; x=1730620295; 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=zOn93d9tLichC+5tHiWOkakuU/3lAA1dF93RrhXoO/E=; b=Rk/xbjGH1OlW04JQRmXOlPXtb+5K7vqF9RC0U3Kf9ggOy4oo5YPLBmGzJX63VR8Aok vwg/+IFqBZlCU3AaoLzWLxXngrS+HzX7M8cS8qBU6yw3m7BoyO73wqvI54rZrZJqJpmy ZMCbiXqHkjuHTgwXrjALCzL8/kTwLuWkEqmFqV7n0+ZiuVJdVxm4Eymwmh+0mUAadgRs 2lQ/Xh9ccPpoYcDdo8hA/sMIXfH7yL1rE1J4OXfeysp2yYPDquO3OBpXsYB8CRDNGZJY NKAx1PNLIh2XK+BuN++z4seHeL8jVXR7fe3yqqBl3uTPdBgvdyAVpoKGB1jdbMkV07Iy mncA== X-Forwarded-Encrypted: i=1; AJvYcCVUHZQ9BYKel3csO42uo8++mphsLd6i3s7cUU2iWPACZ3YHFW/wvFM5rM+9qOtfBZYyU0Zg0pYjjHonlyU=@vger.kernel.org X-Gm-Message-State: AOJu0YxRsEYxWW+qeqva8JXQnwHC94RI+4wHrYi2pFH7W+Yf/2GSpP6h NybM/Wgq0fENBaKM+t3Frqgkq0BetRilQk2wLtbqFXBfVEL+9y/l X-Google-Smtp-Source: AGHT+IHuwf5v8s7V3KbWx323aO0dVtPL/Va9rCXnkmlyIBRqfcRtNaZ7kC0WQpGCrrX/ks4HwY371A== X-Received: by 2002:a05:6a00:b55:b0:71e:744a:3fbd with SMTP id d2e1a72fcca58-7206306df29mr7284417b3a.20.1730015494847; Sun, 27 Oct 2024 00:51:34 -0700 (PDT) Received: from fedora.. ([2405:201:d007:50c2:b7e7:6df3:9958:a45d]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-7205794f9a1sm3785551b3a.90.2024.10.27.00.51.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2024 00:51:34 -0700 (PDT) From: Vamsi Krishna Brahmajosyula To: maarten.lankhorst@linux.intel.com, mripard@kernel.org, tzimmermann@suse.de, airlied@gmail.com, simona@ffwll.ch, jani.nikula@linux.intel.com Cc: skhan@linuxfoundation.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] drm/edid: convert drm_parse_hdr_metadata_block to use struct cea_db * Date: Sun, 27 Oct 2024 13:21:08 +0530 Message-ID: <20241027075108.14273-6-vamsikrishna.brahmajosyula@gmail.com> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> References: <20241027075108.14273-1-vamsikrishna.brahmajosyula@gmail.com> 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" Address the following FIXME: convert parsers to use struct cea_db in the parser drm_parse_hdr_metadata_block cea_db contains len and then data. Appropriately change the indices when referring to individual elements (db[n] becomes data[n-1]). Signed-off-by: Vamsi Krishna Brahmajosyula --- drivers/gpu/drm/drm_edid.c | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index d9fa994a3acc..8b2b75885027 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -5418,7 +5418,7 @@ static void drm_calculate_luminance_range(struct drm_= connector *connector) =20 static uint8_t eotf_supported(const u8 *edid_ext) { - return edid_ext[2] & + return edid_ext[1] & (BIT(HDMI_EOTF_TRADITIONAL_GAMMA_SDR) | BIT(HDMI_EOTF_TRADITIONAL_GAMMA_HDR) | BIT(HDMI_EOTF_SMPTE_ST2084) | @@ -5427,28 +5427,29 @@ static uint8_t eotf_supported(const u8 *edid_ext) =20 static uint8_t hdr_metadata_type(const u8 *edid_ext) { - return edid_ext[3] & + return edid_ext[2] & BIT(HDMI_STATIC_METADATA_TYPE1); } =20 static void -drm_parse_hdr_metadata_block(struct drm_connector *connector, const u8 *db) +drm_parse_hdr_metadata_block(struct drm_connector *connector, const struct= cea_db *db) { u16 len; =20 len =3D cea_db_payload_len(db); + const u8 *data =3D cea_db_data(db); =20 connector->hdr_sink_metadata.hdmi_type1.eotf =3D - eotf_supported(db); + eotf_supported(data); connector->hdr_sink_metadata.hdmi_type1.metadata_type =3D - hdr_metadata_type(db); + hdr_metadata_type(data); =20 if (len >=3D 4) - connector->hdr_sink_metadata.hdmi_type1.max_cll =3D db[4]; + connector->hdr_sink_metadata.hdmi_type1.max_cll =3D data[3]; if (len >=3D 5) - connector->hdr_sink_metadata.hdmi_type1.max_fall =3D db[5]; + connector->hdr_sink_metadata.hdmi_type1.max_fall =3D data[4]; if (len >=3D 6) { - connector->hdr_sink_metadata.hdmi_type1.min_cll =3D db[6]; + connector->hdr_sink_metadata.hdmi_type1.min_cll =3D data[5]; =20 /* Calculate only when all values are available */ drm_calculate_luminance_range(connector); @@ -6416,9 +6417,6 @@ static void drm_parse_cea_ext(struct drm_connector *c= onnector, =20 cea_db_iter_edid_begin(drm_edid, &iter); cea_db_iter_for_each(db, &iter) { - /* FIXME: convert parsers to use struct cea_db */ - const u8 *data =3D (const u8 *)db; - if (cea_db_is_hdmi_vsdb(db)) drm_parse_hdmi_vsdb_video(connector, db); else if (cea_db_is_hdmi_forum_vsdb(db) || @@ -6433,7 +6431,7 @@ static void drm_parse_cea_ext(struct drm_connector *c= onnector, else if (cea_db_is_vcdb(db)) drm_parse_vcdb(connector, db); else if (cea_db_is_hdmi_hdr_metadata_block(db)) - drm_parse_hdr_metadata_block(connector, data); + drm_parse_hdr_metadata_block(connector, db); else if (cea_db_tag(db) =3D=3D CTA_DB_VIDEO) parse_cta_vdb(connector, db); else if (cea_db_tag(db) =3D=3D CTA_DB_AUDIO) --=20 2.47.0