Reviewed-by: Rodrigo Vivi <rodrigo.vivi at gmail.com>
On Tue, Mar 26, 2013 at 1:25 PM, Jesse Barnes <jbarnes at virtuousgeek.org>wrote:
> To be used to restore sprite state on resume.
>
> v2: move sprite tracking bits up so we don't track modified sprite state
> v3: use src_x/y in sprite suspend/resume code (Ville)
>
> Signed-off-by: Jesse Barnes <jbarnes at virtuousgeek.org>
> ---
> drivers/gpu/drm/i915/intel_drv.h | 5 +++++
> drivers/gpu/drm/i915/intel_sprite.c | 23 +++++++++++++++++++++++
> 2 files changed, 28 insertions(+)
>
> diff --git a/drivers/gpu/drm/i915/intel_drv.h
> b/drivers/gpu/drm/i915/intel_drv.h
> index 599e978..276f665 100644
> --- a/drivers/gpu/drm/i915/intel_drv.h
> +++ b/drivers/gpu/drm/i915/intel_drv.h
> @@ -247,6 +247,10 @@ struct intel_plane {
> bool can_scale;
> int max_downscale;
> u32 lut_r[1024], lut_g[1024], lut_b[1024];
> + int crtc_x, crtc_y;
> + unsigned int crtc_w, crtc_h;
> + uint32_t src_x, src_y;
> + uint32_t src_w, src_h;
> void (*update_plane)(struct drm_plane *plane,
> struct drm_framebuffer *fb,
> struct drm_i915_gem_object *obj,
> @@ -532,6 +536,7 @@ extern bool intel_encoder_check_is_cloned(struct
> intel_encoder *encoder);
> extern void intel_connector_dpms(struct drm_connector *, int mode);
> extern bool intel_connector_get_hw_state(struct intel_connector
> *connector);
> extern void intel_modeset_check_state(struct drm_device *dev);
> +extern void intel_plane_restore(struct drm_plane *plane);
>
>
> static inline struct intel_encoder *intel_attached_encoder(struct
> drm_connector *connector)
> diff --git a/drivers/gpu/drm/i915/intel_sprite.c
> b/drivers/gpu/drm/i915/intel_sprite.c
> index 1b6eb76..6fdd427 100644
> --- a/drivers/gpu/drm/i915/intel_sprite.c
> +++ b/drivers/gpu/drm/i915/intel_sprite.c
> @@ -441,6 +441,15 @@ intel_update_plane(struct drm_plane *plane, struct
> drm_crtc *crtc,
>
> old_obj = intel_plane->obj;
>
> + intel_plane->crtc_x = crtc_x;
> + intel_plane->crtc_y = crtc_y;
> + intel_plane->crtc_w = crtc_w;
> + intel_plane->crtc_h = crtc_h;
> + intel_plane->src_x = src_x;
> + intel_plane->src_y = src_y;
> + intel_plane->src_w = src_w;
> + intel_plane->src_h = src_h;
> +
> src_w = src_w >> 16;
> src_h = src_h >> 16;
>
> @@ -647,6 +656,20 @@ out_unlock:
> return ret;
> }
>
> +void intel_plane_restore(struct drm_plane *plane)
> +{
> + struct intel_plane *intel_plane = to_intel_plane(plane);
> +
> + if (!plane->crtc || !plane->fb)
> + 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);
> +}
> +
> static const struct drm_plane_funcs intel_plane_funcs = {
> .update_plane = intel_update_plane,
> .disable_plane = intel_disable_plane,
> --
> 1.7.9.5
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
>
--
Rodrigo Vivi
Blog: http://blog.vivi.eng.br
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.freedesktop.org/archives/intel-gfx/attachments/20130326/2eaf3910/attachment.html>
