[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 remove bogus local diff

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

details:   https://anonhg.NetBSD.org/src/rev/51ca0c310fb7
branches:  trunk
changeset: 1028267:51ca0c310fb7
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 09:58:39 2021 +0000

description:
remove bogus local diff


Author: Maya Rashish <maya%NetBSD.org@localhost>

diffstat:

 sys/external/bsd/drm2/dist/drm/i915/i915_reg.h |  12 +-----------
 1 files changed, 1 insertions(+), 11 deletions(-)

diffs (33 lines):

diff -r 966d3f695126 -r 51ca0c310fb7 sys/external/bsd/drm2/dist/drm/i915/i915_reg.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h    Sun Dec 19 09:58:30 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h    Sun Dec 19 09:58:39 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_reg.h,v 1.15 2021/12/18 23:45:28 riastradh Exp $  */
+/*     $NetBSD: i915_reg.h,v 1.16 2021/12/19 09:58:39 riastradh Exp $  */
 
 /* Copyright 2003 Tungsten Graphics, Inc., Cedar Park, Texas.
  * All Rights Reserved.
@@ -2617,12 +2617,6 @@
 #define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING     (1 << 28)
 #define   GAMT_CHKN_DISABLE_I2M_CYCLE_ON_WR_PORT       (1 << 24)
 
-#define GAMT_CHKN_BIT_REG      0x4ab8
-#define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING     (1<<28)
-
-#define GEN9_GAMT_ECO_REG_RW_IA        0x4ab0
-#define   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS  (1<<18)
-
 #if 0
 #define PRB0_TAIL      _MMIO(0x2030)
 #define PRB0_HEAD      _MMIO(0x2034)
@@ -7372,10 +7366,6 @@
 #define RM_TIMEOUT             _MMIO(0x42060)
 #define  MMIO_TIMEOUT_US(us)   ((us) << 0)
 
-/* Display Internal Timeout Register */
-#define RM_TIMEOUT             0x42060
-#define  MMIO_TIMEOUT_US(us)   ((us) << 0)
-
 /* interrupts */
 #define DE_MASTER_IRQ_CONTROL   (1UL << 31)
 #define DE_SPRITEB_FLIP_DONE    (1 << 29)