From: Jesse Barnes <jbarnes@virtuousgeek.org>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 11/11] drm/i915: Introduce intel_crtc_update_sarea_pos()
Date: Wed, 31 Oct 2012 13:27:48 -0700 [thread overview]
Message-ID: <20121031132748.43154e69@jbarnes-desktop> (raw)
In-Reply-To: <1351698624-26626-12-git-send-email-ville.syrjala@linux.intel.com>
On Wed, 31 Oct 2012 17:50:24 +0200
ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@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@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@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
next prev parent reply other threads:[~2012-10-31 20:27 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-31 15:50 [PATCH 00/11] drm/i915: Patches cherry-picked from drm_atomic ville.syrjala
2012-10-31 15:50 ` [PATCH 01/11] drm/i915: Fix display pixel format handling ville.syrjala
2012-10-31 20:20 ` Jesse Barnes
2012-11-01 14:03 ` Ville Syrjälä
2012-11-01 14:06 ` Chris Wilson
2012-10-31 15:50 ` [PATCH 02/11] drm/i915: Add SURFLIVE register definitions ville.syrjala
2012-10-31 20:23 ` Jesse Barnes
2012-10-31 22:57 ` Daniel Vetter
2012-11-01 14:16 ` Ville Syrjälä
2012-11-01 14:19 ` Daniel Vetter
2012-11-01 14:23 ` Ville Syrjälä
2012-10-31 15:50 ` [PATCH 03/11] drm/i915: Implement execbuffer wait for all planes ville.syrjala
2012-10-31 15:59 ` Chris Wilson
2012-10-31 15:50 ` [PATCH 04/11] drm/i915: Factor out i9xx_compute_clocks() like ironlake_compute_clocks() ville.syrjala
2012-10-31 16:28 ` Daniel Vetter
2012-10-31 17:04 ` Ville Syrjälä
2012-10-31 18:29 ` Daniel Vetter
2012-10-31 15:50 ` [PATCH 05/11] drm/i915: Check framebuffer stride more thoroughly ville.syrjala
2012-10-31 20:25 ` Jesse Barnes
2012-11-01 14:06 ` Ville Syrjälä
2012-10-31 15:50 ` [PATCH 06/11] drm/i915: Check the framebuffer offset ville.syrjala
2012-10-31 20:26 ` Jesse Barnes
2012-11-01 14:09 ` Ville Syrjälä
2012-11-01 14:18 ` Daniel Vetter
2012-11-01 14:40 ` Jesse Barnes
2012-11-01 14:40 ` Ville Syrjälä
2012-10-31 15:50 ` [PATCH 07/11] drm/i915: pixel_size == cpp ville.syrjala
2012-10-31 20:27 ` Jesse Barnes
2012-10-31 15:50 ` [PATCH 08/11] drm/i915: Bad pixel formats can't reach the sprite code ville.syrjala
2012-10-31 20:27 ` Jesse Barnes
2012-10-31 15:50 ` [PATCH 09/11] drm/i915: Consitify adjusted_mode parameter ville.syrjala
2012-10-31 15:50 ` [PATCH 10/11] drm/i915: Constify mode argument to intel_modeset_adjusted_mode() ville.syrjala
2012-10-31 15:50 ` [PATCH 11/11] drm/i915: Introduce intel_crtc_update_sarea_pos() ville.syrjala
2012-10-31 20:27 ` Jesse Barnes [this message]
2012-10-31 23:02 ` Daniel Vetter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20121031132748.43154e69@jbarnes-desktop \
--to=jbarnes@virtuousgeek.org \
--cc=intel-gfx@lists.freedesktop.org \
--cc=ville.syrjala@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox