Daniel Vetter <[email protected]> 於 2020年3月23日 週一 下午10:51寫道： > > It's right above the drm_dev_put(). > > This is made possible by a preceeding patch which added a drmm_ > cleanup action to drm_mode_config_init(), hence all we need to do to > ensure that drm_mode_config_cleanup() is run on final drm_device > cleanup is check the new error code for _init(). > > Aside: Another driver with a bit much devm_kzalloc, which should > probably use drmm_kzalloc instead ... > > v2: Explain why this cleanup is possible (Laurent). > > v3: Use drmm_mode_config_init() for more clarity (Sam, Thomas) >
Acked-by: Chun-Kuang Hu <[email protected]> > Acked-by: Sam Ravnborg <[email protected]> > Cc: Sam Ravnborg <[email protected]> > Cc: Thomas Zimmermann <[email protected]> > Cc: Laurent Pinchart <[email protected]> > Signed-off-by: Daniel Vetter <[email protected]> > --- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 9 ++++----- > 1 file changed, 4 insertions(+), 5 deletions(-) > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 0563c6813333..2eaa9080d250 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -162,7 +162,9 @@ static int mtk_drm_kms_init(struct drm_device *drm) > } > private->mutex_dev = &pdev->dev; > > - drm_mode_config_init(drm); > + ret = drmm_mode_config_init(drm); > + if (ret) > + return ret; > > drm->mode_config.min_width = 64; > drm->mode_config.min_height = 64; > @@ -179,7 +181,7 @@ static int mtk_drm_kms_init(struct drm_device *drm) > > ret = component_bind_all(drm->dev, drm); > if (ret) > - goto err_config_cleanup; > + return ret; > > /* > * We currently support two fixed data streams, each optional, > @@ -255,8 +257,6 @@ static int mtk_drm_kms_init(struct drm_device *drm) > dma_dev->dma_parms = NULL; > err_component_unbind: > component_unbind_all(drm->dev, drm); > -err_config_cleanup: > - drm_mode_config_cleanup(drm); > > return ret; > } > @@ -272,7 +272,6 @@ static void mtk_drm_kms_deinit(struct drm_device *drm) > private->dma_dev->dma_parms = NULL; > > component_unbind_all(drm->dev, drm); > - drm_mode_config_cleanup(drm); > } > > static const struct file_operations mtk_drm_fops = { > -- > 2.25.1 > > _______________________________________________ > dri-devel mailing list > [email protected] > https://lists.freedesktop.org/mailman/listinfo/dri-devel _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
