Rip the band-aid, it's not so bad after all. Well, at least for the somewhat isolated VLV DSI. But it's a start. Jani Nikula (3): drm/i915/dsi: remove unused _MIPIA_AUTOPWG register definition drm/i915/dsi: add VLV_ prefix to VLV only register macros drm/i915/dsi: pass i915 to register macros instead of implicit variable drivers/gpu/drm/i915/display/intel_display.c | 2 +- drivers/gpu/drm/i915/display/vlv_dsi.c | 192 +++++------ drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 6 +- drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 325 +++++++++---------- 4 files changed, 259 insertions(+), 266 deletions(-) -- 2.39.2