[Bug 63921] [snb] GTT mapping fails after GPU hang

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=63921

--- Comment #10 from Nicolas Hillegeer <nicolashillegeer at gmail.com> ---
> Please try this specifically for the reset hang:
> 
> diff --git a/drivers/gpu/drm/i915/i915_gem.c
> b/drivers/gpu/drm/i915/i915_gem.c
> index 8539177..df9dfa5 100644
> --- a/drivers/gpu/drm/i915/i915_gem.c
> +++ b/drivers/gpu/drm/i915/i915_gem.c
> @@ -4036,6 +4036,10 @@ i915_gem_init_hw(struct drm_device *dev)
>                 I915_WRITE(GEN7_MSG_CTL, temp);
>         }
>  
> +       DRM_ERROR("Forcing no wait on PCH (SNB ONLY)\n");
> +       I915_WRITE(ILK_DISPLAY_CHICKEN2,
> +                  I915_READ(ILK_DISPLAY_CHICKEN2) & ~(0x3 << 14));
> +
>         i915_gem_l3_remap(dev);
>  
>         i915_gem_init_swizzling(dev);

Btw I applied this path manually, since I don't know the right magic
incantation for it. It seems that we have slightly different versions of the
kernel (mine is 3.9-rc8, here is the complete, adjusted i915_gem_init_hw
function I'm currently compiling:

int
i915_gem_init_hw(struct drm_device *dev)
{
    drm_i915_private_t *dev_priv = dev->dev_private;
    int ret;

    if (INTEL_INFO(dev)->gen < 6 && !intel_enable_gtt())
        return -EIO;

    if (IS_HASWELL(dev) && (I915_READ(0x120010) == 1))
        I915_WRITE(0x9008, I915_READ(0x9008) | 0xf0000);

    DRM_ERROR("Forcing no wait on PCH (SNB ONLY)\n");
    I915_WRITE( ILK_DISPLAY_CHICKEN2, 
                I915_READ(ILK_DISPLAY_CHICKEN2) & ~(0x3 << 14));

    i915_gem_l3_remap(dev);

    i915_gem_init_swizzling(dev);

    ret = i915_gem_init_rings(dev);
    if (ret)
        return ret;

    /*
     * XXX: There was some w/a described somewhere suggesting loading
     * contexts before PPGTT.
     */
    i915_gem_context_init(dev);
    i915_gem_init_ppgtt(dev);

    return 0;
}

Is it still ok?

-- 
You are receiving this mail because:
You are the QA Contact for the bug.
You are the assignee for the bug.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx-bugs/attachments/20130425/2b476644/attachment.html>