From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jani Nikula Subject: Re: [PATCH 6/6] drm/i915: Turn HAS_FPGA_DBG_UNCLAIMED into a device_info flag Date: Tue, 23 Apr 2013 10:29:43 +0300 Message-ID: <87bo95zouw.fsf@intel.com> References: <1366652441-2511-1-git-send-email-damien.lespiau@intel.com> <1366652441-2511-7-git-send-email-damien.lespiau@intel.com> 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 43696E5FF2 for ; Tue, 23 Apr 2013 00:29:34 -0700 (PDT) In-Reply-To: <1366652441-2511-7-git-send-email-damien.lespiau@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: Damien Lespiau , intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org I think this could be squashed together with the previous patch, but either way, Reviewed-by: Jani Nikula On Mon, 22 Apr 2013, Damien Lespiau wrote: > Signed-off-by: Damien Lespiau > --- > drivers/gpu/drm/i915/i915_drv.c | 2 ++ > drivers/gpu/drm/i915/i915_drv.h | 5 +++-- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c > index 896b904..624cdfc 100644 > --- a/drivers/gpu/drm/i915/i915_drv.c > +++ b/drivers/gpu/drm/i915/i915_drv.c > @@ -309,6 +309,7 @@ static const struct intel_device_info intel_haswell_d_info = { > GEN7_FEATURES, > .is_haswell = 1, > .has_ddi = 1, > + .has_fpga_dbg = 1, > }; > > static const struct intel_device_info intel_haswell_m_info = { > @@ -316,6 +317,7 @@ static const struct intel_device_info intel_haswell_m_info = { > .is_haswell = 1, > .is_mobile = 1, > .has_ddi = 1, > + .has_fpga_dbg = 1, > }; > > static const struct pci_device_id pciidlist[] = { /* aka */ > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index c5f0778..0eb4618 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -358,7 +358,8 @@ struct drm_i915_gt_funcs { > func(has_bsd_ring) sep \ > func(has_blt_ring) sep \ > func(has_llc) sep \ > - func(has_ddi) > + func(has_ddi) sep \ > + func(has_fpga_dbg) > > #define DEFINE_FLAG(name) u8 name:1 > #define SEP_SEMICOLON ; > @@ -1369,7 +1370,7 @@ struct drm_i915_file_private { > > #define HAS_DDI(dev) (INTEL_INFO(dev)->has_ddi) > #define HAS_POWER_WELL(dev) (IS_HASWELL(dev)) > -#define HAS_FPGA_DBG_UNCLAIMED(dev) (IS_HASWELL(dev)) > +#define HAS_FPGA_DBG_UNCLAIMED(dev) (INTEL_INFO(dev)->has_fpga_dbg) > > #define INTEL_PCH_DEVICE_ID_MASK 0xff00 > #define INTEL_PCH_IBX_DEVICE_ID_TYPE 0x3b00 > -- > 1.8.1.4 > > _______________________________________________ > Intel-gfx mailing list > Intel-gfx@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx