]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/i915: Initialize overlay->last_flip properly
authorVille Syrjälä <ville.syrjala@linux.intel.com>
Wed, 21 Dec 2016 14:45:47 +0000 (16:45 +0200)
committerJani Nikula <jani.nikula@intel.com>
Tue, 3 Jan 2017 09:41:05 +0000 (11:41 +0200)
Initialize overlay->last_flip properly instead of leaving it zeroed.

Cc: stable@vger.kernel.org
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Fixes: 0d9bdd886f29 ("drm/i915: Convert intel_overlay to request tracking")
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/20161221144547.27319-1-ville.syrjala@linux.intel.com
(cherry picked from commit 330afdb1df0f3fb48583105493a8f4f8d9e3af36)
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
drivers/gpu/drm/i915/intel_overlay.c

index fd0e4dac7cc16f35ff658466bc107a7296407354..ef7dfea4024261f7699defd88d79d54f83121ed8 100644 (file)
@@ -1430,6 +1430,8 @@ void intel_setup_overlay(struct drm_i915_private *dev_priv)
        overlay->contrast = 75;
        overlay->saturation = 146;
 
+       init_request_active(&overlay->last_flip, NULL);
+
        regs = intel_overlay_map_regs(overlay);
        if (!regs)
                goto out_unpin_bo;