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

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

details:   https://anonhg.NetBSD.org/src/rev/b769b4766295
branches:  netbsd-7
changeset: 799507:b769b4766295
user:      snj <snj%NetBSD.org@localhost>
date:      Thu Jul 30 15:21:50 2015 +0000

description:
Pull up following revision(s) (requested by abs in ticket #892):
        sys/external/bsd/drm2/dist/drm/i915/intel_pm.c: revision 1.7
Avoid NULL dev_priv->vlv_pctx-> deref in a WARN check on Lenovo B50-30,
add an additional check for the NULL dev_priv->vlv_pctx.
System now boots (though does not recognise any of the USB(3) ports)

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c |  2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diffs (12 lines):

diff -r 8668f5de6908 -r b769b4766295 sys/external/bsd/drm2/dist/drm/i915/intel_pm.c
--- a/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c    Thu Jul 30 15:19:07 2015 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c    Thu Jul 30 15:21:50 2015 +0000
@@ -3625,6 +3625,8 @@
 {
        unsigned long pctx_addr = I915_READ(VLV_PCBR) & ~4095;
 
+       if (WARN_ON(!dev_priv->vlv_pctx))
+               return;
        WARN_ON(pctx_addr != dev_priv->mm.stolen_base +
                             dev_priv->vlv_pctx->stolen->start);
 }