From: jsg Date: Mon, 17 Apr 2023 05:35:37 +0000 (+0000) Subject: drm/i915: Use _MMIO_PIPE() for SKL_BOTTOM_COLOR X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=d036c16e9a1eb4ebc9fc6a709b2086fef4506311;p=openbsd drm/i915: Use _MMIO_PIPE() for SKL_BOTTOM_COLOR From Ville Syrjala 64244a900ddff4abd4c894dcfa9ea7df898ad1eb in linux-6.1.y/6.1.24 05ca98523481aa687c5a8dce8939fec539632153 in mainline linux --- diff --git a/sys/dev/pci/drm/i915/i915_reg.h b/sys/dev/pci/drm/i915/i915_reg.h index 64eacd11b8b..2372bfa04aa 100644 --- a/sys/dev/pci/drm/i915/i915_reg.h +++ b/sys/dev/pci/drm/i915/i915_reg.h @@ -3747,9 +3747,10 @@ /* Skylake+ pipe bottom (background) color */ #define _SKL_BOTTOM_COLOR_A 0x70034 +#define _SKL_BOTTOM_COLOR_B 0x71034 #define SKL_BOTTOM_COLOR_GAMMA_ENABLE REG_BIT(31) #define SKL_BOTTOM_COLOR_CSC_ENABLE REG_BIT(30) -#define SKL_BOTTOM_COLOR(pipe) _MMIO_PIPE2(pipe, _SKL_BOTTOM_COLOR_A) +#define SKL_BOTTOM_COLOR(pipe) _MMIO_PIPE(pipe, _SKL_BOTTOM_COLOR_A, _SKL_BOTTOM_COLOR_B) #define _ICL_PIPE_A_STATUS 0x70058 #define ICL_PIPESTATUS(pipe) _MMIO_PIPE2(pipe, _ICL_PIPE_A_STATUS)