On Wed, 21 Jan 2015, Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx> wrote:
> When reviewing patch that fixes VGA on BDW Halo Jani noticed that
> we also had other ULT IDs that weren't listed there.
>
> So this follow-up patch add these pci-ids as halo and fix comments
> on i915_pciids.h
>
> Cc: Jani Nikula <jani.nikula@xxxxxxxxx>
> Signed-off-by: Rodrigo Vivi <rodrigo.vivi@xxxxxxxxx>
Pushed to -fixes, cc: stable, thanks for the patch. And sorry for the
delay.
BR,
Jani.
> ---
> drivers/gpu/drm/i915/i915_drv.h | 1 +
> include/drm/i915_pciids.h | 4 ++--
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h
> index ccb5403..e60df36 100644
> --- a/drivers/gpu/drm/i915/i915_drv.h
> +++ b/drivers/gpu/drm/i915/i915_drv.h
> @@ -2375,6 +2375,7 @@ struct drm_i915_cmd_table {
> (INTEL_DEVID(dev) & 0xFF00) == 0x0C00)
> #define IS_BDW_ULT(dev) (IS_BROADWELL(dev) && \
> ((INTEL_DEVID(dev) & 0xf) == 0x6 || \
> + (INTEL_DEVID(dev) & 0xf) == 0xb || \
> (INTEL_DEVID(dev) & 0xf) == 0xe))
> #define IS_BDW_GT3(dev) (IS_BROADWELL(dev) && \
> (INTEL_DEVID(dev) & 0x00F0) == 0x0020)
> diff --git a/include/drm/i915_pciids.h b/include/drm/i915_pciids.h
> index 180ad0e..d016dc5 100644
> --- a/include/drm/i915_pciids.h
> +++ b/include/drm/i915_pciids.h
> @@ -214,9 +214,9 @@
> INTEL_VGA_DEVICE((((gt) - 1) << 4) | (id), info)
>
> #define _INTEL_BDW_M_IDS(gt, info) \
> - _INTEL_BDW_M(gt, 0x1602, info), /* ULT */ \
> + _INTEL_BDW_M(gt, 0x1602, info), /* Halo */ \
> _INTEL_BDW_M(gt, 0x1606, info), /* ULT */ \
> - _INTEL_BDW_M(gt, 0x160B, info), /* Iris */ \
> + _INTEL_BDW_M(gt, 0x160B, info), /* ULT */ \
> _INTEL_BDW_M(gt, 0x160E, info) /* ULX */
>
> #define _INTEL_BDW_D_IDS(gt, info) \
> --
> 2.1.0
>
--
Jani Nikula, Intel Open Source Technology Center
_______________________________________________
Intel-gfx mailing list
Intel-gfx@xxxxxxxxxxxxxxxxxxxxx
http://lists.freedesktop.org/mailman/listinfo/intel-gfx
