Commit f9f4ffa8 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/dpll: convert intel_dpll.[ch] to struct intel_display 



Going forward, struct intel_display is the main display device data
pointer. Convert as much as possible of intel_dpll.[ch] to struct
intel_display.

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


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

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

+2 −2
Original line number Diff line number Diff line
@@ -2134,9 +2134,9 @@ static void i9xx_crtc_disable(struct intel_atomic_state *state, 


	if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DSI)) {

		if (display->platform.cherryview)

			chv_disable_pll(dev_priv, pipe);

			chv_disable_pll(display, pipe);

		else if (display->platform.valleyview)

			vlv_disable_pll(dev_priv, pipe);

			vlv_disable_pll(display, pipe);

		else

			i9xx_disable_pll(old_crtc_state);

	}

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

+1 −3
Original line number Diff line number Diff line
@@ -181,8 +181,6 @@ static void intel_plane_possible_crtcs_init(struct intel_display *display) 


void intel_display_driver_early_probe(struct intel_display *display)

{

	struct drm_i915_private *i915 = to_i915(display->drm);



	if (!HAS_DISPLAY(display))

		return;
@@ -198,7 +196,7 @@ void intel_display_driver_early_probe(struct intel_display *display) 
	intel_color_init_hooks(display);

	intel_init_cdclk_hooks(display);

	intel_audio_hooks_init(display);

	intel_dpll_init_clock_hook(i915);

	intel_dpll_init_clock_hook(display);

	intel_init_display_hooks(display);

	intel_fdi_init_hook(display);

	intel_dmc_wl_init(display);

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

+149 −163

File changed.

Preview size limit exceeded, changes collapsed.

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

+6 −7
Original line number Diff line number Diff line
@@ -8,16 +8,15 @@ 


#include <linux/types.h>



enum pipe;

struct dpll;

struct drm_i915_private;

struct intel_atomic_state;

struct intel_crtc;

struct intel_crtc_state;

struct intel_display;

struct intel_dpll_hw_state;

enum pipe;



void intel_dpll_init_clock_hook(struct drm_i915_private *dev_priv);

void intel_dpll_init_clock_hook(struct intel_display *display);

int intel_dpll_crtc_compute_clock(struct intel_atomic_state *state,

				  struct intel_crtc *crtc);

int intel_dpll_crtc_get_shared_dpll(struct intel_atomic_state *state,
@@ -29,14 +28,14 @@ void i9xx_dpll_get_hw_state(struct intel_crtc *crtc, 
void vlv_compute_dpll(struct intel_crtc_state *crtc_state);

void chv_compute_dpll(struct intel_crtc_state *crtc_state);



int vlv_force_pll_on(struct drm_i915_private *dev_priv, enum pipe pipe,

int vlv_force_pll_on(struct intel_display *display, enum pipe pipe,

		     const struct dpll *dpll);

void vlv_force_pll_off(struct drm_i915_private *dev_priv, enum pipe pipe);

void vlv_force_pll_off(struct intel_display *display, enum pipe pipe);



void chv_enable_pll(const struct intel_crtc_state *crtc_state);

void chv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe);

void chv_disable_pll(struct intel_display *display, enum pipe pipe);

void vlv_enable_pll(const struct intel_crtc_state *crtc_state);

void vlv_disable_pll(struct drm_i915_private *dev_priv, enum pipe pipe);

void vlv_disable_pll(struct intel_display *display, enum pipe pipe);

void i9xx_enable_pll(const struct intel_crtc_state *crtc_state);

void i9xx_disable_pll(const struct intel_crtc_state *crtc_state);

bool bxt_find_best_dpll(struct intel_crtc_state *crtc_state,

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

+2 −3
Original line number Diff line number Diff line
@@ -91,7 +91,6 @@ static void 
vlv_power_sequencer_kick(struct intel_dp *intel_dp)

{

	struct intel_display *display = to_intel_display(intel_dp);

	struct drm_i915_private *dev_priv = to_i915(display->drm);

	struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);

	enum pipe pipe = intel_dp->pps.vlv_pps_pipe;

	bool pll_enabled, release_cl_override = false;
@@ -134,7 +133,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp) 
		release_cl_override = display->platform.cherryview &&

			!chv_phy_powergate_ch(display, phy, ch, true);



		if (vlv_force_pll_on(dev_priv, pipe, vlv_get_dpll(display))) {

		if (vlv_force_pll_on(display, pipe, vlv_get_dpll(display))) {

			drm_err(display->drm,

				"Failed to force on PLL for pipe %c!\n",

				pipe_name(pipe));
@@ -158,7 +157,7 @@ vlv_power_sequencer_kick(struct intel_dp *intel_dp) 
	intel_de_posting_read(display, intel_dp->output_reg);



	if (!pll_enabled) {

		vlv_force_pll_off(dev_priv, pipe);

		vlv_force_pll_off(display, pipe);



		if (release_cl_override)

			chv_phy_powergate_ch(display, phy, ch, false);