diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2012-09-21 12:16:27 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2012-09-21 12:17:07 +0100 |
| commit | b8967aff382c1b6bef2335dea51c979a3f0800c7 (patch) | |
| tree | 93c281037bcdbbb72b7c51e82cd832c5c37a6d88 | |
| parent | 0be1d964713ca407f029278a8256d02d925dc9da (diff) | |
| download | xorg-driver-xf86-video-intel-b8967aff382c1b6bef2335dea51c979a3f0800c7.tar.gz | |
sna: Do not query for the NULL edid property
If the EDID blob id is set to 0, that means that it does not exist and
so we can safely skip it.
References: https://bugs.freedesktop.org/show_bug.cgi?id=55193
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
| -rw-r--r-- | src/sna/sna_display.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/sna/sna_display.c b/src/sna/sna_display.c index a0129e40..d7b131f8 100644 --- a/src/sna/sna_display.c +++ b/src/sna/sna_display.c @@ -1630,9 +1630,12 @@ sna_output_attach_edid(xf86OutputPtr output) if (strcmp(prop.name, "EDID")) continue; + if (koutput->prop_values[i] == 0) + continue; + VG_CLEAR(blob); blob.length = 0; - blob.data =0; + blob.data = 0; blob.blob_id = koutput->prop_values[i]; if (drmIoctl(sna->kgem.fd, DRM_IOCTL_MODE_GETPROPBLOB, &blob)) |