Mesa (master): st/dri: check pscreen is valid before querying param

[Dave Airlie]

Module: Mesa
Branch: master
Commit: 563706c14641fde2ab604d590b5425680354f280
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=563706c14641fde2ab604d590b5425680354f280

Author: Dave Airlie <airlied at gmail.com>
Date:   Wed Jun 10 13:51:59 2015 +1000

st/dri: check pscreen is valid before querying param

we don't check the validity of pscreen until dri_init_screen_helper

hit this trying to init glamor on a device with no driver (udl).

Acked-by: Michel Dänzer <michel.daenzer at amd.com>
Signed-off-by: Dave Airlie <airlied at redhat.com>

---

 src/gallium/state_trackers/dri/dri2.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c
index 792d565..8d93f78 100644
--- a/src/gallium/state_trackers/dri/dri2.c
+++ b/src/gallium/state_trackers/dri/dri2.c
@@ -1483,7 +1483,7 @@ dri2_init_screen(__DRIscreen * sPriv)
       }
    }
 
-   if (pscreen->get_param(pscreen, PIPE_CAP_DEVICE_RESET_STATUS_QUERY)) {
+   if (pscreen && pscreen->get_param(pscreen, PIPE_CAP_DEVICE_RESET_STATUS_QUERY)) {
       sPriv->extensions = dri_robust_screen_extensions;
       screen->has_reset_status_query = true;
    }