public inbox for intel-gfx@lists.freedesktop.org
 help / color / mirror / Atom feed
From: Daniel Vetter <daniel@ffwll.ch>
To: ville.syrjala@linux.intel.com
Cc: intel-gfx@lists.freedesktop.org
Subject: Re: [PATCH 6/6] drm/i915: Convert overlay double wide check over to pipe config
Date: Tue, 17 Sep 2013 10:06:52 +0200	[thread overview]
Message-ID: <20130917080651.GL32145@phenom.ffwll.local> (raw)
In-Reply-To: <1378308607-22046-7-git-send-email-ville.syrjala@linux.intel.com>

On Wed, Sep 04, 2013 at 06:30:07PM +0300, ville.syrjala@linux.intel.com wrote:
> From: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

Entire series merged to dinq, thanks for the patches.
-Daniel

> ---
>  drivers/gpu/drm/i915/intel_overlay.c | 5 +----
>  1 file changed, 1 insertion(+), 4 deletions(-)
> 
> diff --git a/drivers/gpu/drm/i915/intel_overlay.c b/drivers/gpu/drm/i915/intel_overlay.c
> index ddfd0ae..8d6d0a1 100644
> --- a/drivers/gpu/drm/i915/intel_overlay.c
> +++ b/drivers/gpu/drm/i915/intel_overlay.c
> @@ -821,14 +821,11 @@ int intel_overlay_switch_off(struct intel_overlay *overlay)
>  static int check_overlay_possible_on_crtc(struct intel_overlay *overlay,
>  					  struct intel_crtc *crtc)
>  {
> -	drm_i915_private_t *dev_priv = overlay->dev->dev_private;
> -
>  	if (!crtc->active)
>  		return -EINVAL;
>  
>  	/* can't use the overlay with double wide pipe */
> -	if (INTEL_INFO(overlay->dev)->gen < 4 &&
> -	    (I915_READ(PIPECONF(crtc->pipe)) & (PIPECONF_DOUBLE_WIDE | PIPECONF_ENABLE)) != PIPECONF_ENABLE)
> +	if (crtc->config.double_wide)
>  		return -EINVAL;
>  
>  	return 0;
> -- 
> 1.8.1.5
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch

      reply	other threads:[~2013-09-17  8:06 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-04 15:30 [PATCH 0/6] drm/i915: Double wide pipe config ville.syrjala
2013-09-04 15:30 ` [PATCH 1/6] drm/i915: Move double wide mode handling into pipe_config ville.syrjala
2013-09-04 15:30 ` [PATCH 2/6] drm/i915: Add double_wide readout and checking ville.syrjala
2013-09-04 15:30 ` [PATCH 3/6] drm/i915: Check pixel clock limits on pre-gen4 ville.syrjala
2013-09-04 15:30 ` [PATCH v2 4/6] drm/i915: pipe_src_w must be even in LVDS dual channel, DVO ganged, and double wide mode ville.syrjala
2013-09-04 15:30 ` [PATCH 5/6] drm/i915: Fix up pipe vs. double wide confusion ville.syrjala
2013-09-04 15:30 ` [PATCH 6/6] drm/i915: Convert overlay double wide check over to pipe config ville.syrjala
2013-09-17  8:06   ` Daniel Vetter [this message]

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=20130917080651.GL32145@phenom.ffwll.local \
    --to=daniel@ffwll.ch \
    --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