diff --git a/[refs] b/[refs] index af18035d96b9..1102b1bcc908 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 954bce507acdcb76520b2f30535400fc036e7c20 +refs/heads/master: a13e4093cbd3db91cc65ac8b8c2baadffa603ee9 diff --git a/trunk/drivers/gpu/drm/i915/i915_drv.c b/trunk/drivers/gpu/drm/i915/i915_drv.c index b57efca02901..94e74a426ef9 100644 --- a/trunk/drivers/gpu/drm/i915/i915_drv.c +++ b/trunk/drivers/gpu/drm/i915/i915_drv.c @@ -142,6 +142,12 @@ const static struct intel_device_info intel_sandybridge_d_info = { .has_hotplug = 1, }; +const static struct intel_device_info intel_sandybridge_m_info = { + .is_i965g = 1, .is_i9xx = 1, .need_gfx_hws = 1, + .has_pipe_cxsr = 1, + .has_hotplug = 1, +}; + const static struct pci_device_id pciidlist[] = { INTEL_VGA_DEVICE(0x3577, &intel_i830_info), INTEL_VGA_DEVICE(0x2562, &intel_845g_info), @@ -174,6 +180,7 @@ const static struct pci_device_id pciidlist[] = { INTEL_VGA_DEVICE(0x0042, &intel_ironlake_d_info), INTEL_VGA_DEVICE(0x0046, &intel_ironlake_m_info), INTEL_VGA_DEVICE(0x0102, &intel_sandybridge_d_info), + INTEL_VGA_DEVICE(0x0106, &intel_sandybridge_m_info), {0, 0, 0} };