Commit 8393253b authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915: move VLV IOSF SB unit specific helpers under display 



Now that all the VLV IOSF SB unit specific helper users are under
display, relocate the helpers themselves under display as
well. Resurrect the vlv_sideband.[ch] name for this. Make everything
except DPIO helpers static inlines, as their implementations are
trivial.

All of this considerably simplifies the xe compat header.

v2: Rebase

Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://lore.kernel.org/r/e86c2498c9f1c1d30f8e83fa5f1c23526b87b9ab.1747061743.git.jani.nikula@intel.com


Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
parent ead7a1a5

drivers/gpu/drm/i915/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -296,7 +296,8 @@ i915-y += \ 
	display/intel_wm.o \

	display/skl_scaler.o \

	display/skl_universal_plane.o \

	display/skl_watermark.o

	display/skl_watermark.o \

	display/vlv_sideband.o

i915-$(CONFIG_ACPI) += \

	display/intel_acpi.o \

	display/intel_opregion.o

drivers/gpu/drm/i915/display/i9xx_wm.c

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
#include "intel_mchbar_regs.h"

#include "intel_wm.h"

#include "skl_watermark.h"

#include "vlv_iosf_sb.h"

#include "vlv_sideband.h"



struct intel_watermark_params {

	u16 fifo_size;

drivers/gpu/drm/i915/display/intel_cdclk.c

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ 
#include "skl_watermark.h"

#include "skl_watermark_regs.h"

#include "vlv_dsi.h"

#include "vlv_iosf_sb.h"

#include "vlv_sideband.h"



/**

 * DOC: CDCLK / RAWCLK

drivers/gpu/drm/i915/display/intel_display.c

+1 −1
Original line number Diff line number Diff line
@@ -131,7 +131,7 @@ 
#include "vlv_dsi.h"

#include "vlv_dsi_pll.h"

#include "vlv_dsi_regs.h"

#include "vlv_iosf_sb.h"

#include "vlv_sideband.h"



static void intel_set_transcoder_timings(const struct intel_crtc_state *crtc_state);

static void intel_set_pipe_src_size(const struct intel_crtc_state *crtc_state);

drivers/gpu/drm/i915/display/intel_display_power.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include "intel_snps_phy.h"

#include "skl_watermark.h"

#include "skl_watermark_regs.h"

#include "vlv_iosf_sb.h"

#include "vlv_sideband.h"



#define for_each_power_domain_well(__display, __power_well, __domain)	\

	for_each_power_well((__display), __power_well)			\