Module Name: src
Committed By: riastradh
Date: Sun Dec 19 11:17:28 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_drv.c
Log Message:
Remove local diff, side effect of backporting kabylake support.
Author: Maya Rashish <m...@netbsd.org>
Committer: Taylor R Campbell <riastr...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.27 -r1.28 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.27 src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.28
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c:1.27 Sun Dec 19 11:09:47 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c Sun Dec 19 11:17:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: i915_drv.c,v 1.27 2021/12/19 11:09:47 riastradh Exp $ */
+/* $NetBSD: i915_drv.c,v 1.28 2021/12/19 11:17:27 riastradh Exp $ */
/* i915_drv.c -- i830,i845,i855,i865,i915 driver -*- linux-c -*-
*/
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.27 2021/12/19 11:09:47 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: i915_drv.c,v 1.28 2021/12/19 11:17:27 riastradh Exp $");
#include <linux/acpi.h>
#include <linux/device.h>
@@ -450,34 +450,6 @@ static void i915_workqueues_cleanup(stru
destroy_workqueue(dev_priv->wq);
}
-static const struct intel_device_info intel_kabylake_info = {
- .is_kabylake = 1,
- .gen = 9,
- .num_pipes = 3,
- .need_gfx_hws = 1, .has_hotplug = 1,
- .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING,
- .has_llc = 1,
- .has_ddi = 1,
- .has_fpga_dbg = 1,
- .has_fbc = 1,
- GEN_DEFAULT_PIPEOFFSETS,
- IVB_CURSOR_OFFSETS,
-};
-
-static const struct intel_device_info intel_kabylake_gt3_info = {
- .is_kabylake = 1,
- .gen = 9,
- .num_pipes = 3,
- .need_gfx_hws = 1, .has_hotplug = 1,
- .ring_mask = RENDER_RING | BSD_RING | BLT_RING | VEBOX_RING | BSD2_RING,
- .has_llc = 1,
- .has_ddi = 1,
- .has_fpga_dbg = 1,
- .has_fbc = 1,
- GEN_DEFAULT_PIPEOFFSETS,
- IVB_CURSOR_OFFSETS,
-};
-
/*
* We don't keep the workarounds for pre-production hardware, so we expect our
* driver to fail on these machines in one way or another. A little warning on
