On Wed, May 09, 2012 at 03:37:32PM -0300, Eugeni Dodonov wrote:
> This patch enables i915 driver to handle Haswell devices. It should go in
> last, when things are working stable enough.
>
> Signed-off-by: Eugeni Dodonov <eugeni.dodonov at intel.com>
Ok, merged them all into dinq, with the commit message of patch 11 pimped
by your explanation from the private email.
Thanks, Daniel
> ---
> drivers/char/agp/intel-agp.c | 4 ++++
> drivers/gpu/drm/i915/i915_drv.c | 7 +++++++
> 2 files changed, 11 insertions(+)
>
> diff --git a/drivers/char/agp/intel-agp.c b/drivers/char/agp/intel-agp.c
> index 74c2d92..764f70c 100644
> --- a/drivers/char/agp/intel-agp.c
> +++ b/drivers/char/agp/intel-agp.c
> @@ -908,6 +908,10 @@ static struct pci_device_id agp_intel_pci_table[] = {
> ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_M_HB),
> ID(PCI_DEVICE_ID_INTEL_IVYBRIDGE_S_HB),
> ID(PCI_DEVICE_ID_INTEL_VALLEYVIEW_HB),
> + ID(PCI_DEVICE_ID_INTEL_HASWELL_HB),
> + ID(PCI_DEVICE_ID_INTEL_HASWELL_M_HB),
> + ID(PCI_DEVICE_ID_INTEL_HASWELL_S_HB),
> + ID(PCI_DEVICE_ID_INTEL_HASWELL_E_HB),
> { }
> };
>
> diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c
> index 77b7a50..b3b94ca 100644
> --- a/drivers/gpu/drm/i915/i915_drv.c
> +++ b/drivers/gpu/drm/i915/i915_drv.c
> @@ -345,6 +345,13 @@ static const struct pci_device_id pciidlist[] = { /* aka */
> INTEL_VGA_DEVICE(0x0162, &intel_ivybridge_d_info), /* GT2 desktop */
> INTEL_VGA_DEVICE(0x015a, &intel_ivybridge_d_info), /* GT1 server */
> INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */
> + INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */
> + INTEL_VGA_DEVICE(0x0412, &intel_haswell_d_info), /* GT2 desktop */
> + INTEL_VGA_DEVICE(0x040a, &intel_haswell_d_info), /* GT1 server */
> + INTEL_VGA_DEVICE(0x041a, &intel_haswell_d_info), /* GT2 server */
> + INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */
> + INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */
> + INTEL_VGA_DEVICE(0x0c16, &intel_haswell_d_info), /* SDV */
> {0, 0, 0}
> };
>
> --
> 1.7.10
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Daniel Vetter
Mail: daniel at ffwll.ch
Mobile: +41 (0)79 365 57 48
