drm/nouveau/kms/nv50-: Use state helper instead of crtc pointer
Subsystems (22)
PATCH 1/3 drm/nouveau/kms/nv50-: Use state helper instead of crtc pointer
dispnv50 references the crtc->state pointer in order to get the current CRTC state in its atomic_check hook, which would be the old CRTC state in the global atomic state.
Use the drm_atomic_get_old_crtc_state helper to get that state to make it more obvious.
--- drivers/gpu/drm/nouveau/dispnv50/head.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/gpu/drm/nouveau/dispnv50/head.c +3 -1
@@ -313,11 +313,13 @@ nv50_head_atomic_check_mode(struct nv50_head *head, struct nv50_head_atom *asyh)static int nv50_head_atomic_check (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *old_crtc_state =drm_atomic_get_old_crtc_state (state, + crtc);struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, crtc);struct nouveau_drm *drm =nouveau_drm (crtc->dev);struct nv50_head *head =nv50_head (crtc); -struct nv50_head_atom *armh =nv50_head_atom (crtc->state); +struct nv50_head_atom *armh =nv50_head_atom (old_crtc_state);struct nv50_head_atom *asyh =nv50_head_atom (crtc_state);struct nouveau_conn_atom *asyc =NULL ;struct drm_connector_state *conns;
Signature · 6 lines
2.28.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 2/3 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/...>
--- 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
Re: [PATCH 2/3] drm: Use state helper instead of CRTC state pointer
Quoted 58 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;
<+...
Review
Quoted 4 lines
(quoted diff) +1
-1- crtc_state + mtk_crtc_state ...+> }
These reanames seem a bit out of scpe for this patch. But I guess you needed then to get the rest of the cocci to work on some drivers?
The basic idea looks good:
But I guess up to the individual driver folks to bikeshed the variable naming and whatnot.
One thing I spotted is that a few drivers now gained two aliasing crtc state pointers in the function: one with the drm type, the other with a driver specific type. That's something we've outlawed in i915 since it was making life rather confusing. In i915 we now prefer to use only the i915 specific types in most places.
Quoted 276 lines
@
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/...>Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>--- 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 · 1 line
2.28.0
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/3] drm: Use state helper instead of CRTC state pointer
Hi Ville,
Quoted 54 lines · Ville Syrjälä
Quoted 53 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;
@@
Quoted 12 lines
Review
Quoted 9 lines
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 ...+> }These reanames seem a bit out of scpe for this patch. But I guess you needed then to get the rest of the cocci to work on some drivers?
Yeah, those two drivers already had a variable named crtc_state, calling container_of on crtc->state
It was cleaner to me to have an intermediate variable storing the result of drm_atomic_get_new_crtc_state, but then the most obvious name was taken so I had to rename those two variables before doing so.
Quoted 11 lines
The basic idea looks good:
Reviewed-by Ville Syrjälä <[email protected]>But I guess up to the individual driver folks to bikeshed the variable naming and whatnot.
One thing I spotted is that a few drivers now gained two aliasing crtc state pointers in the function: one with the drm type, the other with a driver specific type. That's something we've outlawed in i915 since it was making life rather confusing. In i915 we now prefer to use only the i915 specific types in most places.
I didn't spot any of those cases, do you have an example of where it happened?
Thanks!
Maxime
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/3] drm: Use state helper instead of CRTC state pointer
Quoted 83 lines · Maxime Ripard
Hi Ville,
Quoted 54 lines · Ville Syrjälä
Quoted 53 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;
@@Quoted 12 lines
Review
Quoted 9 lines
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 ...+> }These reanames seem a bit out of scpe for this patch. But I guess you needed then to get the rest of the cocci to work on some drivers?
Yeah, those two drivers already had a variable named
crtc_state, callingcontainer_ofoncrtc->stateIt was cleaner to me to have an intermediate variable storing the result of
drm_atomic_get_new_crtc_state, but then the most obvious name was taken so I had to rename those two variables before doing so.Quoted 6 lines
The basic idea looks good:
Reviewed-by Ville Syrjälä <[email protected]>But I guess up to the individual driver folks to bikeshed the variable naming and whatnot.
Quoted 8 lines
Quoted 5 lines
One thing I spotted is that a few drivers now gained two aliasing crtc state pointers in the function: one with the drm type, the other with a driver specific type. That's something we've outlawed in i915 since it was making life rather confusing. In i915 we now prefer to use only the i915 specific types in most places.
I didn't spot any of those cases, do you have an example of where it happened?
eg. ast:
+ 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);
So here both 'crtc_state' and 'ast_crtc_state' are basically the same thing, which can get a bit confusing especially within larger functions with lots of variables.
In i915 we would just have
struct intel_crtc_state *crtc_state = whatever;
and any access to the base class would be done via crtc_state->base.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/3] drm: Use state helper instead of CRTC state pointer
Quoted 102 lines · Ville Syrjälä
Quoted 83 lines · Maxime Ripard
Hi Ville,
Quoted 54 lines · Ville Syrjälä
Quoted 53 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;
@@Quoted 12 lines
Review
Quoted 9 lines
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 ...+> }These reanames seem a bit out of scpe for this patch. But I guess you needed then to get the rest of the cocci to work on some drivers?
Yeah, those two drivers already had a variable named
crtc_state, callingcontainer_ofoncrtc->stateIt was cleaner to me to have an intermediate variable storing the result of
drm_atomic_get_new_crtc_state, but then the most obvious name was taken so I had to rename those two variables before doing so.Quoted 6 lines
The basic idea looks good:
Reviewed-by Ville Syrjälä <[email protected]>But I guess up to the individual driver folks to bikeshed the variable naming and whatnot.
Quoted 8 lines
Quoted 5 lines
One thing I spotted is that a few drivers now gained two aliasing crtc state pointers in the function: one with the drm type, the other with a driver specific type. That's something we've outlawed in i915 since it was making life rather confusing. In i915 we now prefer to use only the i915 specific types in most places.
I didn't spot any of those cases, do you have an example of where it happened?
eg. ast:
drivers/gpu/drm/ast/ast_mode.c +3
-1+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);
Quoted 3 lines
So here both '
crtc_state' and 'ast_crtc_state' are basically the same thing, which can get a bit confusing especially within larger functions with lots of variables.
Ah, that kind of aliasing, ok. So it's purely an issue with ergonomics/convenience?
It seems to be a widespread pattern (I know we're using it in vc4 and sun4i, and from those reworks I've seen a number of drivers doing so). I'm not entirely sure how we should fix it through coccinelle too :/
Thanks!
Maxime
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 2/3] drm: Use state helper instead of CRTC state pointer
Quoted 103 lines · Maxime Ripard
Quoted 102 lines · Ville Syrjälä
Quoted 83 lines · Maxime Ripard
Hi Ville,
Quoted 54 lines · Ville Syrjälä
Quoted 53 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;
@@Quoted 12 lines
Review
Quoted 9 lines
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 ...+> }These reanames seem a bit out of scpe for this patch. But I guess you needed then to get the rest of the cocci to work on some drivers?
Yeah, those two drivers already had a variable named
crtc_state, callingcontainer_ofoncrtc->stateIt was cleaner to me to have an intermediate variable storing the result of
drm_atomic_get_new_crtc_state, but then the most obvious name was taken so I had to rename those two variables before doing so.Quoted 6 lines
The basic idea looks good:
Reviewed-by Ville Syrjälä <[email protected]>But I guess up to the individual driver folks to bikeshed the variable naming and whatnot.
Quoted 8 lines
Quoted 5 lines
One thing I spotted is that a few drivers now gained two aliasing crtc state pointers in the function: one with the drm type, the other with a driver specific type. That's something we've outlawed in i915 since it was making life rather confusing. In i915 we now prefer to use only the i915 specific types in most places.
I didn't spot any of those cases, do you have an example of where it happened?
eg. ast:
drivers/gpu/drm/ast/ast_mode.c +3
-1+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);
Quoted 6 lines
Quoted 3 lines
So here both '
crtc_state' and 'ast_crtc_state' are basically the same thing, which can get a bit confusing especially within larger functions with lots of variables.Ah, that kind of aliasing, ok. So it's purely an issue with ergonomics/convenience?
Yeah, I got fed up with it in i915 because I had a hard time reasoning how the state was being mutated when it was being accesed through multiple pointers in the same function. And didn't help that the variable names were all over the place.
Quoted 4 lines
It seems to be a widespread pattern (I know we're using it in vc4 and sun4i, and from those reworks I've seen a number of drivers doing so). I'm not entirely sure how we should fix it through coccinelle too :/
I think we've been doing these by hand in i915 for the most part.
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
PATCH 3/3 drm: Use the state pointer directly in atomic_check
In reply to Maxime RipardNow that atomic_check takes the global atomic state as a parameter, we don't need to go through the pointer in the CRTC state.
This was done using the following coccinelle script:
@ crtc_atomic_func @
identifier helpers;
identifier func;
@@
static struct drm_crtc_helper_funcs helpers = {
...,
.atomic_check = func,
...,
};@@
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); ... when != crtc_state
- crtc_state->state
+ state
...
}
@@
struct drm_crtc_state *crtc_state;
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state) {
...
- crtc_state->state
+ state
...
}
--- drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 2 +- drivers/gpu/drm/omapdrm/omap_crtc.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 6 +++--- drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_disp.c | 4 +--- 6 files changed, 8 insertions(+), 10 deletions(-)
drivers/gpu/drm/drm_simple_kms_helper.c +1 -1
@@ -97,7 +97,7 @@ static int drm_simple_kms_crtc_check(struct drm_crtc *crtc,if (has_primary != crtc_state->enable)return -EINVAL ; -return drm_atomic_add_affected_planes (crtc_state->state, crtc); +return drm_atomic_add_affected_planes (state, crtc); } static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc,
drivers/gpu/drm/mxsfb/mxsfb_kms.c +1 -1
@@ -281,7 +281,7 @@ static int mxsfb_crtc_atomic_check(struct drm_crtc *crtc,return -EINVAL ;/* TODO: Is this needed ? */ -return drm_atomic_add_affected_planes (crtc_state->state, crtc); +return drm_atomic_add_affected_planes (state, crtc); } static void mxsfb_crtc_atomic_flush(struct drm_crtc *crtc,
drivers/gpu/drm/omapdrm/omap_crtc.c +1 -1
@@ -583,7 +583,7 @@ static int omap_crtc_atomic_check(struct drm_crtc *crtc,return -EINVAL ; } - pri_state =drm_atomic_get_new_plane_state (crtc_state->state, + pri_state =drm_atomic_get_new_plane_state (state, crtc->primary);if (pri_state) { struct omap_crtc_state *omap_crtc_state =
drivers/gpu/drm/tilcdc/tilcdc_crtc.c +3 -3
@@ -665,9 +665,9 @@ static int tilcdc_crtc_atomic_check(struct drm_crtc *crtc,if (!crtc_state->active)return 0 ; -if (crtc_state->state->planes[0 ].ptr != crtc->primary || - crtc_state->state->planes[0 ].state ==NULL || - crtc_state->state->planes[0 ].state->crtc != crtc) { +if (state->planes[0 ].ptr != crtc->primary || + state->planes[0 ].state ==NULL || + state->planes[0 ].state->crtc != crtc) {dev_dbg (crtc->dev->dev,"CRTC primary plane must be present" );return -EINVAL ; }
drivers/gpu/drm/vc4/vc4_crtc.c +1 -1
@@ -597,7 +597,7 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc,if (ret)return ret; -for_each_new_connector_in_state (crtc_state->state, conn, conn_state, +for_each_new_connector_in_state (state, conn, conn_state, i) {if (conn_state->crtc != crtc)continue ;
drivers/gpu/drm/xlnx/zynqmp_disp.c +1 -3
@@ -1506,9 +1506,7 @@ zynqmp_disp_crtc_atomic_disable(struct drm_crtc *crtc,static int zynqmp_disp_crtc_atomic_check (struct drm_crtc *crtc,struct drm_atomic_state *state) { -struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, - crtc); -return drm_atomic_add_affected_planes (crtc_state->state, crtc); +return drm_atomic_add_affected_planes (state, crtc); } static void
Signature · 6 lines
2.28.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH 3/3] drm: Use the state pointer directly in atomic_check
Quoted 43 lines · Maxime Ripard
Now that
atomic_checktakes the global atomic state as a parameter, we don't need to go through the pointer in the CRTC state.This was done using the following coccinelle script:
@
crtc_atomic_func@
identifier helpers;
identifier func;
@@static struct drm_crtc_helper_funcs helpers = { ..., .atomic_check = func, ..., };@@
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); ... when !=crtc_state
-crtc_state->state
+ state
...
}@@
structdrm_crtc_state*crtc_state;
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
-crtc_state->state
+ state
...
}
Quoted 2 lines
Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>
lgtm
Quoted 95 lines
--- drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_kms.c | 2 +- drivers/gpu/drm/omapdrm/omap_crtc.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 6 +++--- drivers/gpu/drm/vc4/vc4_crtc.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_disp.c | 4 +--- 6 files changed, 8 insertions(+), 10 deletions(-)drivers/gpu/drm/drm_simple_kms_helper.c +1
-1@@ -97,7 +97,7 @@ static int drm_simple_kms_crtc_check(struct drm_crtc *crtc,if (has_primary != crtc_state->enable)return -EINVAL ; -return drm_atomic_add_affected_planes (crtc_state->state, crtc); +return drm_atomic_add_affected_planes (state, crtc); } static void drm_simple_kms_crtc_enable(struct drm_crtc *crtc,drivers/gpu/drm/mxsfb/mxsfb_kms.c +1
-1@@ -281,7 +281,7 @@ static int mxsfb_crtc_atomic_check(struct drm_crtc *crtc,return -EINVAL ;/* TODO: Is this needed ? */ -return drm_atomic_add_affected_planes (crtc_state->state, crtc); +return drm_atomic_add_affected_planes (state, crtc); } static void mxsfb_crtc_atomic_flush(struct drm_crtc *crtc,drivers/gpu/drm/omapdrm/omap_crtc.c +1
-1@@ -583,7 +583,7 @@ static int omap_crtc_atomic_check(struct drm_crtc *crtc,return -EINVAL ; } - pri_state =drm_atomic_get_new_plane_state (crtc_state->state, + pri_state =drm_atomic_get_new_plane_state (state, crtc->primary);if (pri_state) { struct omap_crtc_state *omap_crtc_state =drivers/gpu/drm/tilcdc/tilcdc_crtc.c +3
-3@@ -665,9 +665,9 @@ static int tilcdc_crtc_atomic_check(struct drm_crtc *crtc,if (!crtc_state->active)return 0 ; -if (crtc_state->state->planes[0 ].ptr != crtc->primary || - crtc_state->state->planes[0 ].state ==NULL || - crtc_state->state->planes[0 ].state->crtc != crtc) { +if (state->planes[0 ].ptr != crtc->primary || + state->planes[0 ].state ==NULL || + state->planes[0 ].state->crtc != crtc) {dev_dbg (crtc->dev->dev,"CRTC primary plane must be present" );return -EINVAL ; }drivers/gpu/drm/vc4/vc4_crtc.c +1
-1@@ -597,7 +597,7 @@ static int vc4_crtc_atomic_check(struct drm_crtc *crtc,if (ret)return ret; -for_each_new_connector_in_state (crtc_state->state, conn, conn_state, +for_each_new_connector_in_state (state, conn, conn_state, i) {if (conn_state->crtc != crtc)continue ;drivers/gpu/drm/xlnx/zynqmp_disp.c +1
-3@@ -1506,9 +1506,7 @@ zynqmp_disp_crtc_atomic_disable(struct drm_crtc *crtc,static int zynqmp_disp_crtc_atomic_check (struct drm_crtc *crtc,struct drm_atomic_state *state) { -struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, - crtc); -return drm_atomic_add_affected_planes (crtc_state->state, crtc); +return drm_atomic_add_affected_planes (state, crtc); } static voidSignature · 1 line
2.28.0
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maxime Ripard
AppliedRe: [PATCH 3/3] drm: Use the state pointer directly in atomic_check
Quoted 44 lines · Ville Syrjälä
Quoted 43 lines · Maxime Ripard
Now that
atomic_checktakes the global atomic state as a parameter, we don't need to go through the pointer in the CRTC state.This was done using the following coccinelle script:
@
crtc_atomic_func@
identifier helpers;
identifier func;
@@static struct drm_crtc_helper_funcs helpers = { ..., .atomic_check = func, ..., };@@
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); ... when !=crtc_state
-crtc_state->state
+ state
...
}@@
structdrm_crtc_state*crtc_state;
identifier crtc_atomic_func.func;
identifier crtc, state;
@@
func(struct drm_crtc *crtc, struct drm_atomic_state *state){
...
-crtc_state->state
+ state
...
}
Quoted 5 lines
Quoted 2 lines
Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>lgtm
Reviewed-by Ville Syrjälä <[email protected]>
Applied, thanks!
Maxime
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Quoted 9 lines · Maxime Ripard
dispnv50 references the
crtc->statepointer in order to get the current CRTC state in itsatomic_checkhook, which would be the old CRTC state in the global atomic state.Use the
drm_atomic_get_old_crtc_statehelper to get that state to make it more obvious.Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>
Looks correct
Quoted 25 lines
--- drivers/gpu/drm/nouveau/dispnv50/head.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)drivers/gpu/drm/nouveau/dispnv50/head.c +3
-1@@ -313,11 +313,13 @@ nv50_head_atomic_check_mode(struct nv50_head *head, struct nv50_head_atom *asyh)static int nv50_head_atomic_check (struct drm_crtc *crtc,struct drm_atomic_state *state) { +struct drm_crtc_state *old_crtc_state =drm_atomic_get_old_crtc_state (state, + crtc);struct drm_crtc_state *crtc_state =drm_atomic_get_new_crtc_state (state, crtc);struct nouveau_drm *drm =nouveau_drm (crtc->dev);struct nv50_head *head =nv50_head (crtc); -struct nv50_head_atom *armh =nv50_head_atom (crtc->state); +struct nv50_head_atom *armh =nv50_head_atom (old_crtc_state);struct nv50_head_atom *asyh =nv50_head_atom (crtc_state);struct nouveau_conn_atom *asyc =NULL ;struct drm_connector_state *conns;Signature · 1 line
2.28.0
Signature · 6 lines
Ville Syrjälä Intel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Maxime Ripard
AppliedQuoted 5 lines · Ville Syrjälä
Quoted 4 lines · Maxime Ripard
dispnv50 references the
crtc->statepointer in order to get the current CRTC state in itsatomic_checkhook, which would be the old CRTC state in the global atomic state.
Quoted 8 lines
Quoted 5 lines
Use the
drm_atomic_get_old_crtc_statehelper to get that state to make it more obvious.Suggested-by Ville Syrjälä <[email protected]>Signed-off-by Maxime Ripard <[email protected]>Looks correct
Reviewed-by Ville Syrjälä <[email protected]>
Applied, thanks!
Maxime
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel