Set up generic fbdev after registering device
Subsystems (12)
Thomas Zimmermann
maintainerv2 cover Set up generic fbdev after registering device
Generic fbdev emulation is a DRM client. If possible, it should behave like userspace clients. Therefore it should not run before the driver registered the new DRM device. If the setup function fails, the driver should not report an error.
This is a follow-up patchset to the discussion at [1]. I went through all calls to drm_fbdev_generic_setup(), moved them to the final operation of their driver's probe function, and removed the return value.
Built on x86-64, aarch64 and arm. Tested with mgag200.
v2:
* warn in drm_fbdev_generic_setup() if device is unregistered (Jani)
* document the new behavior (Sam)
* fix mediatek subject (Noralf)
* keep kirin patch for now, even though the patched code will probably be removed
Thomas Zimmermann (10):
drm/ast: Set up fbdev after registering device; remove error checks drm/hibmc: Remove error check from fbdev setup drm/kirin: Set up fbdev after fully registering device drm/ingenic: Remove error check from fbdev setup drm/mediatek: Remove error check from fbdev setup drm/mgag200: Set up fbdev after registering device; remove error
checks
drm/tilcdc: Set up fbdev after fully registering device drm/udl: Remove error check from fbdev setup drm/vboxvideo: Set up fbdev after registering device; remove error
checks
drm/fb-helper: Remove return value from drm_fbdev_generic_setup()
drivers/gpu/drm/ast/ast_drv.c | 3 +++ drivers/gpu/drm/ast/ast_main.c | 5 ---- drivers/gpu/drm/drm_fb_helper.c | 25 ++++++++++--------- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +---- .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 +-- drivers/gpu/drm/ingenic/ingenic-drm.c | 4 +-- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +-- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 ++ drivers/gpu/drm/mgag200/mgag200_main.c | 4 --- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +-- drivers/gpu/drm/udl/udl_drv.c | 6 +---- drivers/gpu/drm/vboxvideo/vbox_drv.c | 6 ++--- include/drm/drm_fb_helper.h | 5 ++-- 13 files changed, 30 insertions(+), 47 deletions(-)
--
2.26.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 1/10 drm/ast: Set up fbdev after registering device; remove error checks
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.
--- drivers/gpu/drm/ast/ast_drv.c | 3 +++ drivers/gpu/drm/ast/ast_main.c | 5 ----- 2 files changed, 3 insertions(+), 5 deletions(-)
drivers/gpu/drm/ast/ast_drv.c +3 -0
@@ -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
@@ -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);
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 2/10 drm/hibmc: Remove error check from fbdev setup
In reply to Thomas ZimmermannGeneric fbdev support is a DRM client. Remove the error check as the driver's probe function should not depend on a DRM client's state.
--- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +1 -5
@@ -307,11 +307,7 @@ static int hibmc_load(struct drm_device *dev)/* reset all the states of crtc/plane/encoder/connector */ drm_mode_config_reset (dev); - ret =drm_fbdev_generic_setup (dev, dev->mode_config.preferred_depth); -if (ret) { -DRM_ERROR ("failed to initialize fbdev: %d\n" , ret); - goto err; - } +drm_fbdev_generic_setup (dev, dev->mode_config.preferred_depth);return 0 ;
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 3/10 drm/kirin: Set up fbdev after fully registering device
In reply to Thomas ZimmermannGeneric fbdev support is a DRM client. Set it up after fully registering the new DRM device.
--- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +2 -2
@@ -277,8 +277,6 @@ static int kirin_drm_bind(struct device *dev)if (ret) goto err_kms_cleanup; -drm_fbdev_generic_setup (drm_dev,32 ); -/* connectors should be registered after drm device register */ if (driver_data->register_connects) { ret =kirin_drm_connectors_register (drm_dev);
@@ -286,6 +284,8 @@ static int kirin_drm_bind(struct device *dev) goto err_drm_dev_unregister; } +drm_fbdev_generic_setup (drm_dev,32 ); +return 0 ; err_drm_dev_unregister:
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 4/10 drm/ingenic: Remove error check from fbdev setup
In reply to Thomas ZimmermannRemove the error check from the fbdev setup function. The function will print a warning.
--- drivers/gpu/drm/ingenic/ingenic-drm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/ingenic/ingenic-drm.c +1 -3
@@ -783,9 +783,7 @@ static int ingenic_drm_probe(struct platform_device *pdev) goto err_devclk_disable; } - ret =drm_fbdev_generic_setup (drm,32 ); -if (ret) -dev_warn (dev,"Unable to start fbdev emulation: %i" , ret); +drm_fbdev_generic_setup (drm,32 );return 0 ;
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 5/10 drm/mediatek: Remove error check from fbdev setup
In reply to Thomas ZimmermannRemove the error check from the fbdev setup function. The function will print a warning.
v2:
* fix subject line
--- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/gpu/drm/mediatek/mtk_drm_drv.c +1 -3
@@ -347,9 +347,7 @@ static int mtk_drm_bind(struct device *dev)if (ret <0 ) goto err_deinit; - ret =drm_fbdev_generic_setup (drm,32 ); -if (ret) -DRM_ERROR ("Failed to initialize fbdev: %d\n" , ret); +drm_fbdev_generic_setup (drm,32 );return 0 ;
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 6/10 drm/mgag200: Set up fbdev after registering device; remove error checks
In reply to Thomas ZimmermannGeneric 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.
--- drivers/gpu/drm/mgag200/mgag200_drv.c | 2 ++ drivers/gpu/drm/mgag200/mgag200_main.c | 4 ---- 2 files changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/mgag200/mgag200_drv.c +2 -0
@@ -77,6 +77,8 @@ static int mga_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto err_mgag200_driver_unload; +drm_fbdev_generic_setup (dev,0 ); +return 0 ; err_mgag200_driver_unload:
drivers/gpu/drm/mgag200/mgag200_main.c +0 -4
@@ -181,10 +181,6 @@ int mgag200_driver_load(struct drm_device *dev, unsigned long flags)dev_warn (&dev->pdev->dev,"Could not initialize cursors. Not doing hardware cursors.\n" ); - r =drm_fbdev_generic_setup (mdev->dev,0 ); -if (r) - goto err_modeset; -return 0 ; err_modeset:
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 7/10 drm/tilcdc: Set up fbdev after fully registering device
In reply to Thomas ZimmermannGeneric fbdev support is a DRM client. Set it up after fully registering the new DRM device.
--- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/gpu/drm/tilcdc/tilcdc_drv.c +1 -2
@@ -390,10 +390,9 @@ static int tilcdc_init(struct drm_driver *ddrv, struct device *dev) ret =drm_dev_register (ddev,0 );if (ret) goto init_failed; + priv->is_registered = true;drm_fbdev_generic_setup (ddev, bpp); - - priv->is_registered = true;return 0 ; init_failed:
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 8/10 drm/udl: Remove error check from fbdev setup
In reply to Thomas ZimmermannRemove the error check from the fbdev setup function. The driver's probe function should not depend on a DRM client's state.
--- drivers/gpu/drm/udl/udl_drv.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/gpu/drm/udl/udl_drv.c +1 -5
@@ -97,14 +97,10 @@ static int udl_usb_probe(struct usb_interface *interface,DRM_INFO ("Initialized udl on minor %d\n" , udl->drm.primary->index); - r =drm_fbdev_generic_setup (&udl->drm,0 ); -if (r) - goto err_drm_dev_unregister; +drm_fbdev_generic_setup (&udl->drm,0 );return 0 ; -err_drm_dev_unregister: -drm_dev_unregister (&udl->drm); err_free:drm_dev_put (&udl->drm);return r;
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 9/10 drm/vboxvideo: Set up fbdev after registering device; remove error checks
In reply to Thomas ZimmermannGeneric 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.
--- drivers/gpu/drm/vboxvideo/vbox_drv.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/vboxvideo/vbox_drv.c +2 -4
@@ -82,14 +82,12 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent)if (ret) goto err_mode_fini; - ret =drm_fbdev_generic_setup (&vbox->ddev,32 ); -if (ret) - goto err_irq_fini; - ret =drm_dev_register (&vbox->ddev,0 );if (ret) goto err_irq_fini; +drm_fbdev_generic_setup (&vbox->ddev,32 ); +return 0 ; err_irq_fini:
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerPATCH v2 10/10 drm/fb-helper: Remove return value from drm_fbdev_generic_setup()
In reply to Thomas ZimmermannGeneric fbdev emulation is a DRM client. Drivers should invoke the setup function, but not depend on its success. Hence remove the return value.
v2:
* warn if fbdev device has not been registered yet
* document the new behavior
* convert the existing warning to the new dev_ interface
--- drivers/gpu/drm/drm_fb_helper.c | 25 +++++++++++++------------ include/drm/drm_fb_helper.h | 5 +++-- 2 files changed, 16 insertions(+), 14 deletions(-)
drivers/gpu/drm/drm_fb_helper.c +13 -12
@@ -2169,7 +2169,9 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = {* @dev->mode_config.preferred_depth is used if this is zero. * * This function sets up generic fbdev emulation for drivers that supports -* dumb buffers with a virtual address and that can be mmap'ed. +* dumb buffers with a virtual address and that can be mmap'ed. It's supposed +* to run after the DRM driver registered the new DRM device with +* drm_dev_register(). * * Restore, hotplug events and teardown are all taken care of. Drivers that do * suspend/resume need to call drm_fb_helper_set_suspend_unlocked() themselves.
@@ -2186,29 +2188,30 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = {* Setup will be retried on the next hotplug event. * * The fbdev is destroyed by drm_dev_unregister(). -* -* Returns: -* Zero on success or negative error code on failure. */ -int drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp) +void drm_fbdev_generic_setup (struct drm_device *dev, +unsigned int preferred_bpp) {struct drm_fb_helper *fb_helper;int ret; -WARN (dev->fb_helper,"fb_helper is already set!\n" ); +drm_WARN (dev, !dev->registered,"Device has not been registered.\n" ); +drm_WARN (dev, dev->fb_helper,"fb_helper is already set!\n" );if (!drm_fbdev_emulation) -return 0 ; +return ; fb_helper =kzalloc (sizeof (*fb_helper),GFP_KERNEL ); -if (!fb_helper) -return -ENOMEM ; +if (!fb_helper) { +drm_err (dev,"Failed to allocate fb_helper\n" ); +return ; + } ret =drm_client_init (dev, &fb_helper->client,"fbdev" , &drm_fbdev_client_funcs);if (ret) {kfree (fb_helper);drm_err (dev,"Failed to register client: %d\n" , ret); -return ret; +return ; }if (!preferred_bpp)
@@ -2222,8 +2225,6 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)drm_dbg_kms (dev,"client hotplug ret=%d\n" , ret);drm_client_register (&fb_helper->client); - -return 0 ; }EXPORT_SYMBOL (drm_fbdev_generic_setup);
include/drm/drm_fb_helper.h +3 -2
@@ -269,7 +269,8 @@ int drm_fb_helper_debug_leave(struct fb_info *info);void drm_fb_helper_lastclose (struct drm_device *dev);void drm_fb_helper_output_poll_changed (struct drm_device *dev); -int drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp); +void drm_fbdev_generic_setup (struct drm_device *dev, +unsigned int preferred_bpp);#else static inline void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper,
@@ -443,7 +444,7 @@ static inline void drm_fb_helper_output_poll_changed(struct drm_device *dev) { } -static inline int +static inline void drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp) {return 0 ;
Signature · 6 lines
2.26.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Re: [PATCH v2 10/10] drm/fb-helper: Remove return value from drm_fbdev_generic_setup()
Hi Thomas.
You missed my ack on the first 9 patches:
https://lore.kernel.org/dri-devel/[email protected]/
Not that it matters as others have acked/reviewed them.
Quoted 23 lines · Thomas Zimmermann
Generic fbdev emulation is a DRM client. Drivers should invoke the setup function, but not depend on its success. Hence remove the return value.
v2:
* warn if fbdev device has not been registered yet
* document the new behavior
* convert the existing warning to the newdev_interfaceSigned-off-by Thomas Zimmermann <[email protected]>Reviewed-by Sam Ravnborg <[email protected]>Reviewed-by Noralf Trønnes <[email protected]>Acked-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/drm_fb_helper.c | 25 +++++++++++++------------ include/drm/drm_fb_helper.h | 5 +++-- 2 files changed, 16 insertions(+), 14 deletions(-)drivers/gpu/drm/drm_fb_helper.c +0
-0
drivers/gpu/drm/drm_fb_helper.c static const struct drm_client_funcs drm_fbdev_client_funcs = { · line 2174
Quoted 7 lines
drivers/gpu/drm/drm_fb_helper.c +3
-1@@ -2169,7 +2169,9 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = {* @dev->mode_config.preferred_depth is used if this is zero. * * This function sets up generic fbdev emulation for drivers that supports -* dumb buffers with a virtual address and that can be mmap'ed. +* dumb buffers with a virtual address and that can be mmap'ed. It's supposed +* to run after the DRM driver registered the new DRM device with +* drm_dev_register().
OR maybe be more explicit - something like:drm_fbdev_generic_setup() shall be called after the DRM is registered with drm_dev_register().
Either way is fine.
Sam
Quoted 77 lines
drivers/gpu/drm/drm_fb_helper.c +10
-11* * Restore, hotplug events and teardown are all taken care of. Drivers that do * suspend/resume need to call drm_fb_helper_set_suspend_unlocked() themselves. @@ -2186,29 +2188,30 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = {* Setup will be retried on the next hotplug event. * * The fbdev is destroyed by drm_dev_unregister(). -* -* Returns: -* Zero on success or negative error code on failure. */ -int drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp) +void drm_fbdev_generic_setup (struct drm_device *dev, +unsigned int preferred_bpp) {struct drm_fb_helper *fb_helper;int ret; -WARN (dev->fb_helper,"fb_helper is already set!\n" ); +drm_WARN (dev, !dev->registered,"Device has not been registered.\n" ); +drm_WARN (dev, dev->fb_helper,"fb_helper is already set!\n" );if (!drm_fbdev_emulation) -return 0 ; +return ; fb_helper =kzalloc (sizeof (*fb_helper),GFP_KERNEL ); -if (!fb_helper) -return -ENOMEM ; +if (!fb_helper) { +drm_err (dev,"Failed to allocate fb_helper\n" ); +return ; + } ret =drm_client_init (dev, &fb_helper->client,"fbdev" , &drm_fbdev_client_funcs);if (ret) {kfree (fb_helper);drm_err (dev,"Failed to register client: %d\n" , ret); -return ret; +return ; }if (!preferred_bpp)@@ -2222,8 +2225,6 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)drm_dbg_kms (dev,"client hotplug ret=%d\n" , ret);drm_client_register (&fb_helper->client); - -return 0 ; }EXPORT_SYMBOL (drm_fbdev_generic_setup);include/drm/drm_fb_helper.h +3
-2@@ -269,7 +269,8 @@ int drm_fb_helper_debug_leave(struct fb_info *info);void drm_fb_helper_lastclose (struct drm_device *dev);void drm_fb_helper_output_poll_changed (struct drm_device *dev); -int drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp); +void drm_fbdev_generic_setup (struct drm_device *dev, +unsigned int preferred_bpp);#else static inline void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper,@@ -443,7 +444,7 @@ static inline void drm_fb_helper_output_poll_changed(struct drm_device *dev) { } -static inline int +static inline void drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp) {return 0 ;Signature · 1 line
2.26.0
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Thomas Zimmermann
maintainerRe: [PATCH v2 10/10] drm/fb-helper: Remove return value from drm_fbdev_generic_setup()
Hi Sam
Am 08.04.20 um 10:50 schrieb Sam Ravnborg:
Quoted 5 lines
Hi Thomas.
You missed my ack on the first 9 patches:
https://lore.kernel.org/dri-devel/[email protected]/
Not that it matters as others have acked/reviewed them.
This got lost. I'll add you acks. Thanks for taking another look at the patches.
Quoted 20 lines · Thomas Zimmermann
Quoted 18 lines
Generic fbdev emulation is a DRM client. Drivers should invoke the setup function, but not depend on its success. Hence remove the return value.
v2:
* warn if fbdev device has not been registered yet
* document the new behavior
* convert the existing warning to the newdev_interfaceSigned-off-by Thomas Zimmermann <[email protected]>Reviewed-by Sam Ravnborg <[email protected]>Reviewed-by Noralf Trønnes <[email protected]>Acked-by Gerd Hoffmann <[email protected]>--- drivers/gpu/drm/drm_fb_helper.c | 25 +++++++++++++------------ include/drm/drm_fb_helper.h | 5 +++-- 2 files changed, 16 insertions(+), 14 deletions(-)
Quoted 15 lines
drivers/gpu/drm/drm_fb_helper.c static const struct drm_client_funcs drm_fbdev_client_funcs = { · line 2174
Quoted 12 lines
drivers/gpu/drm/drm_fb_helper.c +3
-1@@ -2169,7 +2169,9 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = {* @dev->mode_config.preferred_depth is used if this is zero. * * This function sets up generic fbdev emulation for drivers that supports -* dumb buffers with a virtual address and that can be mmap'ed. +* dumb buffers with a virtual address and that can be mmap'ed. It's supposed +* to run after the DRM driver registered the new DRM device with +* drm_dev_register(). OR maybe be more explicit - something like:
drm_fbdev_generic_setup()shall be called after the DRM is registered withdrm_dev_register().
I think this one is even better.
Best regards
Thomas
Quoted 82 lines
Either way is fine.
Sam
Quoted 77 lines
drivers/gpu/drm/drm_fb_helper.c +10
-11* * Restore, hotplug events and teardown are all taken care of. Drivers that do * suspend/resume need to call drm_fb_helper_set_suspend_unlocked() themselves. @@ -2186,29 +2188,30 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = {* Setup will be retried on the next hotplug event. * * The fbdev is destroyed by drm_dev_unregister(). -* -* Returns: -* Zero on success or negative error code on failure. */ -int drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp) +void drm_fbdev_generic_setup (struct drm_device *dev, +unsigned int preferred_bpp) {struct drm_fb_helper *fb_helper;int ret; -WARN (dev->fb_helper,"fb_helper is already set!\n" ); +drm_WARN (dev, !dev->registered,"Device has not been registered.\n" ); +drm_WARN (dev, dev->fb_helper,"fb_helper is already set!\n" );if (!drm_fbdev_emulation) -return 0 ; +return ; fb_helper =kzalloc (sizeof (*fb_helper),GFP_KERNEL ); -if (!fb_helper) -return -ENOMEM ; +if (!fb_helper) { +drm_err (dev,"Failed to allocate fb_helper\n" ); +return ; + } ret =drm_client_init (dev, &fb_helper->client,"fbdev" , &drm_fbdev_client_funcs);if (ret) {kfree (fb_helper);drm_err (dev,"Failed to register client: %d\n" , ret); -return ret; +return ; }if (!preferred_bpp)@@ -2222,8 +2225,6 @@ int drm_fbdev_generic_setup(struct drm_device *dev, unsigned int preferred_bpp)drm_dbg_kms (dev,"client hotplug ret=%d\n" , ret);drm_client_register (&fb_helper->client); - -return 0 ; }EXPORT_SYMBOL (drm_fbdev_generic_setup);include/drm/drm_fb_helper.h +3
-2@@ -269,7 +269,8 @@ int drm_fb_helper_debug_leave(struct fb_info *info);void drm_fb_helper_lastclose (struct drm_device *dev);void drm_fb_helper_output_poll_changed (struct drm_device *dev); -int drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp); +void drm_fbdev_generic_setup (struct drm_device *dev, +unsigned int preferred_bpp);#else static inline void drm_fb_helper_prepare(struct drm_device *dev, struct drm_fb_helper *helper,@@ -443,7 +444,7 @@ static inline void drm_fb_helper_output_poll_changed(struct drm_device *dev) { } -static inline int +static inline void drm_fbdev_generic_setup (struct drm_device *dev,unsigned int preferred_bpp) {return 0 ;Signature · 1 line
2.26.0
Signature · 6 lines
Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Felix Imendörffer
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel