Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cd27d88f authored Apr 09, 2018 by Maarten Lankhorst

drm/i915: Change use get_new_plane_state instead of existing plane state



The get_existing macros are deprecated and should be replaced by
get_old/new_state for clarity.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180409124656.39886-1-maarten.lankhorst@linux.intel.com


[mlankhorst: Remove useless warn. (Ville)]
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

parent 0c5c7df3

drivers/gpu/drm/i915/intel_atomic.c

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -227,6 +227,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
	struct intel_crtc_scaler_state *scaler_state =		struct intel_crtc_scaler_state *scaler_state =
	&crtc_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->base.state;
			struct intel_atomic_state *intel_state = to_intel_atomic_state(drm_state);
	int num_scalers_need;		int num_scalers_need;
	int i, j;		int i, j;

	@@ -304,7 +305,7 @@ int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
	continue;		continue;
	}		}

	plane_state = intel_atomic_get_existing_plane_state(drm_state,		plane_state = intel_atomic_get_new_plane_state(intel_state,
	intel_plane);		intel_plane);
	scaler_id = &plane_state->scaler_id;		scaler_id = &plane_state->scaler_id;
	}		}

drivers/gpu/drm/i915/intel_drv.h

+0 −11

Original line number	Original line	Diff line number	Diff line
	@@ -2109,17 +2109,6 @@ intel_atomic_get_existing_crtc_state(struct drm_atomic_state *state,
	return NULL;		return NULL;
	}		}

	static inline struct intel_plane_state *
	intel_atomic_get_existing_plane_state(struct drm_atomic_state *state,
	struct intel_plane *plane)
	{
	struct drm_plane_state *plane_state;

	plane_state = drm_atomic_get_existing_plane_state(state, &plane->base);

	return to_intel_plane_state(plane_state);
	}

	int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,		int intel_atomic_setup_scalers(struct drm_i915_private *dev_priv,
	struct intel_crtc *intel_crtc,		struct intel_crtc *intel_crtc,
	struct intel_crtc_state *crtc_state);		struct intel_crtc_state *crtc_state);

drivers/gpu/drm/i915/intel_pm.c

+0 −2

Original line number	Original line	Diff line number	Diff line
	@@ -5037,8 +5037,6 @@ skl_ddb_add_affected_planes(struct intel_crtc_state *cstate)
	struct drm_plane *plane;		struct drm_plane *plane;
	enum pipe pipe = intel_crtc->pipe;		enum pipe pipe = intel_crtc->pipe;

	WARN_ON(!drm_atomic_get_existing_crtc_state(state, crtc));

	drm_for_each_plane_mask(plane, dev, cstate->base.plane_mask) {		drm_for_each_plane_mask(plane, dev, cstate->base.plane_mask) {
	enum plane_id plane_id = to_intel_plane(plane)->id;		enum plane_id plane_id = to_intel_plane(plane)->id;