* [PATCH] drm/i915/bdw: Add BDW to ULT macro
@ 2013-11-08 18:20 Ben Widawsky
2013-11-11 18:18 ` Daniel Vetter
0 siblings, 1 reply; 2+ messages in thread
From: Ben Widawsky @ 2013-11-08 18:20 UTC (permalink / raw)
To: Intel GFX; +Cc: Ben Widawsky, Paulo Zanoni, Ben Widawsky
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 <paulo.r.zanoni@intel.com>
Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
---
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] drm/i915/bdw: Add BDW to ULT macro
2013-11-08 18:20 [PATCH] drm/i915/bdw: Add BDW to ULT macro Ben Widawsky
@ 2013-11-11 18:18 ` Daniel Vetter
0 siblings, 0 replies; 2+ messages in thread
From: Daniel Vetter @ 2013-11-11 18:18 UTC (permalink / raw)
To: Ben Widawsky; +Cc: Intel GFX, Ben Widawsky, Paulo Zanoni
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 <paulo.r.zanoni@intel.com>
> Signed-off-by: Ben Widawsky <ben@bwidawsk.net>
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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2013-11-11 18:17 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-08 18:20 [PATCH] drm/i915/bdw: Add BDW to ULT macro Ben Widawsky
2013-11-11 18:18 ` Daniel Vetter
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.