| Message ID | 20241008-drm-vc4-fixes-v1-2-9d0396ca9f42@raspberrypi.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | drm/vc4: 3 minor fixes from mismatched drm_dev_[enter|exit] calls | expand |
Hi Dave, On 10/8/24 13:44, Dave Stevenson wrote: > Commit 92c17d16476c ("drm/vc4: hvs: Ignore atomic_flush if we're disabled") > added a path which returned early without having called drm_dev_exit. > > Ensure all paths call drm_dev_exit. > > Fixes: 92c17d16476c ("drm/vc4: hvs: Ignore atomic_flush if we're disabled") > Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> With the same comment as PATCH 1/3, Reviewed-by: Maíra Canal <mcanal@igalia.com> Best Regards, - Maíra > --- > drivers/gpu/drm/vc4/vc4_hvs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c > index 546ee11016b2..c5ebc317188a 100644 > --- a/drivers/gpu/drm/vc4/vc4_hvs.c > +++ b/drivers/gpu/drm/vc4/vc4_hvs.c > @@ -603,7 +603,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc, > } > > if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED) > - return; > + goto exit; > > if (debug_dump_regs) { > DRM_INFO("CRTC %d HVS before:\n", drm_crtc_index(crtc)); > @@ -686,6 +686,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc, > vc4_hvs_dump_state(hvs); > } > > +exit: > drm_dev_exit(idx); > } > >
On 08.10.2024 18:44, Dave Stevenson wrote: > Commit 92c17d16476c ("drm/vc4: hvs: Ignore atomic_flush if we're disabled") > added a path which returned early without having called drm_dev_exit. > > Ensure all paths call drm_dev_exit. > > Fixes: 92c17d16476c ("drm/vc4: hvs: Ignore atomic_flush if we're disabled") > Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> Tested-by: Marek Szyprowski <m.szyprowski@samsung.com> > --- > drivers/gpu/drm/vc4/vc4_hvs.c | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c > index 546ee11016b2..c5ebc317188a 100644 > --- a/drivers/gpu/drm/vc4/vc4_hvs.c > +++ b/drivers/gpu/drm/vc4/vc4_hvs.c > @@ -603,7 +603,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc, > } > > if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED) > - return; > + goto exit; > > if (debug_dump_regs) { > DRM_INFO("CRTC %d HVS before:\n", drm_crtc_index(crtc)); > @@ -686,6 +686,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc, > vc4_hvs_dump_state(hvs); > } > > +exit: > drm_dev_exit(idx); > } > > Best regards
diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index 546ee11016b2..c5ebc317188a 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -603,7 +603,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc, } if (vc4_state->assigned_channel == VC4_HVS_CHANNEL_DISABLED) - return; + goto exit; if (debug_dump_regs) { DRM_INFO("CRTC %d HVS before:\n", drm_crtc_index(crtc)); @@ -686,6 +686,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc, vc4_hvs_dump_state(hvs); } +exit: drm_dev_exit(idx); }
Commit 92c17d16476c ("drm/vc4: hvs: Ignore atomic_flush if we're disabled") added a path which returned early without having called drm_dev_exit. Ensure all paths call drm_dev_exit. Fixes: 92c17d16476c ("drm/vc4: hvs: Ignore atomic_flush if we're disabled") Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com> --- drivers/gpu/drm/vc4/vc4_hvs.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)