Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/i915/backlight: drop DISPLAY_MMIO_BASE() use from backlight registers

None of the remaining backlight registers that use DISPLAY_MMIO_BASE()
are used on VLV/CHV, which are the only platforms that have non-zero
base. Just drop the DISPLAY_MMIO_BASE() use, reducing the implicit
dev_priv references.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/75ae3f2945912f908df2444d4f0ab97a23b89897.1670405587.git.jani.nikula@intel.com

+3 -3
+3 -3
drivers/gpu/drm/i915/display/intel_backlight_regs.h
··· 21 21 #define VLV_BLC_HIST_CTL(pipe) _MMIO_PIPE(pipe, _VLV_BLC_HIST_CTL_A, _VLV_BLC_HIST_CTL_B) 22 22 23 23 /* Backlight control */ 24 - #define BLC_PWM_CTL2 _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61250) /* 965+ only */ 24 + #define BLC_PWM_CTL2 _MMIO(0x61250) /* 965+ only */ 25 25 #define BLM_PWM_ENABLE (1 << 31) 26 26 #define BLM_COMBINATION_MODE (1 << 30) /* gen4 only */ 27 27 #define BLM_PIPE_SELECT (1 << 29) ··· 44 44 #define BLM_PHASE_IN_COUNT_MASK (0xff << 8) 45 45 #define BLM_PHASE_IN_INCR_SHIFT (0) 46 46 #define BLM_PHASE_IN_INCR_MASK (0xff << 0) 47 - #define BLC_PWM_CTL _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61254) 47 + #define BLC_PWM_CTL _MMIO(0x61254) 48 48 /* 49 49 * This is the most significant 15 bits of the number of backlight cycles in a 50 50 * complete cycle of the modulated backlight control. ··· 66 66 #define BACKLIGHT_DUTY_CYCLE_MASK_PNV (0xfffe) 67 67 #define BLM_POLARITY_PNV (1 << 0) /* pnv only */ 68 68 69 - #define BLC_HIST_CTL _MMIO(DISPLAY_MMIO_BASE(dev_priv) + 0x61260) 69 + #define BLC_HIST_CTL _MMIO(0x61260) 70 70 #define BLM_HISTOGRAM_ENABLE (1 << 31) 71 71 72 72 /* New registers for PCH-split platforms. Safe where new bits show up, the