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

Commit 613d2b27 authored by Maarten Lankhorst's avatar Maarten Lankhorst Committed by Daniel Vetter
Browse files

drm/atomic: pass old crtc state to atomic_begin/flush. 



In intel it's useful to keep track of some state changes with old
crtc state vs new state, for example to disable initial planes or
when a modeset's prevented during fastboot.

Cc: dri-devel@lists.freedesktop.org
Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Reviewed-by: default avatarAnder Conselvan de Oliveira <conselvan2@gmail.com>
[danvet: squash in fixup for exynos provided by Maarten.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fc596660

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+4 −2
Original line number Diff line number Diff line
@@ -239,7 +239,8 @@ static int atmel_hlcdc_crtc_atomic_check(struct drm_crtc *c, 
	return atmel_hlcdc_plane_prepare_disc_area(s);

}



static void atmel_hlcdc_crtc_atomic_begin(struct drm_crtc *c)

static void atmel_hlcdc_crtc_atomic_begin(struct drm_crtc *c,

					  struct drm_crtc_state *old_s)

{

	struct atmel_hlcdc_crtc *crtc = drm_crtc_to_atmel_hlcdc_crtc(c);
@@ -253,7 +254,8 @@ static void atmel_hlcdc_crtc_atomic_begin(struct drm_crtc *c) 
	}

}



static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *crtc)

static void atmel_hlcdc_crtc_atomic_flush(struct drm_crtc *crtc,

					  struct drm_crtc_state *old_s)

{

	/* TODO: write common plane control register if available */

}

drivers/gpu/drm/drm_atomic_helper.c

+4 −4
Original line number Diff line number Diff line
@@ -1164,7 +1164,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, 
		if (!funcs || !funcs->atomic_begin)

			continue;



		funcs->atomic_begin(crtc);

		funcs->atomic_begin(crtc, old_crtc_state);

	}



	for_each_plane_in_state(old_state, plane, old_plane_state, i) {
@@ -1194,7 +1194,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, 
		if (!funcs || !funcs->atomic_flush)

			continue;



		funcs->atomic_flush(crtc);

		funcs->atomic_flush(crtc, old_crtc_state);

	}

}

EXPORT_SYMBOL(drm_atomic_helper_commit_planes);
@@ -1230,7 +1230,7 @@ drm_atomic_helper_commit_planes_on_crtc(struct drm_crtc_state *old_crtc_state) 


	crtc_funcs = crtc->helper_private;

	if (crtc_funcs && crtc_funcs->atomic_begin)

		crtc_funcs->atomic_begin(crtc);

		crtc_funcs->atomic_begin(crtc, old_crtc_state);



	drm_for_each_plane_mask(plane, crtc->dev, plane_mask) {

		struct drm_plane_state *old_plane_state =
@@ -1253,7 +1253,7 @@ drm_atomic_helper_commit_planes_on_crtc(struct drm_crtc_state *old_crtc_state) 
	}



	if (crtc_funcs && crtc_funcs->atomic_flush)

		crtc_funcs->atomic_flush(crtc);

		crtc_funcs->atomic_flush(crtc, old_crtc_state);

}

EXPORT_SYMBOL(drm_atomic_helper_commit_planes_on_crtc);

drivers/gpu/drm/drm_plane_helper.c

+2 −2
Original line number Diff line number Diff line
@@ -437,7 +437,7 @@ int drm_plane_helper_commit(struct drm_plane *plane, 


	for (i = 0; i < 2; i++) {

		if (crtc_funcs[i] && crtc_funcs[i]->atomic_begin)

			crtc_funcs[i]->atomic_begin(crtc[i]);

			crtc_funcs[i]->atomic_begin(crtc[i], crtc[i]->state);

	}



	/*
@@ -452,7 +452,7 @@ int drm_plane_helper_commit(struct drm_plane *plane, 


	for (i = 0; i < 2; i++) {

		if (crtc_funcs[i] && crtc_funcs[i]->atomic_flush)

			crtc_funcs[i]->atomic_flush(crtc[i]);

			crtc_funcs[i]->atomic_flush(crtc[i], crtc[i]->state);

	}



	/*

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+4 −2
Original line number Diff line number Diff line
@@ -80,7 +80,8 @@ exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) 
		exynos_crtc->ops->commit(exynos_crtc);

}



static void exynos_crtc_atomic_begin(struct drm_crtc *crtc)

static void exynos_crtc_atomic_begin(struct drm_crtc *crtc,

				     struct drm_crtc_state *old_crtc_state)

{

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
@@ -90,7 +91,8 @@ static void exynos_crtc_atomic_begin(struct drm_crtc *crtc) 
	}

}



static void exynos_crtc_atomic_flush(struct drm_crtc *crtc)

static void exynos_crtc_atomic_flush(struct drm_crtc *crtc,

				     struct drm_crtc_state *old_crtc_state)

{

}

drivers/gpu/drm/i915/intel_display.c

+6 −4
Original line number Diff line number Diff line
@@ -102,8 +102,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, 
			    const struct intel_crtc_state *pipe_config);

static void chv_prepare_pll(struct intel_crtc *crtc,

			    const struct intel_crtc_state *pipe_config);

static void intel_begin_crtc_commit(struct drm_crtc *crtc);

static void intel_finish_crtc_commit(struct drm_crtc *crtc);

static void intel_begin_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);

static void intel_finish_crtc_commit(struct drm_crtc *, struct drm_crtc_state *);

static void skl_init_scalers(struct drm_device *dev, struct intel_crtc *intel_crtc,

	struct intel_crtc_state *crtc_state);

static int i9xx_get_refclk(const struct intel_crtc_state *crtc_state,
@@ -13628,7 +13628,8 @@ intel_disable_primary_plane(struct drm_plane *plane, 
	dev_priv->display.update_primary_plane(crtc, NULL, 0, 0);

}



static void intel_begin_crtc_commit(struct drm_crtc *crtc)

static void intel_begin_crtc_commit(struct drm_crtc *crtc,

				    struct drm_crtc_state *old_crtc_state)

{

	struct drm_device *dev = crtc->dev;

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
@@ -13644,7 +13645,8 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc) 
		skl_detach_scalers(intel_crtc);

}



static void intel_finish_crtc_commit(struct drm_crtc *crtc)

static void intel_finish_crtc_commit(struct drm_crtc *crtc,

				     struct drm_crtc_state *old_crtc_state)

{

	struct intel_crtc *intel_crtc = to_intel_crtc(crtc);