Module Name: src
Committed By: abs
Date: Sun Jul 26 15:30:36 UTC 2015
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: intel_pm.c
Log Message:
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)
pullup#7
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.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/i915/intel_pm.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.6 src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.7
--- src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c:1.6 Wed Feb 25 13:06:13 2015
+++ src/sys/external/bsd/drm2/dist/drm/i915/intel_pm.c Sun Jul 26 15:30:36 2015
@@ -3625,6 +3625,8 @@ static void valleyview_check_pctx(struct
{
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);
}
