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 gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id C3636C433EF for ; Tue, 25 Jan 2022 12:35:32 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 4D19510EF0B; Tue, 25 Jan 2022 12:35:32 +0000 (UTC) Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by gabe.freedesktop.org (Postfix) with ESMTPS id 4845810EEFA; Tue, 25 Jan 2022 12:35:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1643114131; x=1674650131; h=from:to:cc:subject:in-reply-to:references:date: message-id:mime-version:content-transfer-encoding; bh=o5TdtsHZe7kwjYyqWeQhslE5X0C70dUziNr8LYxQRmA=; b=Y9M8MeZfI2eEZ6fUpVxf2wr12Sa0IdTEBglaFAd8fhVE7FGUoI1MdBsB UnhWsHJ/rLc7zFrdGfuWG65o2s/b4UWZQ1LHbH5hx/9uIqoOft9PlSqD4 694zZI4MwM1DIk957yhkGPFepuU/KK18bnarFiaBmF3MJHsg0gSIHk1Go 85gxwyF+abAKAog3shjx1rEuws6zqdm6vjTXACgtw0Hm+V/Dq5X16etup 0zLLK/vyh7B7DWGz+xoras/Z2wnBhpugdXOuZeL+Uw7/oI5XVjPmPbL2f VFzD/7NYX5xvkCjcz4elu+FJ1M2dwfWaitUWDiBCplwGlQfvZK8LEdDOt Q==; X-IronPort-AV: E=McAfee;i="6200,9189,10237"; a="246070971" X-IronPort-AV: E=Sophos;i="5.88,314,1635231600"; d="scan'208";a="246070971" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2022 04:35:30 -0800 X-IronPort-AV: E=Sophos;i="5.88,314,1635231600"; d="scan'208";a="534708149" Received: from skirillo-mobl1.ccr.corp.intel.com (HELO localhost) ([10.252.32.77]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 25 Jan 2022 04:35:27 -0800 From: Jani Nikula To: Yaroslav Bolyukin , linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org In-Reply-To: <87lez41eon.fsf@intel.com> Organization: Intel Finland Oy - BIC 0357606-4 - Westendinkatu 7, 02160 Espoo References: <20220118215956.17229-1-iam@lach.pw> <20220123191955.57994-1-iam@lach.pw> <87lez41eon.fsf@intel.com> Date: Tue, 25 Jan 2022 14:35:12 +0200 Message-ID: <87zgnkyovz.fsf@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Subject: Re: [Intel-gfx] [PATCH v2] drm/edid: Support type 7 timings X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: David Airlie , intel-gfx@lists.freedesktop.org, Maxime Ripard , Thomas Zimmermann , Yaroslav Bolyukin Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" On Tue, 25 Jan 2022, Jani Nikula wrote: > On Sun, 23 Jan 2022, Yaroslav Bolyukin wrote: >> Per VESA DisplayID Standard v2.0: Type VII Timing =E2=80=93 Detailed Tim= ing Data >> >> Definitions were already provided as type I, but not used >> >> Signed-off-by: Yaroslav Bolyukin > > Reviewed-by: Jani Nikula And pushed to drm-misc-next, thanks for the patch. BR, Jani. > >> --- >> drivers/gpu/drm/drm_edid.c | 12 ++++++++---- >> 1 file changed, 8 insertions(+), 4 deletions(-) >> >> diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c >> index 12893e7be..5f2ae5bfa 100644 >> --- a/drivers/gpu/drm/drm_edid.c >> +++ b/drivers/gpu/drm/drm_edid.c >> @@ -5405,7 +5405,8 @@ u32 drm_add_display_info(struct drm_connector *con= nector, const struct edid *edi >> } >>=20=20 >> static struct drm_display_mode *drm_mode_displayid_detailed(struct drm_= device *dev, >> - struct displayid_detailed_timings_1 *timings) >> + struct displayid_detailed_timings_1 *timings, >> + bool type_7) >> { >> struct drm_display_mode *mode; >> unsigned pixel_clock =3D (timings->pixel_clock[0] | >> @@ -5426,7 +5427,8 @@ static struct drm_display_mode *drm_mode_displayid= _detailed(struct drm_device *d >> if (!mode) >> return NULL; >>=20=20 >> - mode->clock =3D pixel_clock * 10; >> + /* resolution is kHz for type VII, and 10 kHz for type I */ >> + mode->clock =3D type_7 ? pixel_clock : pixel_clock * 10; >> mode->hdisplay =3D hactive; >> mode->hsync_start =3D mode->hdisplay + hsync; >> mode->hsync_end =3D mode->hsync_start + hsync_width; >> @@ -5457,6 +5459,7 @@ static int add_displayid_detailed_1_modes(struct d= rm_connector *connector, >> int num_timings; >> struct drm_display_mode *newmode; >> int num_modes =3D 0; >> + bool type_7 =3D block->tag =3D=3D DATA_BLOCK_2_TYPE_7_DETAILED_TIMING; >> /* blocks must be multiple of 20 bytes length */ >> if (block->num_bytes % 20) >> return 0; >> @@ -5465,7 +5468,7 @@ static int add_displayid_detailed_1_modes(struct d= rm_connector *connector, >> for (i =3D 0; i < num_timings; i++) { >> struct displayid_detailed_timings_1 *timings =3D &det->timings[i]; >>=20=20 >> - newmode =3D drm_mode_displayid_detailed(connector->dev, timings); >> + newmode =3D drm_mode_displayid_detailed(connector->dev, timings, type= _7); >> if (!newmode) >> continue; >>=20=20 >> @@ -5484,7 +5487,8 @@ static int add_displayid_detailed_modes(struct drm= _connector *connector, >>=20=20 >> displayid_iter_edid_begin(edid, &iter); >> displayid_iter_for_each(block, &iter) { >> - if (block->tag =3D=3D DATA_BLOCK_TYPE_1_DETAILED_TIMING) >> + if (block->tag =3D=3D DATA_BLOCK_TYPE_1_DETAILED_TIMING || >> + block->tag =3D=3D DATA_BLOCK_2_TYPE_7_DETAILED_TIMING) >> num_modes +=3D add_displayid_detailed_1_modes(connector, block); >> } >> displayid_iter_end(&iter); >> >> base-commit: 99613159ad749543621da8238acf1a122880144e --=20 Jani Nikula, Intel Open Source Graphics Center