lkml.org 
[lkml]   [2010]   [Dec]   [12]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [50/223] drm/i915/overlay: Ensure that the reg_bo is in the GTT prior to writing.
    Date
    2.6.35-longterm review patch.  If anyone has any objections, please let me know.

    ------------------
    From: Chris Wilson <chris@chris-wilson.co.uk>

    commit 0ddc1289f3ffd779779ddd3922f26ae7d0a21604 upstream.

    Just makes sure that writes are not being aliased by the CPU cache and
    do make it out to main memory.

    Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
    Signed-off-by: Andi Kleen <ak@linux.intel.com>
    Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
    Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=24977
    Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

    ---
    drivers/gpu/drm/i915/intel_overlay.c | 8 ++++++++
    1 file changed, 8 insertions(+)

    Index: linux/drivers/gpu/drm/i915/intel_overlay.c
    ===================================================================
    --- linux.orig/drivers/gpu/drm/i915/intel_overlay.c
    +++ linux/drivers/gpu/drm/i915/intel_overlay.c
    @@ -1364,6 +1364,12 @@ void intel_setup_overlay(struct drm_devi
    goto out_free_bo;
    }
    overlay->flip_addr = overlay->reg_bo->gtt_offset;
    +
    + ret = i915_gem_object_set_to_gtt_domain(reg_bo, true);
    + if (ret) {
    + DRM_ERROR("failed to move overlay register bo into the GTT\n");
    + goto out_unpin_bo;
    + }
    } else {
    ret = i915_gem_attach_phys_object(dev, reg_bo,
    I915_GEM_PHYS_OVERLAY_REGS);
    @@ -1395,6 +1401,8 @@ void intel_setup_overlay(struct drm_devi
    DRM_INFO("initialized overlay support\n");
    return;

    +out_unpin_bo:
    + i915_gem_object_unpin(reg_bo);
    out_free_bo:
    drm_gem_object_unreference(reg_bo);
    out_free:

    \
     
     \ /
      Last update: 2010-12-13 00:49    [W:4.081 / U:0.396 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site