Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

drm/rockchip: Drop explicit drm_mode_config_cleanup call

It's (almost, there's some iommu stuff without significance) 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: Jump out at the right label (Francesco)

v4: Try again, kbuild caught that I didn't build test this properly
...

v5: Use drmm_mode_config_init() for more clarity (Sam, Thomas)

Acked-by: Sam Ravnborg <sam@ravnborg.org>
Cc: Sam Ravnborg <sam@ravnborg.org>
Cc: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Francesco Lavra <francescolavra.fl@gmail.com>
Cc: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: linux-rockchip@lists.infradead.org
Link: https://patchwork.freedesktop.org/patch/msgid/20200323144950.3018436-38-daniel.vetter@ffwll.ch

+5 -9
+5 -9
drivers/gpu/drm/rockchip/rockchip_drm_drv.c
··· 135 135 if (ret) 136 136 goto err_free; 137 137 138 - drm_mode_config_init(drm_dev); 138 + ret = drmm_mode_config_init(drm_dev); 139 + if (ret) 140 + goto err_iommu_cleanup; 139 141 140 142 rockchip_drm_mode_config_init(drm_dev); 141 143 142 144 /* Try to bind all sub drivers. */ 143 145 ret = component_bind_all(dev, drm_dev); 144 146 if (ret) 145 - goto err_mode_config_cleanup; 147 + goto err_iommu_cleanup; 146 148 147 149 ret = drm_vblank_init(drm_dev, drm_dev->mode_config.num_crtc); 148 150 if (ret) ··· 175 173 rockchip_drm_fbdev_fini(drm_dev); 176 174 err_unbind_all: 177 175 component_unbind_all(dev, drm_dev); 178 - err_mode_config_cleanup: 179 - drm_mode_config_cleanup(drm_dev); 176 + err_iommu_cleanup: 180 177 rockchip_iommu_cleanup(drm_dev); 181 178 err_free: 182 - drm_dev->dev_private = NULL; 183 - dev_set_drvdata(dev, NULL); 184 179 drm_dev_put(drm_dev); 185 180 return ret; 186 181 } ··· 193 194 194 195 drm_atomic_helper_shutdown(drm_dev); 195 196 component_unbind_all(dev, drm_dev); 196 - drm_mode_config_cleanup(drm_dev); 197 197 rockchip_iommu_cleanup(drm_dev); 198 198 199 - drm_dev->dev_private = NULL; 200 - dev_set_drvdata(dev, NULL); 201 199 drm_dev_put(drm_dev); 202 200 } 203 201