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 548C9EB64DD for ; Thu, 17 Aug 2023 11:36:34 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1349221AbjHQLgD (ORCPT ); Thu, 17 Aug 2023 07:36:03 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41386 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1350259AbjHQLfm (ORCPT ); Thu, 17 Aug 2023 07:35:42 -0400 Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.43]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 654D0F7 for ; Thu, 17 Aug 2023 04:35:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1692272139; x=1723808139; h=date:from:to:cc:subject:message-id:references: mime-version:content-transfer-encoding:in-reply-to; bh=U/IB5AY7stuYmqXqKtnDK70cJDZnilSRWZem4li6CXI=; b=j59gnG9qKKd+5J3JBgOOeA6xQ2A33ObsNRPlIuLCwo9+TaVvjvToalTi NVzep8M3OrY/WqVpImXDhg2VZSKCEVjFu9Odx1kHLON+20x0uSMOzzU4I yRcKbElQRefNn6ALt6zERn+3lOz/iwl6NygRZrYIpVvD1CXo7KDyQkiZe s09nQnBRb3qAJCIxCIqp6w18vZt53u5GiCXIexkWXAGblW5jB+Jb0bLLL G6ju58P6FQtk59+d5ZxnkTnO5Wo2tXDwdmCHXgUZv21r5YDA9GEIy9Vxx 01RkvtU1BCGZXXmM4ctkzHHgoaqkiB1lEhIJ3LMQIP1HclLo9phB6DNH6 w==; X-IronPort-AV: E=McAfee;i="6600,9927,10803"; a="459141100" X-IronPort-AV: E=Sophos;i="6.01,180,1684825200"; d="scan'208";a="459141100" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga105.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 17 Aug 2023 04:35:37 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10803"; a="728104374" X-IronPort-AV: E=Sophos;i="6.01,180,1684825200"; d="scan'208";a="728104374" Received: from stinkpipe.fi.intel.com (HELO stinkbox) ([10.237.72.68]) by orsmga007.jf.intel.com with SMTP; 17 Aug 2023 04:35:34 -0700 Received: by stinkbox (sSMTP sendmail emulation); Thu, 17 Aug 2023 14:35:33 +0300 Date: Thu, 17 Aug 2023 14:35:33 +0300 From: Ville =?iso-8859-1?Q?Syrj=E4l=E4?= To: Jani Nikula Cc: dri-devel@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, stable@vger.kernel.org Subject: Re: [PATCH] Revert "drm/edid: Fix csync detailed mode parsing" Message-ID: References: <20230815101907.2900768-1-jani.nikula@intel.com> MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <20230815101907.2900768-1-jani.nikula@intel.com> X-Patchwork-Hint: comment Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org On Tue, Aug 15, 2023 at 01:19:07PM +0300, Jani Nikula wrote: > This reverts commit ca62297b2085b5b3168bd891ca24862242c635a1. > > Commit ca62297b2085 ("drm/edid: Fix csync detailed mode parsing") fixed > EDID detailed mode sync parsing. Unfortunately, there are quite a few > displays out there that have bogus (zero) sync field that are broken by > the change. Zero means analog composite sync, which is not right for > digital displays, and the modes get rejected. Regardless, it used to > work, and it needs to continue to work. Revert the change. Bah. I guess one option would be to quirk the bogus EDIDs, or maybe just ignore bogus sync flags for the eDP preferred mode. But maybe needs a bit more thinking, so Acked-by: Ville Syrjälä > > Rejecting modes with analog composite sync was the part that fixed the > gitlab issue 8146 [1]. We'll need to get back to the drawing board with > that. > > [1] https://gitlab.freedesktop.org/drm/intel/-/issues/8146 > > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8789 > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/8930 > Closes: https://gitlab.freedesktop.org/drm/intel/-/issues/9044 > Fixes: ca62297b2085 ("drm/edid: Fix csync detailed mode parsing") > Cc: Ville Syrjälä > Cc: dri-devel@lists.freedesktop.org > Cc: # v6.4+ > Signed-off-by: Jani Nikula > --- > drivers/gpu/drm/drm_edid.c | 29 ++++++++--------------------- > include/drm/drm_edid.h | 12 +++--------- > 2 files changed, 11 insertions(+), 30 deletions(-) > > diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c > index f95152fac427..340da8257b51 100644 > --- a/drivers/gpu/drm/drm_edid.c > +++ b/drivers/gpu/drm/drm_edid.c > @@ -3457,6 +3457,10 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_connector *connecto > connector->base.id, connector->name); > return NULL; > } > + if (!(pt->misc & DRM_EDID_PT_SEPARATE_SYNC)) { > + drm_dbg_kms(dev, "[CONNECTOR:%d:%s] Composite sync not supported\n", > + connector->base.id, connector->name); > + } > > /* it is incorrect if hsync/vsync width is zero */ > if (!hsync_pulse_width || !vsync_pulse_width) { > @@ -3503,27 +3507,10 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_connector *connecto > if (info->quirks & EDID_QUIRK_DETAILED_SYNC_PP) { > mode->flags |= DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC; > } else { > - switch (pt->misc & DRM_EDID_PT_SYNC_MASK) { > - case DRM_EDID_PT_ANALOG_CSYNC: > - case DRM_EDID_PT_BIPOLAR_ANALOG_CSYNC: > - drm_dbg_kms(dev, "[CONNECTOR:%d:%s] Analog composite sync!\n", > - connector->base.id, connector->name); > - mode->flags |= DRM_MODE_FLAG_CSYNC | DRM_MODE_FLAG_NCSYNC; > - break; > - case DRM_EDID_PT_DIGITAL_CSYNC: > - drm_dbg_kms(dev, "[CONNECTOR:%d:%s] Digital composite sync!\n", > - connector->base.id, connector->name); > - mode->flags |= DRM_MODE_FLAG_CSYNC; > - mode->flags |= (pt->misc & DRM_EDID_PT_HSYNC_POSITIVE) ? > - DRM_MODE_FLAG_PCSYNC : DRM_MODE_FLAG_NCSYNC; > - break; > - case DRM_EDID_PT_DIGITAL_SEPARATE_SYNC: > - mode->flags |= (pt->misc & DRM_EDID_PT_HSYNC_POSITIVE) ? > - DRM_MODE_FLAG_PHSYNC : DRM_MODE_FLAG_NHSYNC; > - mode->flags |= (pt->misc & DRM_EDID_PT_VSYNC_POSITIVE) ? > - DRM_MODE_FLAG_PVSYNC : DRM_MODE_FLAG_NVSYNC; > - break; > - } > + mode->flags |= (pt->misc & DRM_EDID_PT_HSYNC_POSITIVE) ? > + DRM_MODE_FLAG_PHSYNC : DRM_MODE_FLAG_NHSYNC; > + mode->flags |= (pt->misc & DRM_EDID_PT_VSYNC_POSITIVE) ? > + DRM_MODE_FLAG_PVSYNC : DRM_MODE_FLAG_NVSYNC; > } > > set_size: > diff --git a/include/drm/drm_edid.h b/include/drm/drm_edid.h > index 169755d3de19..48e93f909ef6 100644 > --- a/include/drm/drm_edid.h > +++ b/include/drm/drm_edid.h > @@ -61,15 +61,9 @@ struct std_timing { > u8 vfreq_aspect; > } __attribute__((packed)); > > -#define DRM_EDID_PT_SYNC_MASK (3 << 3) > -# define DRM_EDID_PT_ANALOG_CSYNC (0 << 3) > -# define DRM_EDID_PT_BIPOLAR_ANALOG_CSYNC (1 << 3) > -# define DRM_EDID_PT_DIGITAL_CSYNC (2 << 3) > -# define DRM_EDID_PT_CSYNC_ON_RGB (1 << 1) /* analog csync only */ > -# define DRM_EDID_PT_CSYNC_SERRATE (1 << 2) > -# define DRM_EDID_PT_DIGITAL_SEPARATE_SYNC (3 << 3) > -# define DRM_EDID_PT_HSYNC_POSITIVE (1 << 1) /* also digital csync */ > -# define DRM_EDID_PT_VSYNC_POSITIVE (1 << 2) > +#define DRM_EDID_PT_HSYNC_POSITIVE (1 << 1) > +#define DRM_EDID_PT_VSYNC_POSITIVE (1 << 2) > +#define DRM_EDID_PT_SEPARATE_SYNC (3 << 3) > #define DRM_EDID_PT_STEREO (1 << 5) > #define DRM_EDID_PT_INTERLACED (1 << 7) > > -- > 2.39.2 -- Ville Syrjälä Intel