lkml.org 
[lkml]   [2014]   [Feb]   [7]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH v4 08/11] drm/i915: Make intel_plane_restore() return an error
    Date
    From: Ville Syrjälä <ville.syrjala@linux.intel.com>

    Propagate the error from intel_update_plane() up through
    intel_plane_restore() to the caller. This will be used for
    rollback purposes when setting properties fails.

    Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
    Tested-by: Sagar Kamble <sagar.a.kamble@intel.com>
    ---
    drivers/gpu/drm/i915/intel_drv.h | 2 +-
    drivers/gpu/drm/i915/intel_sprite.c | 14 +++++++-------
    2 files changed, 8 insertions(+), 8 deletions(-)

    diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
    index 85864fc..7a79b8e 100644
    --- a/drivers/gpu/drm/i915/intel_drv.h
    +++ b/drivers/gpu/drm/i915/intel_drv.h
    @@ -897,7 +897,7 @@ bool intel_sdvo_init(struct drm_device *dev, uint32_t sdvo_reg, bool is_sdvob);
    int intel_plane_init(struct drm_device *dev, enum pipe pipe, int plane);
    void intel_flush_primary_plane(struct drm_i915_private *dev_priv,
    enum plane plane);
    -void intel_plane_restore(struct drm_plane *plane);
    +int intel_plane_restore(struct drm_plane *plane);
    void intel_plane_disable(struct drm_plane *plane);
    int intel_sprite_set_colorkey(struct drm_device *dev, void *data,
    struct drm_file *file_priv);
    diff --git a/drivers/gpu/drm/i915/intel_sprite.c b/drivers/gpu/drm/i915/intel_sprite.c
    index 477d4d7..511934c 100644
    --- a/drivers/gpu/drm/i915/intel_sprite.c
    +++ b/drivers/gpu/drm/i915/intel_sprite.c
    @@ -1047,18 +1047,18 @@ out_unlock:
    return ret;
    }

    -void intel_plane_restore(struct drm_plane *plane)
    +int intel_plane_restore(struct drm_plane *plane)
    {
    struct intel_plane *intel_plane = to_intel_plane(plane);

    if (!plane->crtc || !plane->fb)
    - return;
    + return 0;

    - intel_update_plane(plane, plane->crtc, plane->fb,
    - intel_plane->crtc_x, intel_plane->crtc_y,
    - intel_plane->crtc_w, intel_plane->crtc_h,
    - intel_plane->src_x, intel_plane->src_y,
    - intel_plane->src_w, intel_plane->src_h);
    + return intel_update_plane(plane, plane->crtc, plane->fb,
    + intel_plane->crtc_x, intel_plane->crtc_y,
    + intel_plane->crtc_w, intel_plane->crtc_h,
    + intel_plane->src_x, intel_plane->src_y,
    + intel_plane->src_w, intel_plane->src_h);
    }

    void intel_plane_disable(struct drm_plane *plane)
    --
    1.8.5
    --
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2014-02-07 15:21    [W:2.086 / U:0.120 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site