drm/atomic-helper: Make atomic_enable/disable crtc callbacks optional
Subsystems (2)
PATCH v2 1/1 drm/atomic-helper: Make atomic_enable/disable crtc callbacks optional
Allow atomic_enable and atomic_disable operations from drm_crtc_helper_funcs struct optional. With this, the target display drivers don't need to define a dummy function if they don't need one.
Changes since v2:
* Don't make funcs optional
* Update kerneldoc for atomic_enable/disable
* Replace "if (funcs->atomic_enable)" by "if (funcs->commit)"
* Improve commit message
--- drivers/gpu/drm/drm_atomic_helper.c | 5 ++--- include/drm/drm_modeset_helper_vtables.h | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-)
drivers/gpu/drm/drm_atomic_helper.c +2 -3
@@ -1034,7 +1034,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) funcs->atomic_disable (crtc, old_crtc_state); else if (funcs->disable) funcs->disable(crtc); - else + else if (funcs->dpms) funcs->dpms(crtc, DRM_MODE_DPMS_OFF);if (!(dev->irq_enabled && dev->num_crtcs))
@@ -1277,10 +1277,9 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,if (new_crtc_state->enable) {DRM_DEBUG_ATOMIC ("enabling [CRTC:%d:%s]\n" , crtc->base.id, crtc->name); -if (funcs->atomic_enable) funcs->atomic_enable (crtc, old_crtc_state); -else +else if (funcs->commit) funcs->commit (crtc); } }
include/drm/drm_modeset_helper_vtables.h +4 -0
@@ -418,6 +418,8 @@ struct drm_crtc_helper_funcs {* Drivers can use the @old_crtc_state input parameter if the operations * needed to enable the CRTC don't depend solely on the new state but * also on the transition between the old state and the new state. +* +* This function is optional. */ void (*atomic_enable)(struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state);
@@ -441,6 +443,8 @@ struct drm_crtc_helper_funcs {* parameter @old_crtc_state which could be used to access the old * state. Atomic drivers should consider to use this one instead * of @disable. +* +* This function is optional. */ void (*atomic_disable)(struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state);
Signature · 1 line
2.21.0
Quoted 11 lines · Rodrigo Siqueira
Allow
atomic_enableandatomic_disableoperations fromdrm_crtc_helper_funcsstruct optional. With this, the target display drivers don't need to define a dummy function if they don't need one.Changes since v2:
* Don't make funcs optional
* Update kerneldoc for atomic_enable/disable
* Replace "if (funcs->atomic_enable)" by "if (funcs->commit)"
* Improve commit messageSigned-off-by Rodrigo Siqueira <[email protected]>
Quoted 54 lines
--- drivers/gpu/drm/drm_atomic_helper.c | 5 ++--- include/drm/drm_modeset_helper_vtables.h | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_atomic_helper.c +2
-3@@ -1034,7 +1034,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) funcs->atomic_disable (crtc, old_crtc_state); else if (funcs->disable) funcs->disable(crtc); - else + else if (funcs->dpms) funcs->dpms(crtc, DRM_MODE_DPMS_OFF);if (!(dev->irq_enabled && dev->num_crtcs))@@ -1277,10 +1277,9 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,if (new_crtc_state->enable) {DRM_DEBUG_ATOMIC ("enabling [CRTC:%d:%s]\n" , crtc->base.id, crtc->name); -if (funcs->atomic_enable) funcs->atomic_enable (crtc, old_crtc_state); -else +else if (funcs->commit) funcs->commit (crtc); } }include/drm/drm_modeset_helper_vtables.h +4
-0@@ -418,6 +418,8 @@ struct drm_crtc_helper_funcs {* Drivers can use the @old_crtc_state input parameter if the operations * needed to enable the CRTC don't depend solely on the new state but * also on the transition between the old state and the new state. +* +* This function is optional. */ void (*atomic_enable)(struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state);@@ -441,6 +443,8 @@ struct drm_crtc_helper_funcs {* parameter @old_crtc_state which could be used to access the old * state. Atomic drivers should consider to use this one instead * of @disable. +* +* This function is optional. */ void (*atomic_disable)(struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state);Signature · 1 line
2.21.0
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Rodrigo Siqueira
Allow
atomic_enableandatomic_disableoperations fromdrm_crtc_helper_funcsstruct optional. With this, the target display drivers don't need to define a dummy function if they don't need one.Changes since v2:
* Don't make funcs optional
* Update kerneldoc for atomic_enable/disable
* Replace "if (funcs->atomic_enable)" by "if (funcs->commit)"
* Improve commit message
Quoted 3 lines
Quoted 1 line
Signed-off-by Rodrigo Siqueira <[email protected]>Reviewed-by Daniel Vetter <[email protected]>
Hi,
Is it ok if I apply this patch?
Quoted 59 lines
Quoted 54 lines
--- drivers/gpu/drm/drm_atomic_helper.c | 5 ++--- include/drm/drm_modeset_helper_vtables.h | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_atomic_helper.c +2
-3@@ -1034,7 +1034,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) funcs->atomic_disable (crtc, old_crtc_state); else if (funcs->disable) funcs->disable(crtc); - else + else if (funcs->dpms) funcs->dpms(crtc, DRM_MODE_DPMS_OFF);if (!(dev->irq_enabled && dev->num_crtcs))@@ -1277,10 +1277,9 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,if (new_crtc_state->enable) {DRM_DEBUG_ATOMIC ("enabling [CRTC:%d:%s]\n" , crtc->base.id, crtc->name); -if (funcs->atomic_enable) funcs->atomic_enable (crtc, old_crtc_state); -else +else if (funcs->commit) funcs->commit (crtc); } }include/drm/drm_modeset_helper_vtables.h +4
-0@@ -418,6 +418,8 @@ struct drm_crtc_helper_funcs {* Drivers can use the @old_crtc_state input parameter if the operations * needed to enable the CRTC don't depend solely on the new state but * also on the transition between the old state and the new state. +* +* This function is optional. */ void (*atomic_enable)(struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state);@@ -441,6 +443,8 @@ struct drm_crtc_helper_funcs {* parameter @old_crtc_state which could be used to access the old * state. Atomic drivers should consider to use this one instead * of @disable. +* +* This function is optional. */ void (*atomic_disable)(struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state);Signature · 1 line
2.21.0Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Signature · 5 lines
Rodrigo Siqueira https://siqueira.tech Graduate Student Department of Computer Science University of São Paulo
Quoted 12 lines · Rodrigo Siqueira
Quoted 11 lines · Daniel Vetter
Quoted 10 lines · Rodrigo Siqueira
Allow
atomic_enableandatomic_disableoperations fromdrm_crtc_helper_funcsstruct optional. With this, the target display drivers don't need to define a dummy function if they don't need one.Changes since v2:
* Don't make funcs optional
* Update kerneldoc for atomic_enable/disable
* Replace "if (funcs->atomic_enable)" by "if (funcs->commit)"
* Improve commit message
Quoted 6 lines
Quoted 3 lines
Quoted 1 line
Signed-off-by Rodrigo Siqueira <[email protected]>Reviewed-by Daniel Vetter <[email protected]>Hi,
Is it ok if I apply this patch?
Sure.
-Daniel
Quoted 74 lines
Quoted 60 lines
Quoted 55 lines
--- drivers/gpu/drm/drm_atomic_helper.c | 5 ++--- include/drm/drm_modeset_helper_vtables.h | 4 ++++ 2 files changed, 6 insertions(+), 3 deletions(-)drivers/gpu/drm/drm_atomic_helper.c +2
-3@@ -1034,7 +1034,7 @@ disable_outputs(struct drm_device *dev, struct drm_atomic_state *old_state) funcs->atomic_disable (crtc, old_crtc_state); else if (funcs->disable) funcs->disable(crtc); - else + else if (funcs->dpms) funcs->dpms(crtc, DRM_MODE_DPMS_OFF);if (!(dev->irq_enabled && dev->num_crtcs))@@ -1277,10 +1277,9 @@ void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,if (new_crtc_state->enable) {DRM_DEBUG_ATOMIC ("enabling [CRTC:%d:%s]\n" , crtc->base.id, crtc->name); -if (funcs->atomic_enable) funcs->atomic_enable (crtc, old_crtc_state); -else +else if (funcs->commit) funcs->commit (crtc); } }include/drm/drm_modeset_helper_vtables.h +4
-0@@ -418,6 +418,8 @@ struct drm_crtc_helper_funcs {* Drivers can use the @old_crtc_state input parameter if the operations * needed to enable the CRTC don't depend solely on the new state but * also on the transition between the old state and the new state. +* +* This function is optional. */ void (*atomic_enable)(struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state);@@ -441,6 +443,8 @@ struct drm_crtc_helper_funcs {* parameter @old_crtc_state which could be used to access the old * state. Atomic drivers should consider to use this one instead * of @disable. +* +* This function is optional. */ void (*atomic_disable)(struct drm_crtc *crtc,struct drm_crtc_state *old_crtc_state);Signature · 1 line
2.21.0Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.chSignature · 12 lines
Rodrigo Siqueira https://siqueira.tech Graduate Student Department of Computer Science University of São Paulo _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Signature · 3 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch
Quoted 15 lines · Daniel Vetter
Quoted 14 lines · Rodrigo Siqueira
Quoted 13 lines · Daniel Vetter
Quoted 11 lines · Rodrigo Siqueira
Allow
atomic_enableandatomic_disableoperations fromdrm_crtc_helper_funcsstruct optional. With this, the target display drivers don't need to define a dummy function if they don't need one.Changes since v2:
* Don't make funcs optional
* Update kerneldoc for atomic_enable/disable
* Replace "if (funcs->atomic_enable)" by "if (funcs->commit)"
* Improve commit messageSigned-off-by Rodrigo Siqueira <[email protected]>
Quoted 7 lines
Quoted 4 lines
Quoted 1 line
Reviewed-by Daniel Vetter <[email protected]>Hi,
Is it ok if I apply this patch?Sure.
-Daniel
Hmm, seems to not be applied yet. Pushed to drm-misc-fixes.
cheers,
Gerd