Module Name: src
Committed By: riastradh
Date: Sun Dec 19 09:58:39 UTC 2021
Modified Files:
src/sys/external/bsd/drm2/dist/drm/i915: i915_reg.h
Log Message:
remove bogus local diff
Author: Maya Rashish <m...@netbsd.org>
To generate a diff of this commit:
cvs rdiff -u -r1.15 -r1.16 src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h
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_reg.h
diff -u src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h:1.15 src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h:1.16
--- src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h:1.15 Sat Dec 18 23:45:28 2021
+++ src/sys/external/bsd/drm2/dist/drm/i915/i915_reg.h Sun Dec 19 09:58:39 2021
@@ -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 @@ static inline bool i915_mmio_reg_valid(i
#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 @@ enum {
#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)
