All of lore.kernel.org
 help / color / mirror / Atom feed
From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: [PATCH v2 01/11] drm/edid: don't modify EDID while parsing
Date: Mon, 28 Mar 2022 12:17:15 +0300	[thread overview]
Message-ID: <8dcb5d66d7c0095e51a469dbd5ee0a219de18ab3.1648458971.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1648458971.git.jani.nikula@intel.com>

We'll want to keep the EDID immutable while parsing. Stop modifying the
EDID because of the quirks.

In theory, this does have userspace implications, but the userspace is
supposed to use the modes exposed via KMS API, not by parsing the EDID
directly.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_edid.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index cc7bd58369df..1b552fe54f38 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2740,9 +2740,9 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 		return NULL;
 
 	if (quirks & EDID_QUIRK_135_CLOCK_TOO_HIGH)
-		timing->pixel_clock = cpu_to_le16(1088);
-
-	mode->clock = le16_to_cpu(timing->pixel_clock) * 10;
+		mode->clock = 1088 * 10;
+	else
+		mode->clock = le16_to_cpu(timing->pixel_clock) * 10;
 
 	mode->hdisplay = hactive;
 	mode->hsync_start = mode->hdisplay + hsync_offset;
@@ -2763,14 +2763,14 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 	drm_mode_do_interlace_quirk(mode, pt);
 
 	if (quirks & EDID_QUIRK_DETAILED_SYNC_PP) {
-		pt->misc |= DRM_EDID_PT_HSYNC_POSITIVE | DRM_EDID_PT_VSYNC_POSITIVE;
+		mode->flags |= DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC;
+	} else {
+		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;
 	}
 
-	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:
 	mode->width_mm = pt->width_mm_lo | (pt->width_height_mm_hi & 0xf0) << 4;
 	mode->height_mm = pt->height_mm_lo | (pt->width_height_mm_hi & 0xf) << 8;
-- 
2.30.2


WARNING: multiple messages have this Message-ID (diff)
From: Jani Nikula <jani.nikula@intel.com>
To: dri-devel@lists.freedesktop.org
Cc: jani.nikula@intel.com, intel-gfx@lists.freedesktop.org
Subject: [Intel-gfx] [PATCH v2 01/11] drm/edid: don't modify EDID while parsing
Date: Mon, 28 Mar 2022 12:17:15 +0300	[thread overview]
Message-ID: <8dcb5d66d7c0095e51a469dbd5ee0a219de18ab3.1648458971.git.jani.nikula@intel.com> (raw)
In-Reply-To: <cover.1648458971.git.jani.nikula@intel.com>

We'll want to keep the EDID immutable while parsing. Stop modifying the
EDID because of the quirks.

In theory, this does have userspace implications, but the userspace is
supposed to use the modes exposed via KMS API, not by parsing the EDID
directly.

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
---
 drivers/gpu/drm/drm_edid.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index cc7bd58369df..1b552fe54f38 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -2740,9 +2740,9 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 		return NULL;
 
 	if (quirks & EDID_QUIRK_135_CLOCK_TOO_HIGH)
-		timing->pixel_clock = cpu_to_le16(1088);
-
-	mode->clock = le16_to_cpu(timing->pixel_clock) * 10;
+		mode->clock = 1088 * 10;
+	else
+		mode->clock = le16_to_cpu(timing->pixel_clock) * 10;
 
 	mode->hdisplay = hactive;
 	mode->hsync_start = mode->hdisplay + hsync_offset;
@@ -2763,14 +2763,14 @@ static struct drm_display_mode *drm_mode_detailed(struct drm_device *dev,
 	drm_mode_do_interlace_quirk(mode, pt);
 
 	if (quirks & EDID_QUIRK_DETAILED_SYNC_PP) {
-		pt->misc |= DRM_EDID_PT_HSYNC_POSITIVE | DRM_EDID_PT_VSYNC_POSITIVE;
+		mode->flags |= DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC;
+	} else {
+		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;
 	}
 
-	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:
 	mode->width_mm = pt->width_mm_lo | (pt->width_height_mm_hi & 0xf0) << 4;
 	mode->height_mm = pt->height_mm_lo | (pt->width_height_mm_hi & 0xf) << 8;
-- 
2.30.2


  reply	other threads:[~2022-03-28  9:17 UTC|newest]

Thread overview: 42+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-28  9:17 [PATCH v2 00/11] drm/edid: constify EDID parsing, with some fixes Jani Nikula
2022-03-28  9:17 ` [Intel-gfx] " Jani Nikula
2022-03-28  9:17 ` Jani Nikula [this message]
2022-03-28  9:17   ` [Intel-gfx] [PATCH v2 01/11] drm/edid: don't modify EDID while parsing Jani Nikula
2022-03-28  9:17 ` [PATCH v2 02/11] drm/edid: fix reduced blanking support check Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28 16:31   ` Ville Syrjälä
2022-03-28 16:31     ` [Intel-gfx] " Ville Syrjälä
2022-03-28  9:17 ` [PATCH v2 03/11] drm/edid: slightly restructure timing and non-timing descriptor structs Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28  9:44   ` Jani Nikula
2022-03-28  9:44     ` Jani Nikula
2022-03-28  9:44     ` [Intel-gfx] " Jani Nikula
2022-03-28 11:45   ` kernel test robot
2022-03-28 13:20     ` Jani Nikula
2022-03-28 13:20       ` Jani Nikula
2022-03-28 13:20       ` Jani Nikula
2022-03-28 12:26   ` kernel test robot
2022-03-28 12:26     ` kernel test robot
2022-03-28 12:46   ` kernel test robot
2022-03-28  9:17 ` [PATCH v2 04/11] drm/edid: pass a timing pointer to is_display_descriptor() Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28  9:17 ` [PATCH v2 05/11] drm/edid: use struct detailed_timing member access in is_rb() Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28  9:17 ` [PATCH v2 06/11] drm/edid: use struct detailed_data_monitor_range member access in gtf2 functions Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28  9:17 ` [PATCH v2 07/11] drm/edid: constify struct detailed_timing in lower level parsing Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28  9:17 ` [PATCH v2 08/11] drm/edid: constify struct detailed_timing in parsing callbacks Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28  9:17 ` [PATCH v2 09/11] drm/edid: constify struct edid passed to detailed blocks Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28  9:17 ` [PATCH v2 10/11] drm/edid: constify struct edid passed around in callbacks and closure Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28  9:17 ` [PATCH v2 11/11] drm/edid: add more general struct edid constness in the interfaces Jani Nikula
2022-03-28  9:17   ` [Intel-gfx] " Jani Nikula
2022-03-28 13:26 ` [PATCH v2 00/11] drm/edid: constify EDID parsing, with some fixes Jani Nikula
2022-03-28 13:26   ` [Intel-gfx] " Jani Nikula
2022-03-28 14:47 ` [Intel-gfx] ✗ Fi.CI.CHECKPATCH: warning for " Patchwork
2022-03-28 14:53 ` [Intel-gfx] ✗ Fi.CI.DOCS: " Patchwork
2022-03-28 15:13 ` [Intel-gfx] ✓ Fi.CI.BAT: success " Patchwork
2022-03-28 17:47 ` [Intel-gfx] ✓ Fi.CI.IGT: " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=8dcb5d66d7c0095e51a469dbd5ee0a219de18ab3.1648458971.git.jani.nikula@intel.com \
    --to=jani.nikula@intel.com \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=intel-gfx@lists.freedesktop.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.