|
 |
ac27d7 |
From 09bf64d69d97172f22fe08eb495bf50f920ae9ec Mon Sep 17 00:00:00 2001
|
|
|
ac27d7 |
From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com>
|
|
|
ac27d7 |
Date: Tue, 31 May 2016 11:11:21 +0300
|
|
|
ac27d7 |
Subject: [PATCH] sna: Avoid clobbering output physical size with
|
|
|
ac27d7 |
xf86OutputSetEDID()
|
|
|
ac27d7 |
MIME-Version: 1.0
|
|
|
ac27d7 |
Content-Type: text/plain; charset=UTF-8
|
|
|
ac27d7 |
Content-Transfer-Encoding: 8bit
|
|
|
ac27d7 |
|
|
|
ac27d7 |
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
|
|
|
ac27d7 |
---
|
|
|
ac27d7 |
src/sna/sna_display.c | 6 ++++++
|
|
|
ac27d7 |
1 file changed, 6 insertions(+)
|
|
|
ac27d7 |
|
|
|
ac27d7 |
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c
|
|
|
ac27d7 |
index 10d33f2..57de410 100644
|
|
|
ac27d7 |
--- a/src/sna/sna_display.c
|
|
|
ac27d7 |
+++ b/src/sna/sna_display.c
|
|
|
ac27d7 |
@@ -3576,6 +3576,7 @@ sna_output_attach_edid(xf86OutputPtr output)
|
|
|
ac27d7 |
{
|
|
|
ac27d7 |
struct sna *sna = to_sna(output->scrn);
|
|
|
ac27d7 |
struct sna_output *sna_output = output->driver_private;
|
|
|
ac27d7 |
+ unsigned old_mm_width, old_mm_height;
|
|
|
ac27d7 |
struct drm_mode_get_blob blob;
|
|
|
ac27d7 |
void *old, *raw = NULL;
|
|
|
ac27d7 |
xf86MonPtr mon = NULL;
|
|
|
ac27d7 |
@@ -3678,12 +3679,17 @@ skip_read:
|
|
|
ac27d7 |
}
|
|
|
ac27d7 |
|
|
|
ac27d7 |
done:
|
|
|
ac27d7 |
+ output = sna_output->base;
|
|
|
ac27d7 |
+ old_mm_width = output->mm_width;
|
|
|
ac27d7 |
+ old_mm_height = output->mm_height;
|
|
|
ac27d7 |
sna_output_set_parsed_edid(output, mon);
|
|
|
ac27d7 |
if (raw) {
|
|
|
ac27d7 |
sna_output->edid_raw = raw;
|
|
|
ac27d7 |
sna_output->edid_len = blob.length;
|
|
|
ac27d7 |
sna_output->edid_blob_id = blob.blob_id;
|
|
|
ac27d7 |
}
|
|
|
ac27d7 |
+ output->mm_width = old_mm_width;
|
|
|
ac27d7 |
+ output->mm_height = old_mm_height;
|
|
|
ac27d7 |
}
|
|
|
ac27d7 |
|
|
|
ac27d7 |
static void
|
|
|
ac27d7 |
--
|
|
|
ac27d7 |
2.7.4
|
|
|
ac27d7 |
|