drm/ast: Set up fbdev after registering device; remove error checks (a4cbf268) · Commits · 戴 / test

Generic fbdev support is a DRM client. Set it up after registering the new DRM device. Remove the error checks as the driver's probe function should not depend on a DRM client's state. Signed-off-by:

Thomas Zimmermann <tzimmermann@suse.de> Reviewed-by:

Noralf Trønnes <noralf@tronnes.org> Acked-by:

Sam Ravnborg <sam@ravnborg.org> Acked-by:

Gerd Hoffmann <kraxel@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20200408082641.590-2-tzimmermann@suse.de

drivers/gpu/drm/ast/ast_drv.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@

		#include <drm/drm_crtc_helper.h>
		#include <drm/drm_drv.h>
		#include <drm/drm_fb_helper.h>
		#include <drm/drm_gem_vram_helper.h>
		#include <drm/drm_probe_helper.h>

		@@ -111,6 +112,8 @@ static int ast_pci_probe(struct pci_dev pdev, const struct pci_device_id ent)
		if (ret)
		goto err_ast_driver_unload;

		drm_fbdev_generic_setup(dev, 32);

		return 0;

		err_ast_driver_unload:

drivers/gpu/drm/ast/ast_main.c

+0 −5

Original line number	Diff line number	Diff line
		@@ -30,7 +30,6 @@

		#include <drm/drm_atomic_helper.h>
		#include <drm/drm_crtc_helper.h>
		#include <drm/drm_fb_helper.h>
		#include <drm/drm_gem.h>
		#include <drm/drm_gem_framebuffer_helper.h>
		#include <drm/drm_gem_vram_helper.h>
		@@ -512,10 +511,6 @@ int ast_driver_load(struct drm_device *dev, unsigned long flags)

		drm_mode_config_reset(dev);

		ret = drm_fbdev_generic_setup(dev, 32);
		if (ret)
		goto out_free;

		return 0;
		out_free:
		kfree(ast);

Admin message