From 9fe57ade94ac2f260b7a6b618be576dba7968dbd Mon Sep 17 00:00:00 2001
From: Luca Boccassi <luca.boccassi@gmail.com>
Date: Mon, 2 Mar 2015 21:08:09 +0000
Subject: [PATCH] Backport fix for null pointers dereferences
Cherry picked from commit:
commit 908520a7dacade8b6716e7c30549847464a33a81
Author: Dave Airlie <airlied@redhat.com>
Date: Wed Sep 3 10:43:21 2014 +1000
uxa: add MST support.
Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
---
src/uxa/intel_display.c | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/src/uxa/intel_display.c b/src/uxa/intel_display.c
index b4f7e87..d584741 100644
--- a/src/uxa/intel_display.c
+++ b/src/uxa/intel_display.c
@@ -468,6 +468,9 @@ intel_crtc_apply(xf86CrtcPtr crtc)
continue;
intel_output = output->driver_private;
+ if (!intel_output->mode_output)
+ return FALSE;
+
output_ids[output_count] =
intel_output->mode_output->connector_id;
output_count++;
@@ -924,6 +927,11 @@ intel_output_attach_edid(xf86OutputPtr output)
xf86MonPtr mon = NULL;
int i;
+ if (!koutput) {
+ xf86OutputSetEDID(output, mon);
+ return;
+ }
+
/* look for an EDID property */
for (i = 0; i < koutput->count_props; i++) {
drmModePropertyPtr props;
@@ -1013,6 +1021,9 @@ intel_output_get_modes(xf86OutputPtr output)
intel_output_attach_edid(output);
+ if (!koutput)
+ return;
+
/* modes should already be available */
for (i = 0; i < koutput->count_modes; i++) {
DisplayModePtr Mode;
@@ -1104,6 +1115,9 @@ intel_output_dpms(xf86OutputPtr output, int dpms)
struct intel_mode *mode = intel_output->mode;
int i;
+ if (!koutput)
+ return;
+
for (i = 0; i < koutput->count_props; i++) {
drmModePropertyPtr props;
--
2.1.4
Attachment:
signature.asc
Description: This is a digitally signed message part