From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id C7D7FC433F5 for ; Mon, 14 Feb 2022 12:12:52 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352723AbiBNMM6 (ORCPT ); Mon, 14 Feb 2022 07:12:58 -0500 Received: from mxb-00190b01.gslb.pphosted.com ([23.128.96.19]:47500 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352700AbiBNMMz (ORCPT ); Mon, 14 Feb 2022 07:12:55 -0500 Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B585C48E73 for ; Mon, 14 Feb 2022 04:12:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1644840767; x=1676376767; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version; bh=/Bu4KOweNQGoBPbCgK6zUFcRkFzJe0NMscsE3+j7lc8=; b=ZId5BL0tgOBekwefMlJTSBvCoz6qyRD4ahJntGuVq8VNd7YB7fF80pJT Le673BMGpBfuRPSkLJqjRr32c7JvUkJiTkjRUA1yIw5PghWh3naoxnx/A k2rTB54t3R7BDvyYHWifMMoZYISclVH/mPgMdS49cFDYZGo+PKBAHYrsN soGkW9SyRSx4dX/XnLxAi9QmjkcdQxn9xRJ7dmSxdyyNvXtJ89OVuk83P CE4JRhtyro3XgmRMpYPE5srycMU4+t1J83WKmUGfYkDLtFip7C+s6BTG7 g8NJnvLdzSqpGsJ4ScqpnEWq2sEygBJni0AbTeZ+BS7Soz5+g2XVCKGfi g==; X-IronPort-AV: E=McAfee;i="6200,9189,10257"; a="336503519" X-IronPort-AV: E=Sophos;i="5.88,367,1635231600"; d="scan'208";a="336503519" Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2022 04:12:47 -0800 X-IronPort-AV: E=Sophos;i="5.88,367,1635231600"; d="scan'208";a="635136813" Received: from unknown (HELO localhost) ([10.252.13.38]) by orsmga004-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Feb 2022 04:12:43 -0800 From: Jani Nikula To: Yaroslav Bolyukin , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org Cc: Thomas Zimmermann , David Airlie , Rodrigo Siqueira , "Pan, Xinhui" , Leo Li , Alex Deucher , Christian =?utf-8?Q?K=C3=B6nig?= , Yaroslav Bolyukin Subject: Re: [PATCH 1/2] edid: parse DRM VESA dsc bpp target In-Reply-To: <20220213133128.5833-1-iam@lach.pw> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220213133128.5833-1-iam@lach.pw> Date: Mon, 14 Feb 2022 14:12:41 +0200 Message-ID: <877d9x7ikm.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Subject prefix should be drm/edid. On Sun, 13 Feb 2022, Yaroslav Bolyukin wrote: > As per DisplayID v2.0 Errata E9 spec Please be more elaborate about the changes. You also need to update drm_reset_display_info(). BR, Jani. > Signed-off-by: Yaroslav Bolyukin > --- > drivers/gpu/drm/drm_edid.c | 31 ++++++++++++++++++++----------- > include/drm/drm_connector.h | 6 ++++++ > include/drm/drm_displayid.h | 4 ++++ > 3 files changed, 30 insertions(+), 11 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index a7663f9a1..83ee685c8 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -5270,7 +5270,7 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector, > if (oui(vesa->oui[0], vesa->oui[1], vesa->oui[2]) != VESA_IEEE_OUI) > return; > > - if (sizeof(*vesa) != sizeof(*block) + block->num_bytes) { > + if (block->num_bytes < 5) { > drm_dbg_kms(connector->dev, "Unexpected VESA vendor block size\n"); > return; > } > @@ -5290,20 +5290,29 @@ static void drm_parse_vesa_mso_data(struct drm_connector *connector, > break; > } > > - if (!info->mso_stream_count) { > - info->mso_pixel_overlap = 0; > - return; > + info->mso_pixel_overlap = 0; > + > + if (info->mso_stream_count) { > + info->mso_pixel_overlap = FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->mso); > + if (info->mso_pixel_overlap > 8) { > + drm_dbg_kms(connector->dev, "Reserved MSO pixel overlap value %u\n", > + info->mso_pixel_overlap); > + info->mso_pixel_overlap = 8; > + } > + > + drm_dbg_kms(connector->dev, "MSO stream count %u, pixel overlap %u\n", > + info->mso_stream_count, info->mso_pixel_overlap); > } > > - info->mso_pixel_overlap = FIELD_GET(DISPLAYID_VESA_MSO_OVERLAP, vesa->mso); > - if (info->mso_pixel_overlap > 8) { > - drm_dbg_kms(connector->dev, "Reserved MSO pixel overlap value %u\n", > - info->mso_pixel_overlap); > - info->mso_pixel_overlap = 8; > + if (block->num_bytes < 7) { > + /* DSC bpp is optional */ > + return; > } > > - drm_dbg_kms(connector->dev, "MSO stream count %u, pixel overlap %u\n", > - info->mso_stream_count, info->mso_pixel_overlap); > + info->dp_dsc_bpp = FIELD_GET(DISPLAYID_VESA_DSC_BPP_INT, vesa->dsc_bpp_int) * 16 + > + FIELD_GET(DISPLAYID_VESA_DSC_BPP_FRACT, vesa->dsc_bpp_fract); > + > + drm_dbg_kms(connector->dev, "DSC bits per pixel %u\n", info->dp_dsc_bpp); > } > > static void drm_update_mso(struct drm_connector *connector, const struct edid *edid) > diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h > index 5e36eb3df..04ef0e995 100644 > --- a/include/drm/drm_connector.h > +++ b/include/drm/drm_connector.h > @@ -634,6 +634,12 @@ struct drm_display_info { > * @mso_pixel_overlap: eDP MSO segment pixel overlap, 0-8 pixels. > */ > u8 mso_pixel_overlap; > + > + /** > + * @dp_dsc_bpp: DP Display-Stream-Compression (DSC) timing's target > + * DST bits per pixel in 6.4 fixed point format. 0 means undefined > + */ > + u16 dp_dsc_bpp; > }; > > int drm_display_info_set_bus_formats(struct drm_display_info *info, > diff --git a/include/drm/drm_displayid.h b/include/drm/drm_displayid.h > index 7ffbd9f7b..1be6deddc 100644 > --- a/include/drm/drm_displayid.h > +++ b/include/drm/drm_displayid.h > @@ -131,12 +131,16 @@ struct displayid_detailed_timing_block { > > #define DISPLAYID_VESA_MSO_OVERLAP GENMASK(3, 0) > #define DISPLAYID_VESA_MSO_MODE GENMASK(6, 5) > +#define DISPLAYID_VESA_DSC_BPP_INT GENMASK(5, 0) > +#define DISPLAYID_VESA_DSC_BPP_FRACT GENMASK(3, 0) > > struct displayid_vesa_vendor_specific_block { > struct displayid_block base; > u8 oui[3]; > u8 data_structure_type; > u8 mso; > + u8 dsc_bpp_int; > + u8 dsc_bpp_fract; > } __packed; > > /* DisplayID iteration */ > > base-commit: 1528038385c0a706aac9ac165eeb24044fef6825 -- Jani Nikula, Intel Open Source Graphics Center