Deleted Added
full compact
i915_drv.c (302408) i915_drv.c (317609)
1/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
2 */
3/*
4 *
5 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
6 * All Rights Reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

--- 14 unchanged lines hidden (view full) ---

23 * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
24 * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
25 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
26 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
27 *
28 */
29
30#include <sys/cdefs.h>
1/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
2 */
3/*
4 *
5 * Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
6 * All Rights Reserved.
7 *
8 * Permission is hereby granted, free of charge, to any person obtaining a

--- 14 unchanged lines hidden (view full) ---

23 * IN NO EVENT SHALL TUNGSTEN GRAPHICS AND/OR ITS SUPPLIERS BE LIABLE FOR
24 * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
25 * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
26 * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
27 *
28 */
29
30#include <sys/cdefs.h>
31__FBSDID("$FreeBSD: stable/11/sys/dev/drm2/i915/i915_drv.c 296548 2016-03-08 20:33:02Z dumbbell $");
31__FBSDID("$FreeBSD: stable/11/sys/dev/drm2/i915/i915_drv.c 317609 2017-04-30 18:39:31Z markj $");
32
33#include <dev/drm2/drmP.h>
34#include <dev/drm2/drm_pciids.h>
35#include <dev/drm2/i915/i915_drm.h>
36#include "dev/drm2/i915/i915_drv.h"
37#ifdef __linux__
38#include "dev/drm2/i915/i915_trace.h"
39#endif

--- 335 unchanged lines hidden (view full) ---

375 INTEL_VGA_DEVICE(0x0156, &intel_ivybridge_m_info), /* GT1 mobile */
376 INTEL_VGA_DEVICE(0x0166, &intel_ivybridge_m_info), /* GT2 mobile */
377 INTEL_VGA_DEVICE(0x0152, &intel_ivybridge_d_info), /* GT1 desktop */
378 INTEL_VGA_DEVICE(0x0162, &intel_ivybridge_d_info), /* GT2 desktop */
379 INTEL_VGA_DEVICE(0x015a, &intel_ivybridge_d_info), /* GT1 server */
380 INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */
381 INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */
382 INTEL_VGA_DEVICE(0x0412, &intel_haswell_d_info), /* GT2 desktop */
32
33#include <dev/drm2/drmP.h>
34#include <dev/drm2/drm_pciids.h>
35#include <dev/drm2/i915/i915_drm.h>
36#include "dev/drm2/i915/i915_drv.h"
37#ifdef __linux__
38#include "dev/drm2/i915/i915_trace.h"
39#endif

--- 335 unchanged lines hidden (view full) ---

375 INTEL_VGA_DEVICE(0x0156, &intel_ivybridge_m_info), /* GT1 mobile */
376 INTEL_VGA_DEVICE(0x0166, &intel_ivybridge_m_info), /* GT2 mobile */
377 INTEL_VGA_DEVICE(0x0152, &intel_ivybridge_d_info), /* GT1 desktop */
378 INTEL_VGA_DEVICE(0x0162, &intel_ivybridge_d_info), /* GT2 desktop */
379 INTEL_VGA_DEVICE(0x015a, &intel_ivybridge_d_info), /* GT1 server */
380 INTEL_VGA_DEVICE(0x016a, &intel_ivybridge_d_info), /* GT2 server */
381 INTEL_VGA_DEVICE(0x0402, &intel_haswell_d_info), /* GT1 desktop */
382 INTEL_VGA_DEVICE(0x0412, &intel_haswell_d_info), /* GT2 desktop */
383 INTEL_VGA_DEVICE(0x041e, &intel_haswell_d_info), /* GT2 desktop */
383 INTEL_VGA_DEVICE(0x0422, &intel_haswell_d_info), /* GT2 desktop */
384 INTEL_VGA_DEVICE(0x040a, &intel_haswell_d_info), /* GT1 server */
385 INTEL_VGA_DEVICE(0x041a, &intel_haswell_d_info), /* GT2 server */
386 INTEL_VGA_DEVICE(0x042a, &intel_haswell_d_info), /* GT2 server */
387 INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */
388 INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */
389 INTEL_VGA_DEVICE(0x0426, &intel_haswell_m_info), /* GT2 mobile */
390 INTEL_VGA_DEVICE(0x0C02, &intel_haswell_d_info), /* SDV GT1 desktop */

--- 1063 unchanged lines hidden ---
384 INTEL_VGA_DEVICE(0x0422, &intel_haswell_d_info), /* GT2 desktop */
385 INTEL_VGA_DEVICE(0x040a, &intel_haswell_d_info), /* GT1 server */
386 INTEL_VGA_DEVICE(0x041a, &intel_haswell_d_info), /* GT2 server */
387 INTEL_VGA_DEVICE(0x042a, &intel_haswell_d_info), /* GT2 server */
388 INTEL_VGA_DEVICE(0x0406, &intel_haswell_m_info), /* GT1 mobile */
389 INTEL_VGA_DEVICE(0x0416, &intel_haswell_m_info), /* GT2 mobile */
390 INTEL_VGA_DEVICE(0x0426, &intel_haswell_m_info), /* GT2 mobile */
391 INTEL_VGA_DEVICE(0x0C02, &intel_haswell_d_info), /* SDV GT1 desktop */

--- 1063 unchanged lines hidden ---