Commit 0cde0e0f authored by Ville Syrjälä's avatar Ville Syrjälä
Browse files

drm/i915: Nuke skl_ddb_get_hw_state() 



skl_ddb_get_hw_state() is redundant and kinda called in thw wrong
spot anyway. Just kill it.

Cc: Stanislav Lisovskiy <stanislav.lisovskiy@intel.com>
Signed-off-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200225171125.28885-10-ville.syrjala@linux.intel.com


Reviewed-by: default avatarStanislav Lisovskiy <stanislav.lisovskiy@intel.com>
parent 3cf43cdc

drivers/gpu/drm/i915/intel_pm.c

+0 −7
Original line number Diff line number Diff line
@@ -4315,12 +4315,6 @@ void skl_pipe_ddb_get_hw_state(struct intel_crtc *crtc, 
	intel_display_power_put(dev_priv, power_domain, wakeref);

}



void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv)

{

	dev_priv->dbuf.enabled_slices =

		intel_enabled_dbuf_slices_mask(dev_priv);

}



/*

 * Determines the downscale amount of a plane for the purposes of watermark calculations.

 * The bspec defines downscale amount as:
@@ -6181,7 +6175,6 @@ void skl_wm_get_hw_state(struct drm_i915_private *dev_priv) 
	struct intel_crtc *crtc;

	struct intel_crtc_state *crtc_state;



	skl_ddb_get_hw_state(dev_priv);

	for_each_intel_crtc(&dev_priv->drm, crtc) {

		crtc_state = to_intel_crtc_state(crtc->base.state);

drivers/gpu/drm/i915/intel_pm.h

+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ u8 intel_enabled_dbuf_slices_mask(struct drm_i915_private *dev_priv); 
void skl_pipe_ddb_get_hw_state(struct intel_crtc *crtc,

			       struct skl_ddb_entry *ddb_y,

			       struct skl_ddb_entry *ddb_uv);

void skl_ddb_get_hw_state(struct drm_i915_private *dev_priv);

void skl_pipe_wm_get_hw_state(struct intel_crtc *crtc,

			      struct skl_pipe_wm *out);

void g4x_wm_sanitize(struct drm_i915_private *dev_priv);

CRA Git | Maintained and supported by SUSTech CRA and CCSE