drm/i915/bdw: Add BDW to ULT macro
Subsystems (2)
PATCH 1/1 drm/i915/bdw: Add BDW to ULT macro
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 <[email protected]>
Signed-off-by Ben Widawsky <[email protected]>
--- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)
drivers/gpu/drm/i915/i915_drv.h +6 -1
@@ -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)
Signature · 1 line
1.8.4.2
Daniel Vetter
AppliedQuoted 6 lines · 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 <[email protected]>Signed-off-by Ben Widawsky <[email protected]>
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
Quoted 30 lines
--- drivers/gpu/drm/i915/i915_drv.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)drivers/gpu/drm/i915/i915_drv.h +6
-1@@ -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)Signature · 6 lines
1.8.4.2 _______________________________________________ Intel-gfx mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/intel-gfx
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation +41 (0) 79 365 57 48 - http://blog.ffwll.ch