• Daniel Vetter's avatar
    drm/i915: Fix up the forcewake timer initialization · 05efeebd
    Daniel Vetter authored
    This is a regression introduced in
    
    commit 0294ae7b
    Author: Chris Wilson <chris@chris-wilson.co.uk>
    Date:   Thu Mar 13 12:00:29 2014 +0000
    
        drm/i915: Consolidate forcewake resetting to a single function
    
    The reordered setup sequence ended up calling del_timer_sync before
    the timer was set up correctly, resulting in endless hilarity when
    loading the driver.
    
    Compared to Ben's patch (which moved around the setup_timer call to
    sanitize_early) this moves the sanitize_early call around in the
    driver load call. This way we avoid calling setup_timer again in the
    resume code (where we also call sanitize_early).
    
    Cc: Chris Wilson <chris@chris-wilson.co.uk>
    Cc: Mika Kuoppala <mika.kuoppala@intel.com>
    Cc: Ben Widawsky <benjamin.widawsky@intel.com>
    Tested-by: default avatarRodrigo Vivi <rodrigo.vivi@gmail.com>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=76242Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
    05efeebd
i915_dma.c 54.4 KB