[src/trunk]: src/sys/external/bsd/drm2/dist/drm/i915 i915: bus_space_read/wri...

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

details:   https://anonhg.NetBSD.org/src/rev/ae647564f674
branches:  trunk
changeset: 1028631:ae647564f674
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sun Dec 19 11:32:35 2021 +0000

description:
i915: bus_space_read/write moved to intel_uncore.h; nix diff.


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.h |  7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diffs (23 lines):

diff -r bd1f5725f42f -r ae647564f674 sys/external/bsd/drm2/dist/drm/i915/i915_drv.h
--- a/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Sun Dec 19 11:32:25 2021 +0000
+++ b/sys/external/bsd/drm2/dist/drm/i915/i915_drv.h    Sun Dec 19 11:32:35 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: i915_drv.h,v 1.42 2021/12/19 11:18:35 riastradh Exp $  */
+/*     $NetBSD: i915_drv.h,v 1.43 2021/12/19 11:32:35 riastradh Exp $  */
 
 /* i915_drv.h -- Private header for the I915 driver -*- linux-c -*-
  */
@@ -2052,13 +2052,8 @@
  * therefore generally be serialised, by either the dev_priv->uncore.lock or
  * a more localised lock guarding all access to that bank of registers.
  */
-#ifdef __NetBSD__
-#define I915_READ_FW(reg__) bus_space_read_4(dev_priv->regs_bst, dev_priv->regs_bsh, (reg__))
-#define I915_WRITE_FW(reg__, val__) bus_space_write_4(dev_priv->regs_bst, dev_priv->regs_bsh, (reg__), (val__))
-#else
 #define I915_READ_FW(reg__) __I915_REG_OP(read_fw, dev_priv, (reg__))
 #define I915_WRITE_FW(reg__, val__) __I915_REG_OP(write_fw, dev_priv, (reg__), (val__))
-#endif
 
 /* register wait wrappers for display regs */
 #define intel_de_wait_for_register(dev_priv_, reg_, mask_, value_, timeout_) \