Module Name: src
Committed By: snj
Date: Thu Jul 30 15:32:46 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/radeon [netbsd-7]:
radeon_connectors.c
Log Message:
Pull up following revision(s) (requested by riastradh in ticket #897):
sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c: revisions
1.2, 1.3
Don't pass along null encoder. Noted by Coverity, CID 113253.
--
Add XXX comment for previous.
To generate a diff of this commit:
cvs rdiff -u -r1.1.1.1 -r1.1.1.1.4.1 \
src/sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c
diff -u src/sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c:1.1.1.1 src/sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c:1.1.1.1.4.1
--- src/sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c:1.1.1.1 Wed Jul 16 19:35:28 2014
+++ src/sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c Thu Jul 30 15:32:46 2015
@@ -822,7 +822,8 @@ radeon_vga_detect(struct drm_connector *
}
}
- if (ret == connector_status_connected)
+ /* XXX Can encoder be null if the connector is connected here? */
+ if (ret == connector_status_connected && encoder)
ret = radeon_connector_analog_encoder_conflict_solve(connector, encoder, ret, true);
/* RN50 and some RV100 asics in servers often have a hardcoded EDID in the
