| Summary: | [PNV/ILK Regression]System boot fail | ||||||||
|---|---|---|---|---|---|---|---|---|---|
| Product: | DRI | Reporter: | lu hua <huax.lu> | ||||||
| Component: | DRM/Intel | Assignee: | Daniel Vetter <daniel> | ||||||
| Status: | CLOSED FIXED | QA Contact: | Intel GFX Bugs mailing list <intel-gfx-bugs> | ||||||
| Severity: | blocker | ||||||||
| Priority: | highest | CC: | intel-gfx-bugs, jinxianx.guo | ||||||
| Version: | unspecified | ||||||||
| Hardware: | All | ||||||||
| OS: | Linux (All) | ||||||||
| Whiteboard: | |||||||||
| i915 platform: | i915 features: | ||||||||
| Attachments: |
|
||||||||
We are all idiots. I honestly thought that santize_enable_ppgtt() called in i915_drv.c diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c
index 670ee9f4511b..1b3efc84fdc9 100644
--- a/drivers/gpu/drm/i915/i915_gem_gtt.c
+++ b/drivers/gpu/drm/i915/i915_gem_gtt.c
@@ -1225,14 +1225,6 @@ int i915_gem_init_ppgtt(struct drm_device *dev, struct i915_hw_ppgtt *ppgtt)
struct drm_i915_private *dev_priv = dev->dev_private;
int ret = 0;
- /*
- * i915.enable_ppgtt is read-only, so do an early pass to validate the
- * user's requested state against the hardware/driver capabilities. We
- * do this now so that we can print out any log messages once rather
- * than every time we check intel_enable_ppgtt().
- */
- i915.enable_ppgtt = sanitize_enable_ppgtt(dev, i915.enable_ppgtt);
-
ppgtt->base.dev = dev;
ppgtt->base.scratch = dev_priv->gtt.base.scratch;
@@ -2050,6 +2042,14 @@ int i915_gem_gtt_init(struct drm_device *dev)
DRM_DEBUG_DRIVER("GMADR size = %ldM\n", gtt->mappable_end >> 20);
DRM_DEBUG_DRIVER("GTT stolen size = %zdM\n", gtt->stolen_size >> 20);
+ /*
+ * i915.enable_ppgtt is read-only, so do an early pass to validate the
+ * user's requested state against the hardware/driver capabilities. We
+ * do this now so that we can print out any log messages once rather
+ * than every time we check intel_enable_ppgtt().
+ */
+ i915.enable_ppgtt = sanitize_enable_ppgtt(dev, i915.enable_ppgtt);
+
return 0;
}
commit 31d584c13bcecf709b824987d305e5f61386713c Author: Daniel Vetter <daniel.vetter@ffwll.ch> Date: Wed Apr 23 20:01:32 2014 +0200 drm/i915: Sanitize the enable_ppgtt module option once yanked out of -fixes and -nightly. Please retest. Fixed on latest -nightly and -fixes kernel. Verified.Fixed. Reopening to test the fixed patch, we need it for a regression fix. Created attachment 98170 [details] [review] fixed patch Lu, please test the attached patch on ilk/pnv to make sure it works now. (In reply to comment #8) > Created attachment 98170 [details] [review] [review] > fixed patch > > Lu, please test the attached patch on ilk/pnv to make sure it works now. I pushed the patch to drm-intel-fixes, please re-test that. Thanks. (In reply to comment #9) > (In reply to comment #8) > > Created attachment 98170 [details] [review] [review] [review] > > fixed patch > > > > Lu, please test the attached patch on ilk/pnv to make sure it works now. > > I pushed the patch to drm-intel-fixes, please re-test that. Thanks. It works well on latest -fixes kernel(commit cfa7c862982b431ad). Thanks, closing. Verified.Fixed. Closing verified+fixed. |
Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.
Created attachment 97943 [details] dmesg System Environment: -------------------------- Platform: Pineview/Ironlake Kernel: (drm-intel-nightly)7fa20daad840000b56924136d02a8d33265f29ca Bug detailed description: ------------------------- System boot fail on Pineview and Ironlake with -fixes and -nightly kernel, It works well on -queued kernel. The latest known good commit: 58b87a391d67e35e3aa1fc6c80890b491d73ad46 The latest known bad commit: ec37494cb11eac1e5ceed8a7b060bc558a9b1f3e Reproduce steps: ---------------------------- 1. clean boot system