Skip to content

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

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
Hide whitespace changes
Inline Side-by-side
Showing with 44 additions and 26 deletions
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c
View file @ 613d2b27
...@@ -239,7 +239,8 @@ static int atmel_hlcdc_crtc_atomic_check(struct drm_crtc *c, ...@@ -239,7 +239,8 @@ static int atmel_hlcdc_crtc_atomic_check(struct drm_crtc *c,
return atmel_hlcdc_plane_prepare_disc_area(s); 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); 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) ...@@ -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 */ /* TODO: write common plane control register if available */
} }
......
drivers/gpu/drm/drm_atomic_helper.c
View file @ 613d2b27
...@@ -1164,7 +1164,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev, ...@@ -1164,7 +1164,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
if (!funcs || !funcs->atomic_begin) if (!funcs || !funcs->atomic_begin)
continue; continue;
funcs->atomic_begin(crtc); funcs->atomic_begin(crtc, old_crtc_state);
} }
for_each_plane_in_state(old_state, plane, old_plane_state, i) { 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, ...@@ -1194,7 +1194,7 @@ void drm_atomic_helper_commit_planes(struct drm_device *dev,
if (!funcs || !funcs->atomic_flush) if (!funcs || !funcs->atomic_flush)
continue; continue;
funcs->atomic_flush(crtc); funcs->atomic_flush(crtc, old_crtc_state);
} }
} }
EXPORT_SYMBOL(drm_atomic_helper_commit_planes); 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) ...@@ -1230,7 +1230,7 @@ drm_atomic_helper_commit_planes_on_crtc(struct drm_crtc_state *old_crtc_state)
crtc_funcs = crtc->helper_private; crtc_funcs = crtc->helper_private;
if (crtc_funcs && crtc_funcs->atomic_begin) 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) { drm_for_each_plane_mask(plane, crtc->dev, plane_mask) {
struct drm_plane_state *old_plane_state = 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) ...@@ -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) 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); EXPORT_SYMBOL(drm_atomic_helper_commit_planes_on_crtc);
......
drivers/gpu/drm/drm_plane_helper.c
View file @ 613d2b27
...@@ -437,7 +437,7 @@ int drm_plane_helper_commit(struct drm_plane *plane, ...@@ -437,7 +437,7 @@ int drm_plane_helper_commit(struct drm_plane *plane,
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (crtc_funcs[i] && crtc_funcs[i]->atomic_begin) 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, ...@@ -452,7 +452,7 @@ int drm_plane_helper_commit(struct drm_plane *plane,
for (i = 0; i < 2; i++) { for (i = 0; i < 2; i++) {
if (crtc_funcs[i] && crtc_funcs[i]->atomic_flush) 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
View file @ 613d2b27
...@@ -80,7 +80,8 @@ exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) ...@@ -80,7 +80,8 @@ exynos_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
exynos_crtc->ops->commit(exynos_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); struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
...@@ -90,7 +91,8 @@ static void exynos_crtc_atomic_begin(struct drm_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
View file @ 613d2b27
...@@ -102,8 +102,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc, ...@@ -102,8 +102,8 @@ static void vlv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config); const struct intel_crtc_state *pipe_config);
static void chv_prepare_pll(struct intel_crtc *crtc, static void chv_prepare_pll(struct intel_crtc *crtc,
const struct intel_crtc_state *pipe_config); const struct intel_crtc_state *pipe_config);
static void intel_begin_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 *crtc); 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, static void skl_init_scalers(struct drm_device *dev, struct intel_crtc *intel_crtc,
struct intel_crtc_state *crtc_state); struct intel_crtc_state *crtc_state);
static int i9xx_get_refclk(const 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, ...@@ -13628,7 +13628,8 @@ intel_disable_primary_plane(struct drm_plane *plane,
dev_priv->display.update_primary_plane(crtc, NULL, 0, 0); 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 drm_device *dev = crtc->dev;
struct intel_crtc *intel_crtc = to_intel_crtc(crtc); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
...@@ -13644,7 +13645,8 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc) ...@@ -13644,7 +13645,8 @@ static void intel_begin_crtc_commit(struct drm_crtc *crtc)
skl_detach_scalers(intel_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); struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
......
drivers/gpu/drm/msm/mdp/mdp4/mdp4_crtc.c
View file @ 613d2b27
...@@ -334,13 +334,15 @@ static int mdp4_crtc_atomic_check(struct drm_crtc *crtc, ...@@ -334,13 +334,15 @@ static int mdp4_crtc_atomic_check(struct drm_crtc *crtc,
return 0; return 0;
} }
static void mdp4_crtc_atomic_begin(struct drm_crtc *crtc) static void mdp4_crtc_atomic_begin(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc); struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
DBG("%s: begin", mdp4_crtc->name); DBG("%s: begin", mdp4_crtc->name);
} }
static void mdp4_crtc_atomic_flush(struct drm_crtc *crtc) static void mdp4_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc); struct mdp4_crtc *mdp4_crtc = to_mdp4_crtc(crtc);
struct drm_device *dev = crtc->dev; struct drm_device *dev = crtc->dev;
......
drivers/gpu/drm/msm/mdp/mdp5/mdp5_crtc.c
View file @ 613d2b27
...@@ -388,13 +388,15 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc, ...@@ -388,13 +388,15 @@ static int mdp5_crtc_atomic_check(struct drm_crtc *crtc,
return 0; return 0;
} }
static void mdp5_crtc_atomic_begin(struct drm_crtc *crtc) static void mdp5_crtc_atomic_begin(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc); struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc);
DBG("%s: begin", mdp5_crtc->name); DBG("%s: begin", mdp5_crtc->name);
} }
static void mdp5_crtc_atomic_flush(struct drm_crtc *crtc) static void mdp5_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc); struct mdp5_crtc *mdp5_crtc = to_mdp5_crtc(crtc);
struct drm_device *dev = crtc->dev; struct drm_device *dev = crtc->dev;
......
drivers/gpu/drm/rcar-du/rcar_du_crtc.c
View file @ 613d2b27
...@@ -496,7 +496,8 @@ static bool rcar_du_crtc_mode_fixup(struct drm_crtc *crtc, ...@@ -496,7 +496,8 @@ static bool rcar_du_crtc_mode_fixup(struct drm_crtc *crtc,
return true; return true;
} }
static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc) static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
struct drm_pending_vblank_event *event = crtc->state->event; struct drm_pending_vblank_event *event = crtc->state->event;
struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc); struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
...@@ -512,7 +513,8 @@ static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc) ...@@ -512,7 +513,8 @@ static void rcar_du_crtc_atomic_begin(struct drm_crtc *crtc)
} }
} }
static void rcar_du_crtc_atomic_flush(struct drm_crtc *crtc) static void rcar_du_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc); struct rcar_du_crtc *rcrtc = to_rcar_crtc(crtc);
......
drivers/gpu/drm/sti/sti_drm_crtc.c
View file @ 613d2b27
...@@ -164,7 +164,8 @@ sti_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) ...@@ -164,7 +164,8 @@ sti_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)
sti_drm_crtc_mode_set(crtc, &crtc->state->adjusted_mode); sti_drm_crtc_mode_set(crtc, &crtc->state->adjusted_mode);
} }
static void sti_drm_atomic_begin(struct drm_crtc *crtc) static void sti_drm_atomic_begin(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
struct sti_mixer *mixer = to_sti_mixer(crtc); struct sti_mixer *mixer = to_sti_mixer(crtc);
...@@ -178,7 +179,8 @@ static void sti_drm_atomic_begin(struct drm_crtc *crtc) ...@@ -178,7 +179,8 @@ static void sti_drm_atomic_begin(struct drm_crtc *crtc)
} }
} }
static void sti_drm_atomic_flush(struct drm_crtc *crtc) static void sti_drm_atomic_flush(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
} }
......
drivers/gpu/drm/tegra/dc.c
View file @ 613d2b27
...@@ -1277,7 +1277,8 @@ static int tegra_crtc_atomic_check(struct drm_crtc *crtc, ...@@ -1277,7 +1277,8 @@ static int tegra_crtc_atomic_check(struct drm_crtc *crtc,
return 0; return 0;
} }
static void tegra_crtc_atomic_begin(struct drm_crtc *crtc) static void tegra_crtc_atomic_begin(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
struct tegra_dc *dc = to_tegra_dc(crtc); struct tegra_dc *dc = to_tegra_dc(crtc);
...@@ -1291,7 +1292,8 @@ static void tegra_crtc_atomic_begin(struct drm_crtc *crtc) ...@@ -1291,7 +1292,8 @@ static void tegra_crtc_atomic_begin(struct drm_crtc *crtc)
} }
} }
static void tegra_crtc_atomic_flush(struct drm_crtc *crtc) static void tegra_crtc_atomic_flush(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state)
{ {
struct tegra_dc_state *state = to_dc_state(crtc->state); struct tegra_dc_state *state = to_dc_state(crtc->state);
struct tegra_dc *dc = to_tegra_dc(crtc); struct tegra_dc *dc = to_tegra_dc(crtc);
......
include/drm/drm_crtc_helper.h
View file @ 613d2b27
...@@ -108,8 +108,10 @@ struct drm_crtc_helper_funcs { ...@@ -108,8 +108,10 @@ struct drm_crtc_helper_funcs {
/* atomic helpers */ /* atomic helpers */
int (*atomic_check)(struct drm_crtc *crtc, int (*atomic_check)(struct drm_crtc *crtc,
struct drm_crtc_state *state); struct drm_crtc_state *state);
void (*atomic_begin)(struct drm_crtc *crtc); void (*atomic_begin)(struct drm_crtc *crtc,
void (*atomic_flush)(struct drm_crtc *crtc); struct drm_crtc_state *old_crtc_state);
void (*atomic_flush)(struct drm_crtc *crtc,
struct drm_crtc_state *old_crtc_state);
}; };
/** /**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7