[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 Remove local diff, side ...

[riastradh <riastradh%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/8d14845692b4
branches:  trunk
changeset: 1028544:8d14845692b4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:17:27 2021 +0000

description:
Remove local diff, side effect of backporting kabylake support.


Author: Maya Rashish <maya%NetBSD.org@localhost>
Committer: Taylor R Campbell <riastradh%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c |  32 +------------------------
 1 files changed, 2 insertions(+), 30 deletions(-)

diffs (53 lines):

diff -r fb6cacbc89e9 -r 8d14845692b4 sys/external/bsd/drm2/dist/drm/i915/i915_drv.c
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:17:19 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.c    Sun Dec 19 11:17:27 2021 +0000
@@ -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 @@
        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