drm: Use state helper instead of CRTC state pointer
Subsystems (14)
PATCH v2 1/1 drm: Use state helper instead of CRTC state pointer
Many drivers reference the crtc->pointer in order to get the current CRTC state in their atomic_begin or atomic_flush hooks, which would be the new CRTC state in the global atomic state since _swap_state happened when those hooks are run.
Use the drm_atomic_get_new_crtc_state helper to get that state to make it more obvious.
This was made using the coccinelle script below:
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
(
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_begin = func,
...,
};
|
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_flush = func,
...,
};)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct tegra_dc_state *crtc_state = e;
+ struct tegra_dc_state *dc_state = e;
<+...
- crtc_state
+ dc_state
...+>
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbol crtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct mtk_crtc_state *crtc_state = e;
+ struct mtk_crtc_state *mtk_crtc_state = e;
<+...
- crtc_state
+ mtk_crtc_state
...+>
}
@ replaces_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- struct drm_crtc_state *crtc_state = crtc->state;
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
}
@@
identifier crtc_atomic_func.func;
identifier crtc, state, crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) { struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ adds_new_state @
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
+ struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
...
- crtc->state
+ crtc_state
...
}
@ include depends on adds_new_state || replaces_new_state @ @@
#include <drm/drm_atomic.h>
@ no_include depends on !include && (adds_new_state || replaces_new_state) @ @@
+ #include <drm/drm_atomic.h>
#include <drm/...>
---
Changes from v1:
- Fixed checkpatch warnings
--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 4 +++- drivers/gpu/drm/armada/armada_crtc.c | 8 ++++++-- drivers/gpu/drm/ast/ast_mode.c | 4 +++- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 7 +++++-- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 15 +++++++++------ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 ++++-- drivers/gpu/drm/tegra/dc.c | 8 +++++--- drivers/gpu/drm/virtio/virtgpu_display.c | 4 +++- 8 files changed, 38 insertions(+), 18 deletions(-)
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +3 -1
@@ -387,10 +387,12 @@ static void komeda_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { + struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, + crtc);struct drm_crtc_state *old =drm_atomic_get_old_crtc_state (state, crtc);/* commit with modeset will be handled in enable/disable */ -if (drm_atomic_crtc_needs_modeset (crtc->state)) +if (drm_atomic_crtc_needs_modeset (crtc_state))return ;komeda_crtc_do_flush (crtc, old);
drivers/gpu/drm/armada/armada_crtc.c +6 -2
@@ -431,11 +431,13 @@ static int armada_drm_crtc_atomic_check(struct drm_crtc *crtc,static void armada_drm_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct armada_crtc *dcrtc =drm_to_armada_crtc (crtc);DRM_DEBUG_KMS ("[CRTC:%d:%s]\n" , crtc->base.id, crtc->name); -if (crtc->state->color_mgmt_changed) +if (crtc_state->color_mgmt_changed)armada_drm_update_gamma (crtc); dcrtc->regs_idx =0 ;
@@ -445,6 +447,8 @@ static void armada_drm_crtc_atomic_begin(struct drm_crtc *crtc,static void armada_drm_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct armada_crtc *dcrtc =drm_to_armada_crtc (crtc);DRM_DEBUG_KMS ("[CRTC:%d:%s]\n" , crtc->base.id, crtc->name);
@@ -455,7 +459,7 @@ static void armada_drm_crtc_atomic_flush(struct drm_crtc *crtc,* If we aren't doing a full modeset, then we need to queue * the event here. */ -if (!drm_atomic_crtc_needs_modeset (crtc->state)) { +if (!drm_atomic_crtc_needs_modeset (crtc_state)) { dcrtc->update_pending = true;armada_drm_crtc_queue_state_event (crtc);spin_lock_irq (&dcrtc->irq_lock);
drivers/gpu/drm/ast/ast_mode.c +3 -1
@@ -782,10 +782,12 @@ static void ast_crtc_helper_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { + struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, + crtc);struct drm_crtc_state *old_crtc_state =drm_atomic_get_old_crtc_state (state, crtc);struct ast_private *ast =to_ast_private (crtc->dev); -struct ast_crtc_state *ast_crtc_state =to_ast_crtc_state (crtc->state); +struct ast_crtc_state *ast_crtc_state =to_ast_crtc_state (crtc_state);struct ast_crtc_state *old_ast_crtc_state =to_ast_crtc_state (old_crtc_state);/*
drivers/gpu/drm/ingenic/ingenic-drm-drv.c +5 -2
@@ -305,11 +305,13 @@ ingenic_drm_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_modestatic void ingenic_drm_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct ingenic_drm *priv =drm_crtc_get_priv (crtc);u32 ctrl =0 ;if (priv->soc_info->has_osd && -drm_atomic_crtc_needs_modeset (crtc->state)) { +drm_atomic_crtc_needs_modeset (crtc_state)) {/* * If IPU plane is enabled, enable IPU as source for the F1 * plane; otherwise use regular DMA.
@@ -326,7 +328,8 @@ static void ingenic_drm_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) {struct ingenic_drm *priv =drm_crtc_get_priv (crtc); -struct drm_crtc_state *crtc_state = crtc->state; +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct drm_pending_vblank_event *event = crtc_state->event;if (drm_atomic_crtc_needs_modeset (crtc_state)) {
drivers/gpu/drm/mediatek/mtk_drm_crtc.c +9 -6
@@ -11,6 +11,7 @@#include <asm/barrier.h> #include <soc/mediatek/smi.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h>
@@ -577,17 +578,19 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,static void mtk_drm_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { -struct mtk_crtc_state *crtc_state =to_mtk_crtc_state (crtc->state); +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); +struct mtk_crtc_state *mtk_crtc_state =to_mtk_crtc_state (crtc_state);struct mtk_drm_crtc *mtk_crtc =to_mtk_crtc (crtc); -if (mtk_crtc->event && crtc_state->base.event) +if (mtk_crtc->event && mtk_crtc_state->base.event)DRM_ERROR ("new event while there is still a pending event\n" ); -if (crtc_state->base.event) { - crtc_state->base.event->pipe =drm_crtc_index (crtc); +if (mtk_crtc_state->base.event) { + mtk_crtc_state->base.event->pipe =drm_crtc_index (crtc);WARN_ON (drm_crtc_vblank_get (crtc) !=0 ); - mtk_crtc->event = crtc_state->base.event; - crtc_state->base.event =NULL ; + mtk_crtc->event = mtk_crtc_state->base.event; + mtk_crtc_state->base.event =NULL ; } }
drivers/gpu/drm/rockchip/rockchip_drm_vop.c +4 -2
@@ -1248,6 +1248,8 @@ static void vop_crtc_gamma_set(struct vop *vop, struct drm_crtc *crtc,static void vop_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct drm_crtc_state *old_crtc_state =drm_atomic_get_old_crtc_state (state, crtc);struct vop *vop =to_vop (crtc);
@@ -1256,8 +1258,8 @@ static void vop_crtc_atomic_begin(struct drm_crtc *crtc,* Only update GAMMA if the 'active' flag is not changed, * otherwise it's updated by .atomic_enable. */ -if (crtc->state->color_mgmt_changed && - !crtc->state->active_changed) +if (crtc_state->color_mgmt_changed && + !crtc_state->active_changed)vop_crtc_gamma_set (vop, crtc, old_crtc_state); }
drivers/gpu/drm/tegra/dc.c +5 -3
@@ -1939,15 +1939,17 @@ static void tegra_crtc_atomic_begin(struct drm_crtc *crtc,static void tegra_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { -struct tegra_dc_state *crtc_state =to_dc_state (crtc->state); +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); +struct tegra_dc_state *dc_state =to_dc_state (crtc_state);struct tegra_dc *dc =to_tegra_dc (crtc);u32 value; - value = crtc_state->planes <<8 |GENERAL_UPDATE ; + value = dc_state->planes <<8 |GENERAL_UPDATE ;tegra_dc_writel (dc, value,DC_CMD_STATE_CONTROL ); value =tegra_dc_readl (dc,DC_CMD_STATE_CONTROL ); - value = crtc_state->planes |GENERAL_ACT_REQ ; + value = dc_state->planes |GENERAL_ACT_REQ ;tegra_dc_writel (dc, value,DC_CMD_STATE_CONTROL ); value =tegra_dc_readl (dc,DC_CMD_STATE_CONTROL ); }
drivers/gpu/drm/virtio/virtgpu_display.c +3 -1
@@ -119,6 +119,8 @@ static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,static void virtio_gpu_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct virtio_gpu_output *output =drm_crtc_to_virtio_gpu_output (crtc);/*
@@ -127,7 +129,7 @@ static void virtio_gpu_crtc_atomic_flush(struct drm_crtc *crtc,* in the plane update callback, and here we just check * whenever we must force the modeset. */ -if (drm_atomic_crtc_needs_modeset (crtc->state)) { +if (drm_atomic_crtc_needs_modeset (crtc_state)) { output->needs_modeset = true; } }
Signature · 6 lines
2.28.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi
Am 05.11.20 um 17:45 schrieb Maxime Ripard:
Quoted 112 lines
Many drivers reference the
crtc->pointerin order to get the current CRTC state in theiratomic_beginoratomic_flushhooks, which would be the new CRTC state in the global atomic state since_swap_statehappened when those hooks are run.Use the
drm_atomic_get_new_crtc_statehelper to get that state to make it more obvious.This was made using the coccinelle script below:
@
crtc_atomic_func@
identifier helpers;
identifier func;
@@(
static struct drm_crtc_helper_funcs helpers = { ..., .atomic_begin = func, ..., }; | static struct drm_crtc_helper_funcs helpers = { ..., .atomic_flush = func, ..., };)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbolcrtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
- structtegra_dc_state*crtc_state= e;
+ structtegra_dc_state*dc_state= e;
<+...(quoted diff) +1
-1- crtc_state + dc_state ...+> }@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbolcrtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
- structmtk_crtc_state*crtc_state= e;
+ structmtk_crtc_state*mtk_crtc_state= e;
<+...(quoted diff) +1
-1- crtc_state + mtk_crtc_state ...+> }@
replaces_new_state@
identifier crtc_atomic_func.func;
identifier crtc, state,crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
- structdrm_crtc_state*crtc_state=crtc->state;
+ structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...
}@@
identifier crtc_atomic_func.func;
identifier crtc, state,crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){ structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...
-crtc->state
+crtc_state
...
}@
adds_new_state@
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
+ structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...
-crtc->state
+crtc_state
...
}@ include depends on
adds_new_state||replaces_new_state@ @@#include <
drm/drm_atomic.h>@
no_includedepends on !include && (adds_new_state||replaces_new_state) @ @@+ #include <
drm/drm_atomic.h>
#include <drm/...>
Quoted 15 lines
Cc "James (Qian) Wang" <[email protected]>Cc Liviu Dudau <[email protected]>Cc Mihail Atanassov <[email protected]>Cc Brian Starkey <[email protected]>Cc Russell King <[email protected]>Cc Paul Cercueil <[email protected]>Cc Chun-Kuang Hu <[email protected]>Cc Philipp Zabel <[email protected]>Cc Sandy Huang <[email protected]>Cc "Heiko Stübner" <[email protected]>Cc Thierry Reding <[email protected]>Cc Gerd Hoffmann <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>
Quoted 228 lines
---
Changes from v1:
- Fixed checkpatch warnings--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 4 +++- drivers/gpu/drm/armada/armada_crtc.c | 8 ++++++-- drivers/gpu/drm/ast/ast_mode.c | 4 +++- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 7 +++++-- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 15 +++++++++------ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 ++++-- drivers/gpu/drm/tegra/dc.c | 8 +++++--- drivers/gpu/drm/virtio/virtgpu_display.c | 4 +++- 8 files changed, 38 insertions(+), 18 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +3
-1@@ -387,10 +387,12 @@ static void komeda_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { + struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, + crtc);struct drm_crtc_state *old =drm_atomic_get_old_crtc_state (state, crtc);/* commit with modeset will be handled in enable/disable */ -if (drm_atomic_crtc_needs_modeset (crtc->state)) +if (drm_atomic_crtc_needs_modeset (crtc_state))return ;komeda_crtc_do_flush (crtc, old);drivers/gpu/drm/armada/armada_crtc.c +6
-2@@ -431,11 +431,13 @@ static int armada_drm_crtc_atomic_check(struct drm_crtc *crtc,static void armada_drm_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct armada_crtc *dcrtc =drm_to_armada_crtc (crtc);DRM_DEBUG_KMS ("[CRTC:%d:%s]\n" , crtc->base.id, crtc->name); -if (crtc->state->color_mgmt_changed) +if (crtc_state->color_mgmt_changed)armada_drm_update_gamma (crtc); dcrtc->regs_idx =0 ;@@ -445,6 +447,8 @@ static void armada_drm_crtc_atomic_begin(struct drm_crtc *crtc,static void armada_drm_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct armada_crtc *dcrtc =drm_to_armada_crtc (crtc);DRM_DEBUG_KMS ("[CRTC:%d:%s]\n" , crtc->base.id, crtc->name);@@ -455,7 +459,7 @@ static void armada_drm_crtc_atomic_flush(struct drm_crtc *crtc,* If we aren't doing a full modeset, then we need to queue * the event here. */ -if (!drm_atomic_crtc_needs_modeset (crtc->state)) { +if (!drm_atomic_crtc_needs_modeset (crtc_state)) { dcrtc->update_pending = true;armada_drm_crtc_queue_state_event (crtc);spin_lock_irq (&dcrtc->irq_lock);drivers/gpu/drm/ast/ast_mode.c +3
-1@@ -782,10 +782,12 @@ static void ast_crtc_helper_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { + struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, + crtc);struct drm_crtc_state *old_crtc_state =drm_atomic_get_old_crtc_state (state, crtc);struct ast_private *ast =to_ast_private (crtc->dev); -struct ast_crtc_state *ast_crtc_state =to_ast_crtc_state (crtc->state); +struct ast_crtc_state *ast_crtc_state =to_ast_crtc_state (crtc_state);struct ast_crtc_state *old_ast_crtc_state =to_ast_crtc_state (old_crtc_state);/* drivers/gpu/drm/ingenic/ingenic-drm-drv.c +5
-2@@ -305,11 +305,13 @@ ingenic_drm_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_modestatic void ingenic_drm_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct ingenic_drm *priv =drm_crtc_get_priv (crtc);u32 ctrl =0 ;if (priv->soc_info->has_osd && -drm_atomic_crtc_needs_modeset (crtc->state)) { +drm_atomic_crtc_needs_modeset (crtc_state)) {/* * If IPU plane is enabled, enable IPU as source for the F1 * plane; otherwise use regular DMA. @@ -326,7 +328,8 @@ static void ingenic_drm_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) {struct ingenic_drm *priv =drm_crtc_get_priv (crtc); -struct drm_crtc_state *crtc_state = crtc->state; +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct drm_pending_vblank_event *event = crtc_state->event;if (drm_atomic_crtc_needs_modeset (crtc_state)) {drivers/gpu/drm/mediatek/mtk_drm_crtc.c +9
-6@@ -11,6 +11,7 @@#include <asm/barrier.h> #include <soc/mediatek/smi.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> @@ -577,17 +578,19 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,static void mtk_drm_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { -struct mtk_crtc_state *crtc_state =to_mtk_crtc_state (crtc->state); +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); +struct mtk_crtc_state *mtk_crtc_state =to_mtk_crtc_state (crtc_state);struct mtk_drm_crtc *mtk_crtc =to_mtk_crtc (crtc); -if (mtk_crtc->event && crtc_state->base.event) +if (mtk_crtc->event && mtk_crtc_state->base.event)DRM_ERROR ("new event while there is still a pending event\n" ); -if (crtc_state->base.event) { - crtc_state->base.event->pipe =drm_crtc_index (crtc); +if (mtk_crtc_state->base.event) { + mtk_crtc_state->base.event->pipe =drm_crtc_index (crtc);WARN_ON (drm_crtc_vblank_get (crtc) !=0 ); - mtk_crtc->event = crtc_state->base.event; - crtc_state->base.event =NULL ; + mtk_crtc->event = mtk_crtc_state->base.event; + mtk_crtc_state->base.event =NULL ; } }drivers/gpu/drm/rockchip/rockchip_drm_vop.c +4
-2@@ -1248,6 +1248,8 @@ static void vop_crtc_gamma_set(struct vop *vop, struct drm_crtc *crtc,static void vop_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct drm_crtc_state *old_crtc_state =drm_atomic_get_old_crtc_state (state, crtc);struct vop *vop =to_vop (crtc);@@ -1256,8 +1258,8 @@ static void vop_crtc_atomic_begin(struct drm_crtc *crtc,* Only update GAMMA if the 'active' flag is not changed, * otherwise it's updated by .atomic_enable. */ -if (crtc->state->color_mgmt_changed && - !crtc->state->active_changed) +if (crtc_state->color_mgmt_changed && + !crtc_state->active_changed)vop_crtc_gamma_set (vop, crtc, old_crtc_state); }drivers/gpu/drm/tegra/dc.c +5
-3@@ -1939,15 +1939,17 @@ static void tegra_crtc_atomic_begin(struct drm_crtc *crtc,static void tegra_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { -struct tegra_dc_state *crtc_state =to_dc_state (crtc->state); +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); +struct tegra_dc_state *dc_state =to_dc_state (crtc_state);struct tegra_dc *dc =to_tegra_dc (crtc);u32 value; - value = crtc_state->planes <<8 |GENERAL_UPDATE ; + value = dc_state->planes <<8 |GENERAL_UPDATE ;tegra_dc_writel (dc, value,DC_CMD_STATE_CONTROL ); value =tegra_dc_readl (dc,DC_CMD_STATE_CONTROL ); - value = crtc_state->planes |GENERAL_ACT_REQ ; + value = dc_state->planes |GENERAL_ACT_REQ ;tegra_dc_writel (dc, value,DC_CMD_STATE_CONTROL ); value =tegra_dc_readl (dc,DC_CMD_STATE_CONTROL ); }drivers/gpu/drm/virtio/virtgpu_display.c +3
-1@@ -119,6 +119,8 @@ static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,static void virtio_gpu_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct virtio_gpu_output *output =drm_crtc_to_virtio_gpu_output (crtc);/* @@ -127,7 +129,7 @@ static void virtio_gpu_crtc_atomic_flush(struct drm_crtc *crtc,* in the plane update callback, and here we just check * whenever we must force the modeset. */ -if (drm_atomic_crtc_needs_modeset (crtc->state)) { +if (drm_atomic_crtc_needs_modeset (crtc_state)) { output->needs_modeset = true; } }
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maxime Ripard
AppliedQuoted 115 lines · Thomas Zimmermann
Hi
Am 05.11.20 um 17:45 schrieb Maxime Ripard:
Quoted 112 lines
Many drivers reference the
crtc->pointerin order to get the current CRTC state in theiratomic_beginoratomic_flushhooks, which would be the new CRTC state in the global atomic state since_swap_statehappened when those hooks are run.Use the
drm_atomic_get_new_crtc_statehelper to get that state to make it more obvious.This was made using the coccinelle script below:
@
crtc_atomic_func@
identifier helpers;
identifier func;
@@(
static struct drm_crtc_helper_funcs helpers = { ..., .atomic_begin = func, ..., }; | static struct drm_crtc_helper_funcs helpers = { ..., .atomic_flush = func, ..., };)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbolcrtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
- structtegra_dc_state*crtc_state= e;
+ structtegra_dc_state*dc_state= e;
<+...(quoted diff) +1
-1- crtc_state + dc_state ...+> }@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbolcrtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
- structmtk_crtc_state*crtc_state= e;
+ structmtk_crtc_state*mtk_crtc_state= e;
<+...(quoted diff) +1
-1- crtc_state + mtk_crtc_state ...+> }@
replaces_new_state@
identifier crtc_atomic_func.func;
identifier crtc, state,crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
- structdrm_crtc_state*crtc_state=crtc->state;
+ structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...
}@@
identifier crtc_atomic_func.func;
identifier crtc, state,crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){ structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...
-crtc->state
+crtc_state
...
}@
adds_new_state@
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
+ structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...
-crtc->state
+crtc_state
...
}@ include depends on
adds_new_state||replaces_new_state@ @@#include <
drm/drm_atomic.h>@
no_includedepends on !include && (adds_new_state||replaces_new_state) @ @@+ #include <
drm/drm_atomic.h>
#include <drm/...>
Quoted 16 lines
Quoted 7 lines
Cc "James (Qian) Wang" <[email protected]>Cc Liviu Dudau <[email protected]>Cc Mihail Atanassov <[email protected]>Cc Brian Starkey <[email protected]>Cc Russell King <[email protected]>Cc Paul Cercueil <[email protected]>Cc Chun-Kuang Hu <[email protected]>Quoted 8 lines
Cc Philipp Zabel <[email protected]>Cc Sandy Huang <[email protected]>Cc "Heiko Stübner" <[email protected]>Cc Thierry Reding <[email protected]>Cc Gerd Hoffmann <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>
Applied, thanks!
Maxime
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 151 lines · Maxime Ripard
Many drivers reference the
crtc->pointerin order to get the current CRTC state in theiratomic_beginoratomic_flushhooks, which would be the new CRTC state in the global atomic state since_swap_statehappened when those hooks are run.Use the
drm_atomic_get_new_crtc_statehelper to get that state to make it more obvious.This was made using the coccinelle script below:
@
crtc_atomic_func@
identifier helpers;
identifier func;
@@(
static struct drm_crtc_helper_funcs helpers = { ..., .atomic_begin = func, ..., }; | static struct drm_crtc_helper_funcs helpers = { ..., .atomic_flush = func, ..., };)
@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbolcrtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
- structtegra_dc_state*crtc_state= e;
+ structtegra_dc_state*dc_state= e;
<+...(quoted diff) +1
-1- crtc_state + dc_state ...+> }@@
identifier crtc_atomic_func.func;
identifier crtc, state;
symbolcrtc_state;
expression e;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
- structmtk_crtc_state*crtc_state= e;
+ structmtk_crtc_state*mtk_crtc_state= e;
<+...(quoted diff) +1
-1- crtc_state + mtk_crtc_state ...+> }@
replaces_new_state@
identifier crtc_atomic_func.func;
identifier crtc, state,crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
- structdrm_crtc_state*crtc_state=crtc->state;
+ structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...
}@@
identifier crtc_atomic_func.func;
identifier crtc, state,crtc_state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){ structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...
-crtc->state
+crtc_state
...
}@
adds_new_state@
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
+ structdrm_crtc_state*crtc_state=drm_atomic_get_new_crtc_state(state, crtc);
...
-crtc->state
+crtc_state
...
}@ include depends on
adds_new_state||replaces_new_state@ @@#include <
drm/drm_atomic.h>@
no_includedepends on !include && (adds_new_state||replaces_new_state) @ @@+ #include <
drm/drm_atomic.h>
#include <drm/...>Cc "James (Qian) Wang" <[email protected]>Cc Liviu Dudau <[email protected]>Cc Mihail Atanassov <[email protected]>Cc Brian Starkey <[email protected]>Cc Russell King <[email protected]>Cc Paul Cercueil <[email protected]>Cc Chun-Kuang Hu <[email protected]>Cc Philipp Zabel <[email protected]>Cc Sandy Huang <[email protected]>Cc "Heiko Stübner" <[email protected]>Cc Thierry Reding <[email protected]>Cc Gerd Hoffmann <[email protected]>Reviewed-by Ville Syrjälä <[email protected]>Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>---
Changes from v1:
- Fixed checkpatch warnings--- drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 4 +++- drivers/gpu/drm/armada/armada_crtc.c | 8 ++++++-- drivers/gpu/drm/ast/ast_mode.c | 4 +++- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 7 +++++-- drivers/gpu/drm/mediatek/mtk_drm_crtc.c | 15 +++++++++------ drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 6 ++++-- drivers/gpu/drm/tegra/dc.c | 8 +++++--- drivers/gpu/drm/virtio/virtgpu_display.c | 4 +++- 8 files changed, 38 insertions(+), 18 deletions(-)drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +0
-0@@ -387,10 +387,12 @@ static void komeda_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) {
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c static void · line 398
Quoted 10 lines
drivers/gpu/drm/arm/display/komeda/komeda_crtc.c +3
-1+struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct drm_crtc_state *old =drm_atomic_get_old_crtc_state (state, crtc);/* commit with modeset will be handled in enable/disable */ -if (drm_atomic_crtc_needs_modeset (crtc->state)) +if (drm_atomic_crtc_needs_modeset (crtc_state))return ;komeda_crtc_do_flush (crtc, old);
For the komeda part:
Quoted 196 lines
drivers/gpu/drm/armada/armada_crtc.c +6
-2@@ -431,11 +431,13 @@ static int armada_drm_crtc_atomic_check(struct drm_crtc *crtc,static void armada_drm_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct armada_crtc *dcrtc =drm_to_armada_crtc (crtc);DRM_DEBUG_KMS ("[CRTC:%d:%s]\n" , crtc->base.id, crtc->name); -if (crtc->state->color_mgmt_changed) +if (crtc_state->color_mgmt_changed)armada_drm_update_gamma (crtc); dcrtc->regs_idx =0 ;@@ -445,6 +447,8 @@ static void armada_drm_crtc_atomic_begin(struct drm_crtc *crtc,static void armada_drm_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct armada_crtc *dcrtc =drm_to_armada_crtc (crtc);DRM_DEBUG_KMS ("[CRTC:%d:%s]\n" , crtc->base.id, crtc->name);@@ -455,7 +459,7 @@ static void armada_drm_crtc_atomic_flush(struct drm_crtc *crtc,* If we aren't doing a full modeset, then we need to queue * the event here. */ -if (!drm_atomic_crtc_needs_modeset (crtc->state)) { +if (!drm_atomic_crtc_needs_modeset (crtc_state)) { dcrtc->update_pending = true;armada_drm_crtc_queue_state_event (crtc);spin_lock_irq (&dcrtc->irq_lock);drivers/gpu/drm/ast/ast_mode.c +3
-1@@ -782,10 +782,12 @@ static void ast_crtc_helper_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) { + struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, + crtc);struct drm_crtc_state *old_crtc_state =drm_atomic_get_old_crtc_state (state, crtc);struct ast_private *ast =to_ast_private (crtc->dev); -struct ast_crtc_state *ast_crtc_state =to_ast_crtc_state (crtc->state); +struct ast_crtc_state *ast_crtc_state =to_ast_crtc_state (crtc_state);struct ast_crtc_state *old_ast_crtc_state =to_ast_crtc_state (old_crtc_state);/* drivers/gpu/drm/ingenic/ingenic-drm-drv.c +5
-2@@ -305,11 +305,13 @@ ingenic_drm_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_modestatic void ingenic_drm_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct ingenic_drm *priv =drm_crtc_get_priv (crtc);u32 ctrl =0 ;if (priv->soc_info->has_osd && -drm_atomic_crtc_needs_modeset (crtc->state)) { +drm_atomic_crtc_needs_modeset (crtc_state)) {/* * If IPU plane is enabled, enable IPU as source for the F1 * plane; otherwise use regular DMA. @@ -326,7 +328,8 @@ static void ingenic_drm_crtc_atomic_flush(struct drm_crtc *crtc, struct drm_atomic_state *state) {struct ingenic_drm *priv =drm_crtc_get_priv (crtc); -struct drm_crtc_state *crtc_state = crtc->state; +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct drm_pending_vblank_event *event = crtc_state->event;if (drm_atomic_crtc_needs_modeset (crtc_state)) {drivers/gpu/drm/mediatek/mtk_drm_crtc.c +9
-6@@ -11,6 +11,7 @@#include <asm/barrier.h> #include <soc/mediatek/smi.h> +#include <drm/drm_atomic.h> #include <drm/drm_atomic_helper.h> #include <drm/drm_plane_helper.h> #include <drm/drm_probe_helper.h> @@ -577,17 +578,19 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,static void mtk_drm_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { -struct mtk_crtc_state *crtc_state =to_mtk_crtc_state (crtc->state); +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); +struct mtk_crtc_state *mtk_crtc_state =to_mtk_crtc_state (crtc_state);struct mtk_drm_crtc *mtk_crtc =to_mtk_crtc (crtc); -if (mtk_crtc->event && crtc_state->base.event) +if (mtk_crtc->event && mtk_crtc_state->base.event)DRM_ERROR ("new event while there is still a pending event\n" ); -if (crtc_state->base.event) { - crtc_state->base.event->pipe =drm_crtc_index (crtc); +if (mtk_crtc_state->base.event) { + mtk_crtc_state->base.event->pipe =drm_crtc_index (crtc);WARN_ON (drm_crtc_vblank_get (crtc) !=0 ); - mtk_crtc->event = crtc_state->base.event; - crtc_state->base.event =NULL ; + mtk_crtc->event = mtk_crtc_state->base.event; + mtk_crtc_state->base.event =NULL ; } }drivers/gpu/drm/rockchip/rockchip_drm_vop.c +4
-2@@ -1248,6 +1248,8 @@ static void vop_crtc_gamma_set(struct vop *vop, struct drm_crtc *crtc,static void vop_crtc_atomic_begin (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct drm_crtc_state *old_crtc_state =drm_atomic_get_old_crtc_state (state, crtc);struct vop *vop =to_vop (crtc);@@ -1256,8 +1258,8 @@ static void vop_crtc_atomic_begin(struct drm_crtc *crtc,* Only update GAMMA if the 'active' flag is not changed, * otherwise it's updated by .atomic_enable. */ -if (crtc->state->color_mgmt_changed && - !crtc->state->active_changed) +if (crtc_state->color_mgmt_changed && + !crtc_state->active_changed)vop_crtc_gamma_set (vop, crtc, old_crtc_state); }drivers/gpu/drm/tegra/dc.c +5
-3@@ -1939,15 +1939,17 @@ static void tegra_crtc_atomic_begin(struct drm_crtc *crtc,static void tegra_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { -struct tegra_dc_state *crtc_state =to_dc_state (crtc->state); +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc); +struct tegra_dc_state *dc_state =to_dc_state (crtc_state);struct tegra_dc *dc =to_tegra_dc (crtc);u32 value; - value = crtc_state->planes <<8 |GENERAL_UPDATE ; + value = dc_state->planes <<8 |GENERAL_UPDATE ;tegra_dc_writel (dc, value,DC_CMD_STATE_CONTROL ); value =tegra_dc_readl (dc,DC_CMD_STATE_CONTROL ); - value = crtc_state->planes |GENERAL_ACT_REQ ; + value = dc_state->planes |GENERAL_ACT_REQ ;tegra_dc_writel (dc, value,DC_CMD_STATE_CONTROL ); value =tegra_dc_readl (dc,DC_CMD_STATE_CONTROL ); }drivers/gpu/drm/virtio/virtgpu_display.c +3
-1@@ -119,6 +119,8 @@ static int virtio_gpu_crtc_atomic_check(struct drm_crtc *crtc,static void virtio_gpu_crtc_atomic_flush (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, + crtc);struct virtio_gpu_output *output =drm_crtc_to_virtio_gpu_output (crtc);/* @@ -127,7 +129,7 @@ static void virtio_gpu_crtc_atomic_flush(struct drm_crtc *crtc,* in the plane update callback, and here we just check * whenever we must force the modeset. */ -if (drm_atomic_crtc_needs_modeset (crtc->state)) { +if (drm_atomic_crtc_needs_modeset (crtc_state)) { output->needs_modeset = true; } }Signature · 1 line
2.28.0
Signature · 12 lines
====================
| I would like to |
| fix the world, |
| but they're not |
| giving me the |
\ source code! /
---------------
¯\_(ツ)_/¯
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel