Commit 855e0d68 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Convert most of atomic commit to take more intel state 



Instead of passing along drm_crtc_state and drm_atomic_state, pass
along more intel_atomic_state and intel_crtc_state. This will
make the code more readable by not casting between drm state
and intel state all the time.

While at it, rename old_state to state, with the get_new/old helpers
there is no point in distinguishing between state before and after
swapping state any more. (Ville)

Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190628085517.31886-3-maarten.lankhorst@linux.intel.com
parent 69f786ae

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

+199 −230

File changed.

Preview size limit exceeded, changes collapsed.

drivers/gpu/drm/i915/i915_drv.h

+3 −3
Original line number Diff line number Diff line
@@ -307,10 +307,10 @@ struct drm_i915_display_funcs { 
	int (*crtc_compute_clock)(struct intel_crtc *crtc,

				  struct intel_crtc_state *crtc_state);

	void (*crtc_enable)(struct intel_crtc_state *pipe_config,

			    struct drm_atomic_state *old_state);

			    struct intel_atomic_state *old_state);

	void (*crtc_disable)(struct intel_crtc_state *old_crtc_state,

			     struct drm_atomic_state *old_state);

	void (*update_crtcs)(struct drm_atomic_state *state);

			     struct intel_atomic_state *old_state);

	void (*update_crtcs)(struct intel_atomic_state *state);

	void (*audio_codec_enable)(struct intel_encoder *encoder,

				   const struct intel_crtc_state *crtc_state,

				   const struct drm_connector_state *conn_state);

drivers/gpu/drm/i915/intel_pm.c

+5 −6
Original line number Diff line number Diff line
@@ -3736,11 +3736,10 @@ intel_disable_sagv(struct drm_i915_private *dev_priv) 
	return 0;

}



bool intel_can_enable_sagv(struct drm_atomic_state *state)

bool intel_can_enable_sagv(struct intel_atomic_state *state)

{

	struct drm_device *dev = state->dev;

	struct drm_device *dev = state->base.dev;

	struct drm_i915_private *dev_priv = to_i915(dev);

	struct intel_atomic_state *intel_state = to_intel_atomic_state(state);

	struct intel_crtc *crtc;

	struct intel_plane *plane;

	struct intel_crtc_state *cstate;
@@ -3761,18 +3760,18 @@ bool intel_can_enable_sagv(struct drm_atomic_state *state) 
	/*

	 * If there are no active CRTCs, no additional checks need be performed

	 */

	if (hweight32(intel_state->active_crtcs) == 0)

	if (hweight32(state->active_crtcs) == 0)

		return true;



	/*

	 * SKL+ workaround: bspec recommends we disable SAGV when we have

	 * more then one pipe enabled

	 */

	if (hweight32(intel_state->active_crtcs) > 1)

	if (hweight32(state->active_crtcs) > 1)

		return false;



	/* Since we're now guaranteed to only have one active CRTC... */

	pipe = ffs(intel_state->active_crtcs) - 1;

	pipe = ffs(state->active_crtcs) - 1;

	crtc = intel_get_crtc_for_pipe(dev_priv, pipe);

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

drivers/gpu/drm/i915/intel_pm.h

+2 −2
Original line number Diff line number Diff line
@@ -10,10 +10,10 @@ 


#include "i915_reg.h"



struct drm_atomic_state;

struct drm_device;

struct drm_i915_private;

struct i915_request;

struct intel_atomic_state;

struct intel_crtc;

struct intel_crtc_state;

struct intel_plane;
@@ -52,7 +52,7 @@ 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);

void vlv_wm_sanitize(struct drm_i915_private *dev_priv);

bool intel_can_enable_sagv(struct drm_atomic_state *state);

bool intel_can_enable_sagv(struct intel_atomic_state *state);

int intel_enable_sagv(struct drm_i915_private *dev_priv);

int intel_disable_sagv(struct drm_i915_private *dev_priv);

bool skl_wm_level_equals(const struct skl_wm_level *l1,