[src/netbsd-7]: src/sys/external/bsd/drm2/dist/drm/radeon Pull up following r...

[snj <snj%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/94a66891b40c
branches:  netbsd-7
changeset: 799509:94a66891b40c
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Jul 30 15:32:46 2015 +0000

description:
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.

diffstat:

 sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c |  3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diffs (13 lines):

diff -r 3600a5cc867a -r 94a66891b40c sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c
--- a/sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c Thu Jul 30 15:29:25 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/radeon/radeon_connectors.c Thu Jul 30 15:32:46 2015 +0000
@@ -822,7 +822,8 @@
                }
        }
 
-       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