From mboxrd@z Thu Jan 1 00:00:00 1970 From: Chris Wilson Subject: Re: [PATCH 08/16] drm/i915: Ivy Bridge has split display and pipe control Date: Wed, 27 Apr 2011 08:19:21 +0100 Message-ID: <849307$cmeib4@azsmga001.ch.intel.com> References: <1303861134-8762-1-git-send-email-jbarnes@virtuousgeek.org> <1303861134-8762-9-git-send-email-jbarnes@virtuousgeek.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mga03.intel.com (mga03.intel.com [143.182.124.21]) by gabe.freedesktop.org (Postfix) with ESMTP id AD5BC9F5C1 for ; Wed, 27 Apr 2011 00:19:25 -0700 (PDT) In-Reply-To: <1303861134-8762-9-git-send-email-jbarnes@virtuousgeek.org> 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: Jesse Barnes , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org On Tue, 26 Apr 2011 16:38:46 -0700, Jesse Barnes wrote: > Ivy Bridge has a similar split display controller to Sandy Bridge, so > use HAS_PCH_SPLIT. And gen7 also has the pipe control instruction, so > use HAS_PIPE_CONTROL as well. > > Signed-off-by: Jesse Barnes > --- > drivers/gpu/drm/i915/i915_drv.h | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 9fbb6fe..e596c10 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -965,8 +965,8 @@ enum intel_chip_family { > #define HAS_PIPE_CXSR(dev) (INTEL_INFO(dev)->has_pipe_cxsr) > #define I915_HAS_FBC(dev) (INTEL_INFO(dev)->has_fbc) > > -#define HAS_PCH_SPLIT(dev) (IS_GEN5(dev) || IS_GEN6(dev)) > -#define HAS_PIPE_CONTROL(dev) (IS_GEN5(dev) || IS_GEN6(dev)) > +#define HAS_PCH_SPLIT(dev) (IS_GEN5(dev) || IS_GEN6(dev) || IS_IVYBRIDGE(dev)) > +#define HAS_PIPE_CONTROL(dev) (IS_GEN5(dev) || IS_GEN6(dev) || IS_GEN7(dev)) > > #define INTEL_PCH_TYPE(dev) (((struct drm_i915_private *)(dev)->dev_private)->pch_type) > #define HAS_PCH_CPT(dev) (INTEL_PCH_TYPE(dev) == PCH_CPT) So either we are confident that every future ILK+ continues with the split and keeps pipe_control, in which case we do the obvious simplification or we make these an actual capability bit before the code becomes a deep nesting of predicates again... -Chris -- Chris Wilson, Intel Open Source Technology Centre