From: jsg Date: Sat, 12 Jul 2014 14:18:06 +0000 (+0000) Subject: remove ifdef'd out valleyview/baytrail device lists X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=044486df79bf404cf7baffebf88dfdbe5084da98;p=openbsd remove ifdef'd out valleyview/baytrail device lists on linux versions before 3.11 i915_pci_probe() doesn't match valleyview unless i915_preliminary_hw_support is specified as a module parameter. our drm code is currently based on linux 3.8, so it seems unlikely that the valleyview support we have works. --- diff --git a/sys/dev/pci/drm/i915/i915_drv.c b/sys/dev/pci/drm/i915/i915_drv.c index 73447be1311..c4271ff2b21 100644 --- a/sys/dev/pci/drm/i915/i915_drv.c +++ b/sys/dev/pci/drm/i915/i915_drv.c @@ -1,4 +1,4 @@ -/* $OpenBSD: i915_drv.c,v 1.66 2014/05/12 19:29:16 kettenis Exp $ */ +/* $OpenBSD: i915_drv.c,v 1.67 2014/07/12 14:18:06 jsg Exp $ */ /* * Copyright (c) 2008-2009 Owain G. Ainsworth * @@ -419,14 +419,6 @@ const static struct drm_pcidev inteldrm_pciidlist[] = { /* aka */ INTEL_VGA_DEVICE(0x0D0E, &intel_haswell_d_info), /* CRW GT1 reserved */ INTEL_VGA_DEVICE(0x0D1E, &intel_haswell_d_info), /* CRW GT2 reserved */ INTEL_VGA_DEVICE(0x0D2E, &intel_haswell_d_info), /* CRW GT3 reserved */ -#ifdef notyet - INTEL_VGA_DEVICE(0x0f30, &intel_valleyview_m_info), - INTEL_VGA_DEVICE(0x0f31, &intel_valleyview_m_info), - INTEL_VGA_DEVICE(0x0f32, &intel_valleyview_m_info), - INTEL_VGA_DEVICE(0x0f33, &intel_valleyview_m_info), - INTEL_VGA_DEVICE(0x0157, &intel_valleyview_m_info), - INTEL_VGA_DEVICE(0x0155, &intel_valleyview_d_info), -#endif {0, 0, 0} };