From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter 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 Message-ID: <20130917080651.GL32145@phenom.ffwll.local> References: <1378308607-22046-1-git-send-email-ville.syrjala@linux.intel.com> <1378308607-22046-7-git-send-email-ville.syrjala@linux.intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: quoted-printable Return-path: Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 908AAE719A for ; Tue, 17 Sep 2013 01:06:38 -0700 (PDT) Received: by mail-ea0-f170.google.com with SMTP id h14so2588022eak.1 for ; Tue, 17 Sep 2013 01:06:37 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1378308607-22046-7-git-send-email-ville.syrjala@linux.intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: ville.syrjala@linux.intel.com Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Wed, Sep 04, 2013 at 06:30:07PM +0300, ville.syrjala@linux.intel.com wro= te: > From: Ville Syrj=E4l=E4 > = > Signed-off-by: Ville Syrj=E4l=E4 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 =3D 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)) !=3D 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