From: Ville Syrjälä <ville.syrjala@xxxxxxxxxxxxxxx> This is a respin of my earlier gen3/4 GPU reset patches. Ken was complaining about the lack of reset on gen4 and I pointed him at my branch, which he used with some success. I had to do a bit of rebasing on the patches, but I left Ken's tested-by in place. Originally we had irq disable/enable in the common codepath but that has since disappeared so I added something for that in the gen3/4 codepath. Works for me so I think the tested-by is still valid. The new thing with this series is the whole modeset_lock stuff, which cures a lot of dmesg warnings from the modeset code. Deadlocks have historically been a problem with this stuff. I'm hoping I didn't introduce any new ones, but this could certainly use someone else thinking through it as well. My 946GZ seems quite happy with this. Only some spurious crc irq warnings and a few vblank sequence number oddities left when I rung through the igt reset/hang tests. I didn't spend any time really looking at those. I was sort of hoping the crtc_disable thing might have fixed the vblank stuff, but no such luck. Pushed here: git://gitorious.org/vsyrjala/linux.git gpu_reset_fixes_7 Ville Syrjälä (6): drm/i915: Fix gen4 GPU reset drm/i915: Restore the display config after a GPU reset on gen4 drm/i915: Implement GPU reset for 915/945 drm/i915: Implement GPU reset for g33 drm/i915: Grab modeset locks for GPU rest on pre-ctg drm/i915: Disable crtcs gracefully before GPU reset on gen3/4 drivers/gpu/drm/i915/i915_irq.c | 5 +- drivers/gpu/drm/i915/i915_reg.h | 3 +- drivers/gpu/drm/i915/intel_display.c | 108 +++++++++++++++++++++++++++++------ drivers/gpu/drm/i915/intel_drv.h | 3 +- drivers/gpu/drm/i915/intel_uncore.c | 63 ++++++++++---------- 5 files changed, 129 insertions(+), 53 deletions(-) -- 2.0.4 _______________________________________________ Intel-gfx mailing list Intel-gfx@xxxxxxxxxxxxxxxxxxxxx http://lists.freedesktop.org/mailman/listinfo/intel-gfx
