From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH] drm/i915/bdw: Add BDW to ULT macro Date: Mon, 11 Nov 2013 19:18:11 +0100 Message-ID: <20131111181811.GE14978@phenom.ffwll.local> References: <1383934806-454-1-git-send-email-benjamin.widawsky@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ee0-f41.google.com (mail-ee0-f41.google.com [74.125.83.41]) by gabe.freedesktop.org (Postfix) with ESMTP id 18DC8F9D4D for ; Mon, 11 Nov 2013 10:17:44 -0800 (PST) Received: by mail-ee0-f41.google.com with SMTP id e53so2662870eek.28 for ; Mon, 11 Nov 2013 10:17:44 -0800 (PST) Content-Disposition: inline In-Reply-To: <1383934806-454-1-git-send-email-benjamin.widawsky@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org To: Ben Widawsky Cc: Intel GFX , Ben Widawsky , Paulo Zanoni List-Id: intel-gfx@lists.freedesktop.org On Fri, Nov 08, 2013 at 10:20:06AM -0800, Ben Widawsky wrote: > For what we care about ULT and ULX are interchangeable. We know of 3 > types of pciids for these cases. I am not sure if at some point we will > need to distinguish ULT and ULX. > > Cc: Paulo Zanoni > Signed-off-by: Ben Widawsky I think for -next we want a is_ult flag in our info struct. On modern platform this seems to be a much more useful disdinction than the is_mobile stuff from the gen2/3 days we still use ;-) Merged into bdw-fixes, thanks for the patch. -Daniel > --- > drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h > index 9944b26..8396eec 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -1750,8 +1750,13 @@ struct drm_i915_file_private { > #define IS_MOBILE(dev) (INTEL_INFO(dev)->is_mobile) > #define IS_HSW_EARLY_SDV(dev) (IS_HASWELL(dev) && \ > ((dev)->pdev->device & 0xFF00) == 0x0C00) > -#define IS_ULT(dev) (IS_HASWELL(dev) && \ > +#define IS_BDW_ULT(dev) (IS_BROADWELL(dev) && \ > + (((dev)->pdev->device & 0xf) == 0x2 || \ > + ((dev)->pdev->device & 0xf) == 0x6 || \ > + ((dev)->pdev->device & 0xf) == 0xe)) > +#define IS_HSW_ULT(dev) (IS_HASWELL(dev) && \ > ((dev)->pdev->device & 0xFF00) == 0x0A00) > +#define IS_ULT(dev) (IS_HSW_ULT(dev) || IS_BDW_ULT(dev)) > #define IS_HSW_GT3(dev) (IS_HASWELL(dev) && \ > ((dev)->pdev->device & 0x00F0) == 0x0020) > #define IS_PRELIMINARY_HW(intel_info) ((intel_info)->is_preliminary) > -- > 1.8.4.2 > > _______________________________________________ > 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