Commit 2225f3c6 authored by Maarten Lankhorst's avatar Maarten Lankhorst
Browse files

drm/i915: Perform automated conversions for crtc uapi/hw split, base -> uapi. 



Split up crtc_state->base to uapi. This is done using the following patch,
ran after the previous commit that splits out any hw references:

@@
struct intel_crtc_state *T;
@@
-T->base
+T->uapi

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/20191031112610.27608-5-maarten.lankhorst@linux.intel.com
parent 1326a92c

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

+3 −3
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ gen11_dsi_configure_transcoder(struct intel_encoder *encoder, 
{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);

	struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->base.crtc);

	struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->uapi.crtc);

	enum pipe pipe = intel_crtc->pipe;

	u32 tmp;

	enum port port;
@@ -1242,7 +1242,7 @@ static void gen11_dsi_get_config(struct intel_encoder *encoder, 
				 struct intel_crtc_state *pipe_config)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);

	struct intel_dsi *intel_dsi = enc_to_intel_dsi(&encoder->base);



	/* FIXME: adapt icl_ddi_clock_get() for DSI and use that? */
@@ -1265,7 +1265,7 @@ static int gen11_dsi_compute_config(struct intel_encoder *encoder, 
	struct intel_dsi *intel_dsi = container_of(encoder, struct intel_dsi,

						   base);

	struct intel_connector *intel_connector = intel_dsi->attached_connector;

	struct intel_crtc *crtc = to_intel_crtc(pipe_config->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);

	const struct drm_display_mode *fixed_mode =

					intel_connector->panel.fixed_mode;

	struct drm_display_mode *adjusted_mode =

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

+4 −4
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) 
	if (!crtc_state)

		return NULL;



	__drm_atomic_helper_crtc_duplicate_state(crtc, &crtc_state->base);

	__drm_atomic_helper_crtc_duplicate_state(crtc, &crtc_state->uapi);



	crtc_state->update_pipe = false;

	crtc_state->disable_lp_wm = false;
@@ -205,7 +205,7 @@ intel_crtc_duplicate_state(struct drm_crtc *crtc) 
	crtc_state->fb_bits = 0;

	crtc_state->update_planes = 0;



	return &crtc_state->base;

	return &crtc_state->uapi;

}



/**
@@ -222,7 +222,7 @@ intel_crtc_destroy_state(struct drm_crtc *crtc, 
{

	struct intel_crtc_state *crtc_state = to_intel_crtc_state(state);



	__drm_atomic_helper_crtc_destroy_state(&crtc_state->base);

	__drm_atomic_helper_crtc_destroy_state(&crtc_state->uapi);

	kfree(crtc_state);

}
@@ -322,7 +322,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv, 
	struct intel_plane_state *plane_state = NULL;

	struct intel_crtc_scaler_state *scaler_state =

		&crtc_state->scaler_state;

	struct drm_atomic_state *drm_state = crtc_state->base.state;

	struct drm_atomic_state *drm_state = crtc_state->uapi.state;

	struct intel_atomic_state *intel_state = to_intel_atomic_state(drm_state);

	int num_scalers_need;

	int i;

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

+3 −3
Original line number Diff line number Diff line
@@ -307,7 +307,7 @@ void intel_update_plane(struct intel_plane *plane, 
			const struct intel_crtc_state *crtc_state,

			const struct intel_plane_state *plane_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);



	trace_intel_update_plane(&plane->base, crtc);

	plane->update_plane(plane, crtc_state, plane_state);
@@ -317,7 +317,7 @@ void intel_update_slave(struct intel_plane *plane, 
			const struct intel_crtc_state *crtc_state,

			const struct intel_plane_state *plane_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);



	trace_intel_update_plane(&plane->base, crtc);

	plane->update_slave(plane, crtc_state, plane_state);
@@ -326,7 +326,7 @@ void intel_update_slave(struct intel_plane *plane, 
void intel_disable_plane(struct intel_plane *plane,

			 const struct intel_crtc_state *crtc_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);



	trace_intel_disable_plane(&plane->base, crtc);

	plane->disable_plane(plane, crtc_state);

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

+4 −4
Original line number Diff line number Diff line
@@ -555,7 +555,7 @@ static void ilk_audio_codec_disable(struct intel_encoder *encoder, 
				    const struct drm_connector_state *old_conn_state)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);

	enum pipe pipe = crtc->pipe;

	enum port port = encoder->port;

	u32 tmp, eldv;
@@ -602,7 +602,7 @@ static void ilk_audio_codec_enable(struct intel_encoder *encoder, 
				   const struct drm_connector_state *conn_state)

{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

	struct drm_connector *connector = conn_state->connector;

	enum pipe pipe = crtc->pipe;

	enum port port = encoder->port;
@@ -692,7 +692,7 @@ void intel_audio_codec_enable(struct intel_encoder *encoder, 
{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct i915_audio_component *acomp = dev_priv->audio_component;

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

	struct drm_connector *connector = conn_state->connector;

	const struct drm_display_mode *adjusted_mode =

		&crtc_state->hw.adjusted_mode;
@@ -753,7 +753,7 @@ void intel_audio_codec_disable(struct intel_encoder *encoder, 
{

	struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);

	struct i915_audio_component *acomp = dev_priv->audio_component;

	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(old_crtc_state->uapi.crtc);

	enum port port = encoder->port;

	enum pipe pipe = crtc->pipe;

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

+2 −2
Original line number Diff line number Diff line
@@ -297,7 +297,7 @@ static unsigned int intel_bw_crtc_num_active_planes(const struct intel_crtc_stat 


static unsigned int intel_bw_crtc_data_rate(const struct intel_crtc_state *crtc_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);

	unsigned int data_rate = 0;

	enum plane_id plane_id;
@@ -318,7 +318,7 @@ static unsigned int intel_bw_crtc_data_rate(const struct intel_crtc_state *crtc_ 
void intel_bw_crtc_update(struct intel_bw_state *bw_state,

			  const struct intel_crtc_state *crtc_state)

{

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->base.crtc);

	struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);



	bw_state->data_rate[crtc->pipe] =

		intel_bw_crtc_data_rate(crtc_state);

CRA Git | Maintained and supported by SUSTech CRA and CCSE