Commit 42a0d256 authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Extract skl_watermark.c 



Pull all the skl+ watermark code (and the dbuf/sagv/ipc code
since it's all sort of intertwined and I'm too lazy to think
of a finer grained split right now) into its own file from the
catch-all intel_pm.c.

Also sneak in the s/dev_priv/i915/ rename while at it.

Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220908191646.20239-3-ville.syrjala@linux.intel.com


Reviewed-by: default avatarJani Nikula <jani.nikula@intel.com>
parent 55544b28

drivers/gpu/drm/i915/Makefile

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

	display/i9xx_plane.o \

	display/skl_scaler.o \

	display/skl_universal_plane.o

	display/skl_universal_plane.o \

	display/skl_watermark.o

i915-$(CONFIG_ACPI) += \

	display/intel_acpi.o \

	display/intel_opregion.o

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

+1 −1
Original line number Diff line number Diff line
@@ -43,9 +43,9 @@ 
#include "intel_display_types.h"

#include "intel_fb.h"

#include "intel_fb_pin.h"

#include "intel_pm.h"

#include "intel_sprite.h"

#include "skl_scaler.h"

#include "skl_watermark.h"



static void intel_plane_state_reset(struct intel_plane_state *plane_state,

				    struct intel_plane *plane)

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

+3 −1
Original line number Diff line number Diff line
@@ -5,15 +5,17 @@ 


#include <drm/drm_atomic_state_helper.h>



#include "i915_drv.h"

#include "i915_reg.h"

#include "i915_utils.h"

#include "intel_atomic.h"

#include "intel_bw.h"

#include "intel_cdclk.h"

#include "intel_display_core.h"

#include "intel_display_types.h"

#include "skl_watermark.h"

#include "intel_mchbar_regs.h"

#include "intel_pcode.h"

#include "intel_pm.h"



/* Parameters for Qclk Geyserville (QGV) */

struct intel_qgv_point {

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

+1 −1
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
#include "intel_fb.h"

#include "intel_fb_pin.h"

#include "intel_frontbuffer.h"

#include "intel_pm.h"

#include "intel_psr.h"

#include "intel_sprite.h"

#include "skl_watermark.h"



/* Cursor formats */

static const u32 intel_cursor_formats[] = {

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

+1 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ 
#include "i9xx_plane.h"

#include "skl_scaler.h"

#include "skl_universal_plane.h"

#include "skl_watermark.h"

#include "vlv_dsi.h"

#include "vlv_dsi_pll.h"

#include "vlv_dsi_regs.h"