Commit 082ed1ff authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Extract intel_cdclk_crtc_disable_noatomic() 



Hoist the cdclk stuff into a separate function from
intel_crtc_disable_noatomic_complete() so that the details
are better hidden inside intel_cdclk.c.

Reviewed-by: default avatarVinod Govindapillai <vinod.govindapillai@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20250306163420.3961-5-ville.syrjala@linux.intel.com
parent cd5693cf

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

+12 −0
Original line number Diff line number Diff line
@@ -3340,6 +3340,18 @@ int intel_modeset_calc_cdclk(struct intel_atomic_state *state) 
	return 0;

}



void intel_cdclk_crtc_disable_noatomic(struct intel_crtc *crtc)

{

	struct intel_display *display = to_intel_display(crtc);

	struct intel_cdclk_state *cdclk_state =

		to_intel_cdclk_state(display->cdclk.obj.state);

	enum pipe pipe = crtc->pipe;



	cdclk_state->min_cdclk[pipe] = 0;

	cdclk_state->min_voltage_level[pipe] = 0;

	cdclk_state->active_pipes &= ~BIT(pipe);

}



static int intel_compute_max_dotclk(struct intel_display *display)

{

	int ppc = intel_cdclk_ppc(display, HAS_DOUBLE_WIDE(display));

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

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include "intel_global_state.h"



struct intel_atomic_state;

struct intel_crtc;

struct intel_crtc_state;

struct intel_display;
@@ -83,6 +84,7 @@ int intel_cdclk_atomic_check(struct intel_atomic_state *state, 
int intel_cdclk_state_set_joined_mbus(struct intel_atomic_state *state, bool joined_mbus);

struct intel_cdclk_state *

intel_atomic_get_cdclk_state(struct intel_atomic_state *state);

void intel_cdclk_crtc_disable_noatomic(struct intel_crtc *crtc);



#define to_intel_cdclk_state(global_state) \

	container_of_const((global_state), struct intel_cdclk_state, base)

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

+1 −5
Original line number Diff line number Diff line
@@ -158,8 +158,6 @@ static void intel_crtc_disable_noatomic_complete(struct intel_crtc *crtc) 
	struct drm_i915_private *i915 = to_i915(crtc->base.dev);

	struct intel_bw_state *bw_state =

		to_intel_bw_state(i915->display.bw.obj.state);

	struct intel_cdclk_state *cdclk_state =

		to_intel_cdclk_state(i915->display.cdclk.obj.state);

	struct intel_dbuf_state *dbuf_state =

		to_intel_dbuf_state(i915->display.dbuf.obj.state);

	struct intel_pmdemand_state *pmdemand_state =
@@ -179,9 +177,7 @@ static void intel_crtc_disable_noatomic_complete(struct intel_crtc *crtc) 


	intel_display_power_put_all_in_set(display, &crtc->enabled_power_domains);



	cdclk_state->min_cdclk[pipe] = 0;

	cdclk_state->min_voltage_level[pipe] = 0;

	cdclk_state->active_pipes &= ~BIT(pipe);

	intel_cdclk_crtc_disable_noatomic(crtc);



	dbuf_state->active_pipes &= ~BIT(pipe);