On Wed, 31 Oct 2012 17:50:24 +0200
ville.syrjala at linux.intel.com wrote:
> From: Ville Syrj?l? <ville.syrjala at linux.intel.com>
>
> Refactor the code that stores the panning x/y position into the sarea.
>
> This also changes the code so that it won't mistakenly update
> sareaB_x/y for pipe >= C.
>
> Signed-off-by: Ville Syrj?l? <ville.syrjala at linux.intel.com>
> ---
> drivers/gpu/drm/i915/intel_display.c | 43 ++++++++++++++++++++++------------
> 1 files changed, 28 insertions(+), 15 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
> index e75156a..cbc0035 100644
> --- a/drivers/gpu/drm/i915/intel_display.c
> +++ b/drivers/gpu/drm/i915/intel_display.c
> @@ -2195,13 +2195,39 @@ intel_finish_fb(struct drm_framebuffer *old_fb)
> return ret;
> }
>
> +static void intel_crtc_update_sarea_pos(struct drm_crtc *crtc, int x, int y)
> +{
> + struct drm_device *dev = crtc->dev;
> + struct drm_i915_master_private *master_priv;
> + struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> +
> + if (!dev->primary->master)
> + return;
> +
> + master_priv = dev->primary->master->driver_priv;
> + if (!master_priv->sarea_priv)
> + return;
> +
> + switch (intel_crtc->pipe) {
> + case 0:
> + master_priv->sarea_priv->pipeA_x = x;
> + master_priv->sarea_priv->pipeA_y = y;
> + break;
> + case 1:
> + master_priv->sarea_priv->pipeB_x = x;
> + master_priv->sarea_priv->pipeB_y = y;
> + break;
> + default:
> + break;
> + }
> +}
> +
> static int
> intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
> struct drm_framebuffer *fb)
> {
> struct drm_device *dev = crtc->dev;
> struct drm_i915_private *dev_priv = dev->dev_private;
> - struct drm_i915_master_private *master_priv;
> struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
> struct drm_framebuffer *old_fb;
> int ret;
> @@ -2253,20 +2279,7 @@ intel_pipe_set_base(struct drm_crtc *crtc, int x, int y,
> intel_update_fbc(dev);
> mutex_unlock(&dev->struct_mutex);
>
> - if (!dev->primary->master)
> - return 0;
> -
> - master_priv = dev->primary->master->driver_priv;
> - if (!master_priv->sarea_priv)
> - return 0;
> -
> - if (intel_crtc->pipe) {
> - master_priv->sarea_priv->pipeB_x = x;
> - master_priv->sarea_priv->pipeB_y = y;
> - } else {
> - master_priv->sarea_priv->pipeA_x = x;
> - master_priv->sarea_priv->pipeA_y = y;
> - }
> + intel_crtc_update_sarea_pos(crtc, x, y);
>
> return 0;
> }
Reviewed-by: Jesse Barnes <jbarnes at virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
