drm/meson: Fix atomic mode switching regression
Subsystems (5)
PATCH v2 1/1 drm/meson: Fix atomic mode switching regression
Since commit 2bcd3ecab773 when switching mode from X11 (ubuntu mate for example) the display gets blurry, looking like an invalid framebuffer width.
This commit fixed atomic crtc modesetting in a totally wrong way and introduced a local unnecessary ->enabled crtc state.
This commit reverts the crctc _begin() and _enable() changes and simply adds drm_atomic_helper_commit_tail_rpm as helper.
--- drivers/gpu/drm/meson/meson_crtc.c | 23 ++--------------------- drivers/gpu/drm/meson/meson_drv.c | 6 ++++++ 2 files changed, 8 insertions(+), 21 deletions(-)
Changes since v1:
- drop the unecessary local ->enabled logic
- use drm_atomic_helper_commit_tail_rpm as atomic_commit_tail helper
drivers/gpu/drm/meson/meson_crtc.c +2 -21
@@ -46,7 +46,6 @@ struct meson_crtc {struct drm_crtc base;struct drm_pending_vblank_event *event;struct meson_drm *priv; -bool enabled; };#define to_meson_crtc (x) container_of(x, struct meson_crtc, base)
@@ -82,7 +81,8 @@ static const struct drm_crtc_funcs meson_crtc_funcs = { }; -static void meson_crtc_enable (struct drm_crtc *crtc) +static void meson_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) {struct meson_crtc *meson_crtc =to_meson_crtc (crtc);struct drm_crtc_state *crtc_state = crtc->state;
@@ -108,20 +108,6 @@ static void meson_crtc_enable(struct drm_crtc *crtc)drm_crtc_vblank_on (crtc); - meson_crtc->enabled = true; -} - -static void meson_crtc_atomic_enable (struct drm_crtc *crtc, -struct drm_crtc_state *old_state) -{ -struct meson_crtc *meson_crtc =to_meson_crtc (crtc); -struct meson_drm *priv = meson_crtc->priv; - -DRM_DEBUG_DRIVER ("\n" ); - -if (!meson_crtc->enabled) -meson_crtc_enable (crtc); - priv->viu.osd1_enabled = true; }
@@ -153,8 +139,6 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc, crtc->state->event =NULL ; } - - meson_crtc->enabled = false; } static void meson_crtc_atomic_begin(struct drm_crtc *crtc,
@@ -163,9 +147,6 @@ static void meson_crtc_atomic_begin(struct drm_crtc *crtc,struct meson_crtc *meson_crtc =to_meson_crtc (crtc);unsigned long flags; -if (crtc->state->enable && !meson_crtc->enabled) -meson_crtc_enable (crtc); -if (crtc->state->event) {WARN_ON (drm_crtc_vblank_get (crtc) !=0 );
drivers/gpu/drm/meson/meson_drv.c +6 -0
@@ -75,6 +75,11 @@ static const struct drm_mode_config_funcs meson_mode_config_funcs = { .fb_create = drm_gem_fb_create, }; + +static const struct drm_mode_config_helper_funcs meson_mode_config_helpers = { + .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, +}; +static irqreturn_t meson_irq (int irq,void *arg) {struct drm_device *dev = arg;
@@ -266,6 +271,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) drm->mode_config.max_width =3840 ; drm->mode_config.max_height =2160 ; drm->mode_config.funcs = &meson_mode_config_funcs; + drm->mode_config.helper_private = &meson_mode_config_helpers;/* Hardware Initialization */
Signature · 1 line
2.20.1
Quoted 6 lines · Neil Armstrong
Since commit
2bcd3ecab773when switching mode from X11 (ubuntu mate for example) the display gets blurry, looking like an invalid framebuffer width.This commit fixed atomic crtc modesetting in a totally wrong way and introduced a local unnecessary ->enabled crtc state.
Quoted 7 lines
This commit reverts the crctc
_begin()and_enable()changes and simply addsdrm_atomic_helper_commit_tail_rpmas helper.Reported-by Tony McKahan <[email protected]>Suggested-by Daniel Vetter <[email protected]>Fixes 2bcd3ecab773 ("drm/meson: Fixes for drm_crtc_vblank_on/off support")Signed-off-by Neil Armstrong <[email protected]>
For the record (I already acked this on irc):
Quoted 98 lines
--- drivers/gpu/drm/meson/meson_crtc.c | 23 ++--------------------- drivers/gpu/drm/meson/meson_drv.c | 6 ++++++ 2 files changed, 8 insertions(+), 21 deletions(-)Changes since v1:
- drop the unecessary local ->enabled logic
- usedrm_atomic_helper_commit_tail_rpmasatomic_commit_tailhelperdrivers/gpu/drm/meson/meson_crtc.c +2
-21@@ -46,7 +46,6 @@ struct meson_crtc {struct drm_crtc base;struct drm_pending_vblank_event *event;struct meson_drm *priv; -bool enabled; };#define to_meson_crtc (x) container_of(x, struct meson_crtc, base)@@ -82,7 +81,8 @@ static const struct drm_crtc_funcs meson_crtc_funcs = { }; -static void meson_crtc_enable (struct drm_crtc *crtc) +static void meson_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) {struct meson_crtc *meson_crtc =to_meson_crtc (crtc);struct drm_crtc_state *crtc_state = crtc->state;@@ -108,20 +108,6 @@ static void meson_crtc_enable(struct drm_crtc *crtc)drm_crtc_vblank_on (crtc); - meson_crtc->enabled = true; -} - -static void meson_crtc_atomic_enable (struct drm_crtc *crtc, -struct drm_crtc_state *old_state) -{ -struct meson_crtc *meson_crtc =to_meson_crtc (crtc); -struct meson_drm *priv = meson_crtc->priv; - -DRM_DEBUG_DRIVER ("\n" ); - -if (!meson_crtc->enabled) -meson_crtc_enable (crtc); - priv->viu.osd1_enabled = true; }@@ -153,8 +139,6 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc, crtc->state->event =NULL ; } - - meson_crtc->enabled = false; } static void meson_crtc_atomic_begin(struct drm_crtc *crtc,@@ -163,9 +147,6 @@ static void meson_crtc_atomic_begin(struct drm_crtc *crtc,struct meson_crtc *meson_crtc =to_meson_crtc (crtc);unsigned long flags; -if (crtc->state->enable && !meson_crtc->enabled) -meson_crtc_enable (crtc); -if (crtc->state->event) {WARN_ON (drm_crtc_vblank_get (crtc) !=0 );drivers/gpu/drm/meson/meson_drv.c +6
-0@@ -75,6 +75,11 @@ static const struct drm_mode_config_funcs meson_mode_config_funcs = { .fb_create = drm_gem_fb_create, }; + +static const struct drm_mode_config_helper_funcs meson_mode_config_helpers = { + .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, +}; +static irqreturn_t meson_irq (int irq,void *arg) {struct drm_device *dev = arg;@@ -266,6 +271,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) drm->mode_config.max_width =3840 ; drm->mode_config.max_height =2160 ; drm->mode_config.funcs = &meson_mode_config_funcs; + drm->mode_config.helper_private = &meson_mode_config_helpers;/* Hardware Initialization */ Signature · 1 line
2.20.1
Signature · 7 lines
Daniel Vetter Software Engineer, Intel Corporation http://blog.ffwll.ch _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Neil Armstrong
AppliedQuoted 10 lines · Daniel Vetter
Quoted 9 lines · Neil Armstrong
Since commit
2bcd3ecab773when switching mode from X11 (ubuntu mate for example) the display gets blurry, looking like an invalid framebuffer width.This commit fixed atomic crtc modesetting in a totally wrong way and introduced a local unnecessary ->enabled crtc state.
This commit reverts the crctc
_begin()and_enable()changes and simply addsdrm_atomic_helper_commit_tail_rpmas helper.
Quoted 6 lines
Quoted 4 lines
Reported-by Tony McKahan <[email protected]>Suggested-by Daniel Vetter <[email protected]>Fixes 2bcd3ecab773 ("drm/meson: Fixes for drm_crtc_vblank_on/off support")Signed-off-by Neil Armstrong <[email protected]>For the record (I already acked this on irc):
Thanks, I got it, I was checking against the known regression to see if it doesn't add a new one !
Quoted 2 lines
Acked-by Daniel Vetter <[email protected]>
Applied to drm-misc-fixes
Neil
Quoted 93 lines
Quoted 93 lines
--- drivers/gpu/drm/meson/meson_crtc.c | 23 ++--------------------- drivers/gpu/drm/meson/meson_drv.c | 6 ++++++ 2 files changed, 8 insertions(+), 21 deletions(-)Changes since v1:
- drop the unecessary local ->enabled logic
- usedrm_atomic_helper_commit_tail_rpmasatomic_commit_tailhelperdrivers/gpu/drm/meson/meson_crtc.c +2
-21@@ -46,7 +46,6 @@ struct meson_crtc {struct drm_crtc base;struct drm_pending_vblank_event *event;struct meson_drm *priv; -bool enabled; };#define to_meson_crtc (x) container_of(x, struct meson_crtc, base)@@ -82,7 +81,8 @@ static const struct drm_crtc_funcs meson_crtc_funcs = { }; -static void meson_crtc_enable (struct drm_crtc *crtc) +static void meson_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) {struct meson_crtc *meson_crtc =to_meson_crtc (crtc);struct drm_crtc_state *crtc_state = crtc->state;@@ -108,20 +108,6 @@ static void meson_crtc_enable(struct drm_crtc *crtc)drm_crtc_vblank_on (crtc); - meson_crtc->enabled = true; -} - -static void meson_crtc_atomic_enable (struct drm_crtc *crtc, -struct drm_crtc_state *old_state) -{ -struct meson_crtc *meson_crtc =to_meson_crtc (crtc); -struct meson_drm *priv = meson_crtc->priv; - -DRM_DEBUG_DRIVER ("\n" ); - -if (!meson_crtc->enabled) -meson_crtc_enable (crtc); - priv->viu.osd1_enabled = true; }@@ -153,8 +139,6 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc, crtc->state->event =NULL ; } - - meson_crtc->enabled = false; } static void meson_crtc_atomic_begin(struct drm_crtc *crtc,@@ -163,9 +147,6 @@ static void meson_crtc_atomic_begin(struct drm_crtc *crtc,struct meson_crtc *meson_crtc =to_meson_crtc (crtc);unsigned long flags; -if (crtc->state->enable && !meson_crtc->enabled) -meson_crtc_enable (crtc); -if (crtc->state->event) {WARN_ON (drm_crtc_vblank_get (crtc) !=0 );drivers/gpu/drm/meson/meson_drv.c +6
-0@@ -75,6 +75,11 @@ static const struct drm_mode_config_funcs meson_mode_config_funcs = { .fb_create = drm_gem_fb_create, }; + +static const struct drm_mode_config_helper_funcs meson_mode_config_helpers = { + .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, +}; +static irqreturn_t meson_irq (int irq,void *arg) {struct drm_device *dev = arg;@@ -266,6 +271,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) drm->mode_config.max_width =3840 ; drm->mode_config.max_height =2160 ; drm->mode_config.funcs = &meson_mode_config_funcs; + drm->mode_config.helper_private = &meson_mode_config_helpers;
Quoted 6 lines
Quoted 5 lines
drivers/gpu/drm/meson/meson_drv.c +0
-0/* Hardware Initialization */ Signature · 1 line
2.20.1
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Hi Stable kernel team,
Quoted 6 lines · Neil Armstrong
Since commit
2bcd3ecab773when switching mode from X11 (ubuntu mate for example) the display gets blurry, looking like an invalid framebuffer width.This commit fixed atomic crtc modesetting in a totally wrong way and introduced a local unnecessary ->enabled crtc state.
Quoted 7 lines
This commit reverts the crctc
_begin()and_enable()changes and simply addsdrm_atomic_helper_commit_tail_rpmas helper.Reported-by Tony McKahan <[email protected]>Suggested-by Daniel Vetter <[email protected]>Fixes 2bcd3ecab773 ("drm/meson: Fixes for drm_crtc_vblank_on/off support")Signed-off-by Neil Armstrong <[email protected]>
This fix has landed in linus master with id ce0210c12433031aba3bbacd75f4c02ab77f2004
could it be applied to 4.19 and 4.20 stable trees ?
Thanks,
Neil
Quoted 96 lines
--- drivers/gpu/drm/meson/meson_crtc.c | 23 ++--------------------- drivers/gpu/drm/meson/meson_drv.c | 6 ++++++ 2 files changed, 8 insertions(+), 21 deletions(-)Changes since v1:
- drop the unecessary local ->enabled logic
- usedrm_atomic_helper_commit_tail_rpmasatomic_commit_tailhelperdrivers/gpu/drm/meson/meson_crtc.c +2
-21@@ -46,7 +46,6 @@ struct meson_crtc {struct drm_crtc base;struct drm_pending_vblank_event *event;struct meson_drm *priv; -bool enabled; };#define to_meson_crtc (x) container_of(x, struct meson_crtc, base)@@ -82,7 +81,8 @@ static const struct drm_crtc_funcs meson_crtc_funcs = { }; -static void meson_crtc_enable (struct drm_crtc *crtc) +static void meson_crtc_atomic_enable (struct drm_crtc *crtc, +struct drm_crtc_state *old_state) {struct meson_crtc *meson_crtc =to_meson_crtc (crtc);struct drm_crtc_state *crtc_state = crtc->state;@@ -108,20 +108,6 @@ static void meson_crtc_enable(struct drm_crtc *crtc)drm_crtc_vblank_on (crtc); - meson_crtc->enabled = true; -} - -static void meson_crtc_atomic_enable (struct drm_crtc *crtc, -struct drm_crtc_state *old_state) -{ -struct meson_crtc *meson_crtc =to_meson_crtc (crtc); -struct meson_drm *priv = meson_crtc->priv; - -DRM_DEBUG_DRIVER ("\n" ); - -if (!meson_crtc->enabled) -meson_crtc_enable (crtc); - priv->viu.osd1_enabled = true; }@@ -153,8 +139,6 @@ static void meson_crtc_atomic_disable(struct drm_crtc *crtc, crtc->state->event =NULL ; } - - meson_crtc->enabled = false; } static void meson_crtc_atomic_begin(struct drm_crtc *crtc,@@ -163,9 +147,6 @@ static void meson_crtc_atomic_begin(struct drm_crtc *crtc,struct meson_crtc *meson_crtc =to_meson_crtc (crtc);unsigned long flags; -if (crtc->state->enable && !meson_crtc->enabled) -meson_crtc_enable (crtc); -if (crtc->state->event) {WARN_ON (drm_crtc_vblank_get (crtc) !=0 );drivers/gpu/drm/meson/meson_drv.c +6
-0@@ -75,6 +75,11 @@ static const struct drm_mode_config_funcs meson_mode_config_funcs = { .fb_create = drm_gem_fb_create, }; + +static const struct drm_mode_config_helper_funcs meson_mode_config_helpers = { + .atomic_commit_tail = drm_atomic_helper_commit_tail_rpm, +}; +static irqreturn_t meson_irq (int irq,void *arg) {struct drm_device *dev = arg;@@ -266,6 +271,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) drm->mode_config.max_width =3840 ; drm->mode_config.max_height =2160 ; drm->mode_config.funcs = &meson_mode_config_funcs; + drm->mode_config.helper_private = &meson_mode_config_helpers;/* Hardware Initialization */
Quoted 12 lines · Neil Armstrong
Hi Stable kernel team,
Quoted 9 lines · Neil Armstrong
Since commit
2bcd3ecab773when switching mode from X11 (ubuntu mate for example) the display gets blurry, looking like an invalid framebuffer width.This commit fixed atomic crtc modesetting in a totally wrong way and introduced a local unnecessary ->enabled crtc state.
This commit reverts the crctc
_begin()and_enable()changes and simply addsdrm_atomic_helper_commit_tail_rpmas helper.
Quoted 8 lines
Quoted 4 lines
Reported-by Tony McKahan <[email protected]>Suggested-by Daniel Vetter <[email protected]>Fixes 2bcd3ecab773 ("drm/meson: Fixes for drm_crtc_vblank_on/off support")Signed-off-by Neil Armstrong <[email protected]>This fix has landed in linus master with id
ce0210c12433031aba3bbacd75f4c02ab77f2004could it be applied to 4.19 and 4.20 stable trees ?
Now queued up, thanks.
greg k-h
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel