Commit 31630f39 authored by Jani Nikula's avatar Jani Nikula
Browse files

drm/i915/display: use display runtime PM interfaces for for atomic state 



Convert intel_atomic_commit() and intel_atomic_commit_tail() to use
display runtime PM interfaces. Also convert the wakeref member type to
struct ref_tracker *, which is the same as intel_wakeref_t, but without
the typedef.

Reviewed-by: default avatarRodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://lore.kernel.org/r/2682fa92089ab87429eef4d45f931839f0d32077.1742483007.git.jani.nikula@intel.com
parent e1de63b8

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

+6 −6
Original line number Diff line number Diff line
@@ -73,6 +73,7 @@ 
#include "intel_de.h"

#include "intel_display_driver.h"

#include "intel_display_power.h"

#include "intel_display_rpm.h"

#include "intel_display_types.h"

#include "intel_dmc.h"

#include "intel_dp.h"
@@ -7229,7 +7230,7 @@ static void intel_atomic_dsb_finish(struct intel_atomic_state *state, 
static void intel_atomic_commit_tail(struct intel_atomic_state *state)

{

	struct intel_display *display = to_intel_display(state);

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

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

	struct intel_crtc_state *new_crtc_state, *old_crtc_state;

	struct intel_crtc *crtc;

	struct intel_power_domain_mask put_domains[I915_MAX_PIPES] = {};
@@ -7443,7 +7444,7 @@ static void intel_atomic_commit_tail(struct intel_atomic_state *state) 
	 * toggling overhead at and above 60 FPS.

	 */

	intel_display_power_put_async_delay(display, POWER_DOMAIN_DC_OFF, wakeref, 17);

	intel_runtime_pm_put(&dev_priv->runtime_pm, state->wakeref);

	intel_display_rpm_put(display, state->wakeref);



	/*

	 * Defer the cleanup of the old state to a separate worker to not
@@ -7515,10 +7516,9 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state, 
{

	struct intel_display *display = to_intel_display(dev);

	struct intel_atomic_state *state = to_intel_atomic_state(_state);

	struct drm_i915_private *dev_priv = to_i915(dev);

	int ret = 0;



	state->wakeref = intel_runtime_pm_get(&dev_priv->runtime_pm);

	state->wakeref = intel_display_rpm_get(display);



	/*

	 * The intel_legacy_cursor_update() fast path takes care
@@ -7552,7 +7552,7 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state, 
	if (ret) {

		drm_dbg_atomic(display->drm,

			       "Preparing state failed with %i\n", ret);

		intel_runtime_pm_put(&dev_priv->runtime_pm, state->wakeref);

		intel_display_rpm_put(display, state->wakeref);

		return ret;

	}
@@ -7562,7 +7562,7 @@ int intel_atomic_commit(struct drm_device *dev, struct drm_atomic_state *_state, 


	if (ret) {

		drm_atomic_helper_unprepare_planes(dev, &state->base);

		intel_runtime_pm_put(&dev_priv->runtime_pm, state->wakeref);

		intel_display_rpm_put(display, state->wakeref);

		return ret;

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -581,7 +581,7 @@ struct dpll { 
struct intel_atomic_state {

	struct drm_atomic_state base;



	intel_wakeref_t wakeref;

	struct ref_tracker *wakeref;



	struct __intel_global_objs_state *global_objs;

	int num_global_objs;