Skip to content

Commit

Permalink
drm/i915: Hoover the IPS enable/disable calls into the pre/post updat…
Browse files Browse the repository at this point in the history 
…e hooks

No reason the caller of the IPS pre/post update hooks should
be responsible for the actual IPS enab/disable. Just pull those
calls into the pre/post update hooks themselves. And while
at it let's adjust the function naming a bit to have a consistent
namespace.

Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20220209113526.7595-3-ville.syrjala@linux.intel.com
Reviewed-by: Jani Nikula <jani.nikula@intel.com>
  • Loading branch information
Ville Syrjälä committed Feb 9, 2022
1 parent efbb7c9 commit 2feb6b0
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 14 deletions.
46 changes: 34 additions & 12 deletions drivers/gpu/drm/i915/display/intel_display.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,7 @@ static void bdw_set_pipemisc(const struct intel_crtc_state *crtc_state);
static void ilk_pfit_enable(const struct intel_crtc_state *crtc_state);
static void intel_modeset_setup_hw_state(struct drm_device *dev,
struct drm_modeset_acquire_ctx *ctx);
static bool hsw_ips_disable(const struct intel_crtc_state *crtc_state);

/**
* intel_update_watermarks - update FIFO watermark values based on current modes
Expand Down Expand Up @@ -753,7 +754,7 @@ void intel_plane_disable_noatomic(struct intel_crtc *crtc,
crtc_state->min_cdclk[plane->id] = 0;

if (plane->id == PLANE_PRIMARY &&
hsw_disable_ips(crtc_state))
hsw_ips_disable(crtc_state))
intel_crtc_wait_for_next_vblank(crtc);

/*
Expand Down Expand Up @@ -1091,7 +1092,7 @@ static void ilk_pfit_enable(const struct intel_crtc_state *crtc_state)
intel_de_write(dev_priv, PF_WIN_SZ(pipe), width << 16 | height);
}

void hsw_enable_ips(const struct intel_crtc_state *crtc_state)
static void hsw_ips_enable(const struct intel_crtc_state *crtc_state)
{
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_device *dev = crtc->base.dev;
Expand Down Expand Up @@ -1128,7 +1129,7 @@ void hsw_enable_ips(const struct intel_crtc_state *crtc_state)
}
}

bool hsw_disable_ips(const struct intel_crtc_state *crtc_state)
static bool hsw_ips_disable(const struct intel_crtc_state *crtc_state)
{
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
struct drm_device *dev = crtc->base.dev;
Expand Down Expand Up @@ -1170,8 +1171,8 @@ static void intel_crtc_dpms_overlay_disable(struct intel_crtc *crtc)
*/
}

static bool hsw_pre_update_disable_ips(struct intel_atomic_state *state,
struct intel_crtc *crtc)
static bool hsw_ips_need_disable(struct intel_atomic_state *state,
struct intel_crtc *crtc)
{
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
const struct intel_crtc_state *old_crtc_state =
Expand Down Expand Up @@ -1200,8 +1201,20 @@ static bool hsw_pre_update_disable_ips(struct intel_atomic_state *state,
return !new_crtc_state->ips_enabled;
}

static bool hsw_post_update_enable_ips(struct intel_atomic_state *state,
struct intel_crtc *crtc)
static bool hsw_ips_pre_update(struct intel_atomic_state *state,
struct intel_crtc *crtc)
{
const struct intel_crtc_state *old_crtc_state =
intel_atomic_get_old_crtc_state(state, crtc);

if (!hsw_ips_need_disable(state, crtc))
return false;

return hsw_ips_disable(old_crtc_state);
}

static bool hsw_ips_need_enable(struct intel_atomic_state *state,
struct intel_crtc *crtc)
{
struct drm_i915_private *dev_priv = to_i915(state->base.dev);
const struct intel_crtc_state *old_crtc_state =
Expand Down Expand Up @@ -1237,6 +1250,18 @@ static bool hsw_post_update_enable_ips(struct intel_atomic_state *state,
return !old_crtc_state->ips_enabled;
}

static void hsw_ips_post_update(struct intel_atomic_state *state,
struct intel_crtc *crtc)
{
const struct intel_crtc_state *new_crtc_state =
intel_atomic_get_new_crtc_state(state, crtc);

if (!hsw_ips_need_enable(state, crtc))
return;

hsw_ips_enable(new_crtc_state);
}

static bool needs_nv12_wa(const struct intel_crtc_state *crtc_state)
{
struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
Expand Down Expand Up @@ -1331,9 +1356,7 @@ static void intel_post_plane_update(struct intel_atomic_state *state,
if (new_crtc_state->update_wm_post && new_crtc_state->hw.active)
intel_update_watermarks(dev_priv);

if (hsw_post_update_enable_ips(state, crtc))
hsw_enable_ips(new_crtc_state);

hsw_ips_post_update(state, crtc);
intel_fbc_post_update(state, crtc);
intel_drrs_page_flip(state, crtc);

Expand Down Expand Up @@ -1436,8 +1459,7 @@ static void intel_pre_plane_update(struct intel_atomic_state *state,

intel_psr_pre_plane_update(state, crtc);

if (hsw_pre_update_disable_ips(state, crtc) &&
hsw_disable_ips(old_crtc_state))
if (hsw_ips_pre_update(state, crtc))
intel_crtc_wait_for_next_vblank(crtc);

if (intel_fbc_pre_update(state, crtc))
Expand Down
2 changes: 0 additions & 2 deletions drivers/gpu/drm/i915/display/intel_display.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -633,8 +633,6 @@ void i9xx_crtc_clock_get(struct intel_crtc *crtc,
struct intel_crtc_state *pipe_config);
int intel_dotclock_calculate(int link_freq, const struct intel_link_m_n *m_n);
bool hsw_crtc_state_ips_capable(const struct intel_crtc_state *crtc_state);
void hsw_enable_ips(const struct intel_crtc_state *crtc_state);
bool hsw_disable_ips(const struct intel_crtc_state *crtc_state);
enum intel_display_power_domain intel_port_to_power_domain(enum port port);
enum intel_display_power_domain
intel_aux_power_domain(struct intel_digital_port *dig_port);
Expand Down

0 comments on commit 2feb6b0

Please sign in to comment.