Commit 94b49d53 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/wm: move remaining watermark code out of intel_pm.c 



Add new files intel_wm.[ch] and i9xx_wm.[ch] under display/ to hold
generic and pre-SKL watermark code, respectively. SKL+ watermark code
has already been split out to skl_watermark.[ch].

Use the _wm.[ch] naming for brevity; we may want to rename
skl_watermark.[ch] later accordingly.

Add new intel_wm_init() to call either skl_wm_init() or
i9xx_wm_init(i915) depending on the platform, the latter comprising of
the remains of intel_init_pm().

Sprinkle in some minor checkpatch fixes while moving the code.

v2:
- Rebase
- Fix copyright year

Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/ddf04a07a37f0368b3fef85d4ebb924082fec6cd.1676317696.git.jani.nikula@intel.com
parent 1b2146de

drivers/gpu/drm/i915/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -269,7 +269,9 @@ i915-y += \ 
	display/intel_tc.o \

	display/intel_vblank.o \

	display/intel_vga.o \

	display/intel_wm.o \

	display/i9xx_plane.o \

	display/i9xx_wm.o \

	display/skl_scaler.o \

	display/skl_universal_plane.o \

	display/skl_watermark.o

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

0 → 100644
+3922 −0

File added.

Preview size limit exceeded, changes collapsed.

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

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: MIT */

/*

 * Copyright © 2023 Intel Corporation

 */



#ifndef __I9XX_WM_H__

#define __I9XX_WM_H__



#include <linux/types.h>



struct drm_i915_private;

struct intel_crtc_state;

struct intel_plane_state;



int ilk_wm_max_level(const struct drm_i915_private *i915);

void g4x_wm_get_hw_state(struct drm_i915_private *i915);

void vlv_wm_get_hw_state(struct drm_i915_private *i915);

void ilk_wm_get_hw_state(struct drm_i915_private *i915);

void g4x_wm_sanitize(struct drm_i915_private *i915);

void vlv_wm_sanitize(struct drm_i915_private *i915);

bool ilk_disable_lp_wm(struct drm_i915_private *i915);

bool intel_set_memory_cxsr(struct drm_i915_private *i915, bool enable);

void i9xx_wm_init(struct drm_i915_private *i915);



#endif /* __I9XX_WM_H__ */

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

+3 −1
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
#include "i915_reg.h"

#include "i915_utils.h"

#include "i9xx_plane.h"

#include "i9xx_wm.h"

#include "icl_dsi.h"

#include "intel_acpi.h"

#include "intel_atomic.h"
@@ -117,6 +118,7 @@ 
#include "intel_vdsc.h"

#include "intel_vga.h"

#include "intel_vrr.h"

#include "intel_wm.h"

#include "skl_scaler.h"

#include "skl_universal_plane.h"

#include "skl_watermark.h"
@@ -8699,7 +8701,7 @@ int intel_modeset_init_nogem(struct drm_i915_private *i915) 
	if (!HAS_DISPLAY(i915))

		return 0;



	intel_init_pm(i915);

	intel_wm_init(i915);



	intel_panel_sanitize_ssc(i915);

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

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

#include "i915_irq.h"

#include "i915_reg.h"

#include "i9xx_wm.h"

#include "intel_de.h"

#include "intel_display_debugfs.h"

#include "intel_display_power.h"