From mboxrd@z Thu Jan 1 00:00:00 1970 From: Daniel Vetter Subject: Re: [PATCH 25/25] drm/i915: hook Haswell devices in place Date: Thu, 10 May 2012 17:56:15 +0200 Message-ID: <20120510155615.GD4912@phenom.ffwll.local> References: <1336588652-702-1-git-send-email-eugeni.dodonov@intel.com> <1336588652-702-26-git-send-email-eugeni.dodonov@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-wg0-f43.google.com (mail-wg0-f43.google.com [74.125.82.43]) by gabe.freedesktop.org (Postfix) with ESMTP id ABF7FA0951 for ; Thu, 10 May 2012 08:55:07 -0700 (PDT) Received: by wgbdr1 with SMTP id dr1so1305674wgb.12 for ; Thu, 10 May 2012 08:55:06 -0700 (PDT) Content-Disposition: inline In-Reply-To: <1336588652-702-26-git-send-email-eugeni.dodonov@intel.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Eugeni Dodonov Cc: intel-gfx@lists.freedesktop.org List-Id: intel-gfx@lists.freedesktop.org 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 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@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/intel-gfx -- Daniel Vetter Mail: daniel@ffwll.ch Mobile: +41 (0)79 365 57 48