* [PATCH 0/3] drm: Allow simpledrm to setup its emulated FB as firmware provided
@ 2022-05-02 8:48 Javier Martinez Canillas
2022-05-02 8:48 ` [PATCH 1/3] drm: Remove superfluous arg when calling to drm_fbdev_generic_setup() Javier Martinez Canillas
` (3 more replies)
0 siblings, 4 replies; 8+ messages in thread
From: Javier Martinez Canillas @ 2022-05-02 8:48 UTC (permalink / raw)
To: linux-kernel
Cc: Thomas Zimmermann, Javier Martinez Canillas, Alain Volmat,
Alex Deucher, Alexandre Belloni, Alexandre Torgue,
Alexey Brodkin, Alison Wang, Andrew Jeffery, Andrey Grodzovsky,
Boris Brezillon, Brian Starkey, Chen Feng, Chen-Yu Tsai,
Chia-I Wu, Christian König, Chun-Kuang Hu, Claudiu Beznea,
Daniel Vetter, Dave Airlie, David Airlie, Emma Anholt, Evan Quan,
Fabio Estevam, Gerd Hoffmann, Greg Kroah-Hartman,
Gurchetan Singh, Hans de Goede, Hao Fang, Hyun Kwon,
Jernej Skrabec, Jerome Brunet, Joel Stanley, John Stultz,
Jyri Sarha, Kevin Hilman, Kieran Bingham, Laurent Pinchart,
Laurentiu Palcu, Linus Walleij, Liviu Dudau, Lucas De Marchi,
Lucas Stach, Maarten Lankhorst, Marek Vasut, Mario Limonciello,
Martin Blumenstingl, Matthias Brugger, Maxime Coquelin,
Maxime Ripard, Michal Simek, NXP Linux Team, Neil Armstrong,
Nicolas Ferre, Nirmoy Das, Noralf Trønnes, Pan, Xinhui,
Paul Cercueil, Pengutronix Kernel Team, Philipp Zabel,
Philippe Cornu, Raphael Gallais-Pou, Sam Ravnborg,
Samuel Holland, Sascha Hauer, Shawn Guo, Solomon Chiu,
Stefan Agner, Tian Tao, Tomi Valkeinen, Xinliang Liu,
Xinwei Kong, Yannick Fertre, Yong Wu, amd-gfx, dri-devel,
linux-amlogic, linux-arm-kernel, linux-aspeed, linux-mediatek,
linux-mips, linux-renesas-soc, linux-stm32, linux-sunxi,
spice-devel, virtualization
Hello,
This series contain patches suggested by Thomas Zimmermannas a feedback for
"[RFC PATCH v4 00/11] Fix some race between sysfb device registration and
drivers probe" [0].
Since other changes in [0] were more controversial, I decided to just split
this part in a new patch-set and revisit the rest of the patches later.
Patch #1 is just a cleanup since when working on this noticed that some DRM
drivers were passing as preferred bits per pixel to drm_fbdev_generic_setup()
the value that is the default anyways.
Patch #2 renames the 'preferred_bpp' drm_fbdev_generic_setup() parameter to
'options', and make this a multi field parameter so that it can be extended
later to pass other options as well.
Patch #3 finally adds the new DRM_FB_FW option and makes simpledrm to use it
so that the registered framebuffer device is also marked as firmware provided.
[0]: https://lore.kernel.org/lkml/20220429084253.1085911-1-javierm@redhat.com/
Javier Martinez Canillas (3):
drm: Remove superfluous arg when calling to drm_fbdev_generic_setup()
drm/fb-helper: Rename preferred_bpp drm_fbdev_generic_setup()
parameter
drm: Allow simpledrm to setup its emulated FB as firmware provided
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +++--
drivers/gpu/drm/arm/hdlcd_drv.c | 2 +-
drivers/gpu/drm/arm/malidp_drv.c | 2 +-
drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +-
drivers/gpu/drm/ast/ast_drv.c | 2 +-
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +-
drivers/gpu/drm/drm_drv.c | 2 +-
drivers/gpu/drm/drm_fb_helper.c | 25 ++++++++++++++++---
drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +-
.../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +-
.../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +-
drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 +-
drivers/gpu/drm/imx/imx-drm-core.c | 2 +-
drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +-
drivers/gpu/drm/mcde/mcde_drv.c | 2 +-
drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +-
drivers/gpu/drm/meson/meson_drv.c | 2 +-
drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +-
drivers/gpu/drm/pl111/pl111_drv.c | 2 +-
drivers/gpu/drm/qxl/qxl_drv.c | 2 +-
drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +-
drivers/gpu/drm/sti/sti_drv.c | 2 +-
drivers/gpu/drm/stm/drv.c | 2 +-
drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +-
drivers/gpu/drm/tidss/tidss_drv.c | 2 +-
drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +-
drivers/gpu/drm/tiny/arcpgu.c | 2 +-
drivers/gpu/drm/tiny/bochs.c | 2 +-
drivers/gpu/drm/tiny/cirrus.c | 2 +-
drivers/gpu/drm/tiny/simpledrm.c | 2 +-
drivers/gpu/drm/tve200/tve200_drv.c | 2 +-
drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +-
drivers/gpu/drm/vc4/vc4_drv.c | 2 +-
drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +-
drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 +-
include/drm/drm_fb_helper.h | 22 ++++++++++++++++
36 files changed, 80 insertions(+), 39 deletions(-)
--
2.35.1
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 1/3] drm: Remove superfluous arg when calling to drm_fbdev_generic_setup() 2022-05-02 8:48 [PATCH 0/3] drm: Allow simpledrm to setup its emulated FB as firmware provided Javier Martinez Canillas @ 2022-05-02 8:48 ` Javier Martinez Canillas 2022-05-02 8:48 ` [PATCH 2/3] drm/fb-helper: Rename preferred_bpp drm_fbdev_generic_setup() parameter Javier Martinez Canillas ` (2 subsequent siblings) 3 siblings, 0 replies; 8+ messages in thread From: Javier Martinez Canillas @ 2022-05-02 8:48 UTC (permalink / raw) To: linux-kernel Cc: Thomas Zimmermann, Javier Martinez Canillas, Chen Feng, Chen-Yu Tsai, Daniel Vetter, Dave Airlie, David Airlie, Gerd Hoffmann, John Stultz, Lucas De Marchi, Nirmoy Das, Noralf Trønnes, Tian Tao, Xinliang Liu, Xinwei Kong, dri-devel, virtualization The drm_fbdev_generic_setup() function already sets the preferred bits per pixel for the device to dev->mode_config.preferred_depth, if preferred_bpp value is zero. Passing the same value to the function is unnecessary. Let's cleanup that in the two drivers that do it. Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> --- drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- drivers/gpu/drm/tiny/cirrus.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index fe4269c5aa0a..ace92459e462 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c @@ -349,7 +349,7 @@ static int hibmc_pci_probe(struct pci_dev *pdev, goto err_unload; } - drm_fbdev_generic_setup(dev, dev->mode_config.preferred_depth); + drm_fbdev_generic_setup(dev, 0); return 0; diff --git a/drivers/gpu/drm/tiny/cirrus.c b/drivers/gpu/drm/tiny/cirrus.c index c8e791840862..ed5a2e14894a 100644 --- a/drivers/gpu/drm/tiny/cirrus.c +++ b/drivers/gpu/drm/tiny/cirrus.c @@ -601,7 +601,7 @@ static int cirrus_pci_probe(struct pci_dev *pdev, if (ret) return ret; - drm_fbdev_generic_setup(dev, dev->mode_config.preferred_depth); + drm_fbdev_generic_setup(dev, 0); return 0; } -- 2.35.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 2/3] drm/fb-helper: Rename preferred_bpp drm_fbdev_generic_setup() parameter 2022-05-02 8:48 [PATCH 0/3] drm: Allow simpledrm to setup its emulated FB as firmware provided Javier Martinez Canillas 2022-05-02 8:48 ` [PATCH 1/3] drm: Remove superfluous arg when calling to drm_fbdev_generic_setup() Javier Martinez Canillas @ 2022-05-02 8:48 ` Javier Martinez Canillas 2022-05-02 11:34 ` Laurent Pinchart 2022-05-02 8:52 ` [PATCH 3/3] drm: Allow simpledrm to setup its emulated FB as firmware provided Javier Martinez Canillas 2022-05-02 10:35 ` [PATCH 0/3] " Thomas Zimmermann 3 siblings, 1 reply; 8+ messages in thread From: Javier Martinez Canillas @ 2022-05-02 8:48 UTC (permalink / raw) To: linux-kernel Cc: Thomas Zimmermann, Javier Martinez Canillas, Alain Volmat, Alex Deucher, Alexandre Belloni, Alexandre Torgue, Alexey Brodkin, Alison Wang, Andrew Jeffery, Andrey Grodzovsky, Boris Brezillon, Brian Starkey, Chen Feng, Chen-Yu Tsai, Chia-I Wu, Christian König, Chun-Kuang Hu, Claudiu Beznea, Daniel Vetter, Dave Airlie, David Airlie, Emma Anholt, Evan Quan, Fabio Estevam, Gerd Hoffmann, Greg Kroah-Hartman, Gurchetan Singh, Hans de Goede, Hao Fang, Hyun Kwon, Jernej Skrabec, Jerome Brunet, Joel Stanley, John Stultz, Jyri Sarha, Kevin Hilman, Kieran Bingham, Laurent Pinchart, Laurentiu Palcu, Linus Walleij, Liviu Dudau, Lucas Stach, Maarten Lankhorst, Marek Vasut, Mario Limonciello, Martin Blumenstingl, Matthias Brugger, Maxime Coquelin, Maxime Ripard, Michal Simek, NXP Linux Team, Neil Armstrong, Nicolas Ferre, Pan, Xinhui, Paul Cercueil, Pengutronix Kernel Team, Philipp Zabel, Philippe Cornu, Raphael Gallais-Pou, Sam Ravnborg, Samuel Holland, Sascha Hauer, Shawn Guo, Solomon Chiu, Stefan Agner, Tian Tao, Tomi Valkeinen, Xinliang Liu, Xinwei Kong, Yannick Fertre, Yong Wu, amd-gfx, dri-devel, linux-amlogic, linux-arm-kernel, linux-aspeed, linux-mediatek, linux-mips, linux-renesas-soc, linux-stm32, linux-sunxi, spice-devel, virtualization By default the bits per pixel for the emulated framebuffer device is set to dev->mode_config.preferred_depth, but some devices need another value. Since this second parameter is only used by a few drivers, and to allow drivers to use it for passing other configurations when registering the fbdev, rename @preferred_bpp to @options and make it a multi-field param. The DRM_FB_SET_OPTION() and DRM_FB_GET_OPTION() macros are provided for drivers to set and get an option respectively. For now, only DRM_FB_BPP option exists but other options would be added later. Suggested-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> --- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ++++-- drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 2 +- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/ast/ast_drv.c | 2 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/drm_drv.c | 2 +- drivers/gpu/drm/drm_fb_helper.c | 16 ++++++++++++---- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 +- drivers/gpu/drm/imx/imx-drm-core.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- drivers/gpu/drm/mcde/mcde_drv.c | 2 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.c | 2 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- drivers/gpu/drm/sti/sti_drv.c | 2 +- drivers/gpu/drm/stm/drv.c | 2 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- drivers/gpu/drm/tidss/tidss_drv.c | 2 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- drivers/gpu/drm/tiny/arcpgu.c | 2 +- drivers/gpu/drm/tiny/bochs.c | 2 +- drivers/gpu/drm/tve200/tve200_drv.c | 2 +- drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +- drivers/gpu/drm/vc4/vc4_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 +- include/drm/drm_fb_helper.h | 12 ++++++++++++ 33 files changed, 58 insertions(+), 36 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index b03663f42cc9..f5fae3838cdc 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c @@ -2118,9 +2118,11 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, !list_empty(&adev_to_drm(adev)->mode_config.connector_list)) { /* select 8 bpp console on low vram cards */ if (adev->gmc.real_vram_size <= (32*1024*1024)) - drm_fbdev_generic_setup(adev_to_drm(adev), 8); + drm_fbdev_generic_setup(adev_to_drm(adev), + DRM_FB_SET_OPTION(DRM_FB_BPP, 8)); else - drm_fbdev_generic_setup(adev_to_drm(adev), 32); + drm_fbdev_generic_setup(adev_to_drm(adev), + DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); } ret = amdgpu_debugfs_init(adev); diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index e89ae0ec60eb..636b0e989398 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c @@ -321,7 +321,7 @@ static int hdlcd_drm_bind(struct device *dev) if (ret) goto err_register; - drm_fbdev_generic_setup(drm, 32); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c index d5aef21426cf..8f7c4f3136d5 100644 --- a/drivers/gpu/drm/arm/malidp_drv.c +++ b/drivers/gpu/drm/arm/malidp_drv.c @@ -863,7 +863,7 @@ static int malidp_bind(struct device *dev) if (ret) goto register_fail; - drm_fbdev_generic_setup(drm, 32); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c index 7780b72de9e8..c16837fd1f8d 100644 --- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c @@ -343,7 +343,7 @@ static int aspeed_gfx_probe(struct platform_device *pdev) if (ret) goto err_unload; - drm_fbdev_generic_setup(&priv->drm, 32); + drm_fbdev_generic_setup(&priv->drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; err_unload: diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c index 7465c4f0156a..813e9af00983 100644 --- a/drivers/gpu/drm/ast/ast_drv.c +++ b/drivers/gpu/drm/ast/ast_drv.c @@ -126,7 +126,7 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) return ret; - drm_fbdev_generic_setup(dev, 32); + drm_fbdev_generic_setup(dev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; } diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 651e3c109360..e18dcd16ff8a 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c @@ -760,7 +760,7 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev) if (ret) goto err_unload; - drm_fbdev_generic_setup(ddev, 24); + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 24)); return 0; diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c index 8214a0b1ab7f..6695937945a5 100644 --- a/drivers/gpu/drm/drm_drv.c +++ b/drivers/gpu/drm/drm_drv.c @@ -324,7 +324,7 @@ void drm_minor_release(struct drm_minor *minor) * if (ret) * return ret; * - * drm_fbdev_generic_setup(drm, 32); + * drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); * * return 0; * } diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index d265a73313c9..f626947bb9b9 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -2501,8 +2501,16 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = { /** * drm_fbdev_generic_setup() - Setup generic fbdev emulation * @dev: DRM device - * @preferred_bpp: Preferred bits per pixel for the device. - * @dev->mode_config.preferred_depth is used if this is zero. + * @options: options for the registered framebuffer. + * + * The @options parameter is a multi-field parameter that can contain + * different options for the emulated framebuffer device registered. + * + * The options must be set using DRM_FB_SET_OPTION() and obtained using + * DRM_FB_GET_OPTION(). The options field are the following: + * + * * DRM_FB_BPP: bits per pixel for the device. If the field is not set, + * @dev->mode_config.preferred_depth is used instead. * * This function sets up generic fbdev emulation for drivers that supports * dumb buffers with a virtual address and that can be mmap'ed. @@ -2525,10 +2533,10 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = { * * The fbdev is destroyed by drm_dev_unregister(). */ -void drm_fbdev_generic_setup(struct drm_device *dev, - unsigned int preferred_bpp) +void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int options) { struct drm_fb_helper *fb_helper; + unsigned int preferred_bpp = DRM_FB_GET_OPTION(DRM_FB_BPP, options); int ret; drm_WARN(dev, !dev->registered, "Device has not been registered.\n"); diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 7a503bf08d0f..7bd8129388f2 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c @@ -334,7 +334,7 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev) if (ret < 0) goto put; - drm_fbdev_generic_setup(drm, legacyfb_depth); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, legacyfb_depth)); return 0; diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c index 2af51df6dca7..90aa59b77d31 100644 --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c @@ -237,7 +237,7 @@ static int kirin_drm_bind(struct device *dev) if (ret) goto err_kms_cleanup; - drm_fbdev_generic_setup(drm_dev, 32); + drm_fbdev_generic_setup(drm_dev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/imx/dcss/dcss-kms.c b/drivers/gpu/drm/imx/dcss/dcss-kms.c index 9b84df34a6a1..a4736ae85881 100644 --- a/drivers/gpu/drm/imx/dcss/dcss-kms.c +++ b/drivers/gpu/drm/imx/dcss/dcss-kms.c @@ -148,7 +148,7 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss) if (ret) goto cleanup_crtc; - drm_fbdev_generic_setup(drm, 32); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return kms; diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c index a57812ec36b1..4151f9b1b645 100644 --- a/drivers/gpu/drm/imx/imx-drm-core.c +++ b/drivers/gpu/drm/imx/imx-drm-core.c @@ -251,7 +251,7 @@ static int imx_drm_bind(struct device *dev) if (ret) goto err_poll_fini; - drm_fbdev_generic_setup(drm, legacyfb_depth); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, legacyfb_depth)); return 0; diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c index 8eb0ad501a7b..9726c901677c 100644 --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c @@ -1388,7 +1388,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) goto err_clk_notifier_unregister; } - drm_fbdev_generic_setup(drm, 32); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c index e601baa87e55..1382a818c66b 100644 --- a/drivers/gpu/drm/mcde/mcde_drv.c +++ b/drivers/gpu/drm/mcde/mcde_drv.c @@ -238,7 +238,7 @@ static int mcde_drm_bind(struct device *dev) if (ret < 0) goto unbind; - drm_fbdev_generic_setup(drm, 32); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c index 247c6ff277ef..146f3f064e3e 100644 --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c @@ -393,7 +393,7 @@ static int mtk_drm_bind(struct device *dev) if (ret < 0) goto err_deinit; - drm_fbdev_generic_setup(drm, 32); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index 1b70938cfd2c..76463b940349 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c @@ -350,7 +350,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) if (ret) goto uninstall_irq; - drm_fbdev_generic_setup(drm, 32); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c index 9d71c55a31c0..5e4c8e15eca7 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c @@ -357,7 +357,7 @@ static int mxsfb_probe(struct platform_device *pdev) if (ret) goto err_unload; - drm_fbdev_generic_setup(drm, 32); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c index 520301b405f1..b9d1762051c8 100644 --- a/drivers/gpu/drm/pl111/pl111_drv.c +++ b/drivers/gpu/drm/pl111/pl111_drv.c @@ -308,7 +308,7 @@ static int pl111_amba_probe(struct amba_device *amba_dev, if (ret < 0) goto dev_put; - drm_fbdev_generic_setup(drm, priv->variant->fb_bpp); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, priv->variant->fb_bpp)); return 0; diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index 1cb6f0c224bb..fb7936bbdea8 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c @@ -122,7 +122,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) goto modeset_cleanup; - drm_fbdev_generic_setup(&qdev->ddev, 32); + drm_fbdev_generic_setup(&qdev->ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; modeset_cleanup: diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c index 957ea97541d5..c2c1523c5c47 100644 --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c @@ -681,7 +681,7 @@ static int rcar_du_probe(struct platform_device *pdev) DRM_INFO("Device %s probed\n", dev_name(&pdev->dev)); - drm_fbdev_generic_setup(&rcdu->ddev, 32); + drm_fbdev_generic_setup(&rcdu->ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c index d858209cf8de..7fa653b28233 100644 --- a/drivers/gpu/drm/sti/sti_drv.c +++ b/drivers/gpu/drm/sti/sti_drv.c @@ -200,7 +200,7 @@ static int sti_bind(struct device *dev) drm_mode_config_reset(ddev); - drm_fbdev_generic_setup(ddev, 32); + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c index 0da7cce2a1a2..36301d93e566 100644 --- a/drivers/gpu/drm/stm/drv.c +++ b/drivers/gpu/drm/stm/drv.c @@ -203,7 +203,7 @@ static int stm_drm_platform_probe(struct platform_device *pdev) if (ret) goto err_put; - drm_fbdev_generic_setup(ddev, 16); + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 16)); return 0; diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c index 275f7e4a03ae..2ec41525fe86 100644 --- a/drivers/gpu/drm/sun4i/sun4i_drv.c +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c @@ -112,7 +112,7 @@ static int sun4i_drv_bind(struct device *dev) if (ret) goto finish_poll; - drm_fbdev_generic_setup(drm, 32); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c index 04cfff89ee51..83bcfdc6d654 100644 --- a/drivers/gpu/drm/tidss/tidss_drv.c +++ b/drivers/gpu/drm/tidss/tidss_drv.c @@ -180,7 +180,7 @@ static int tidss_probe(struct platform_device *pdev) goto err_irq_uninstall; } - drm_fbdev_generic_setup(ddev, 32); + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); dev_dbg(dev, "%s done\n", __func__); diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index eee3c447fbac..e342ea5031c8 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c @@ -384,7 +384,7 @@ static int tilcdc_init(const struct drm_driver *ddrv, struct device *dev) goto init_failed; priv->is_registered = true; - drm_fbdev_generic_setup(ddev, bpp); + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, bpp)); return 0; init_failed: diff --git a/drivers/gpu/drm/tiny/arcpgu.c b/drivers/gpu/drm/tiny/arcpgu.c index f0fa3b15c341..7f291db460e9 100644 --- a/drivers/gpu/drm/tiny/arcpgu.c +++ b/drivers/gpu/drm/tiny/arcpgu.c @@ -392,7 +392,7 @@ static int arcpgu_probe(struct platform_device *pdev) if (ret) goto err_unload; - drm_fbdev_generic_setup(&arcpgu->drm, 16); + drm_fbdev_generic_setup(&arcpgu->drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 16)); return 0; diff --git a/drivers/gpu/drm/tiny/bochs.c b/drivers/gpu/drm/tiny/bochs.c index ed971c8bb446..fc52d9e7d50e 100644 --- a/drivers/gpu/drm/tiny/bochs.c +++ b/drivers/gpu/drm/tiny/bochs.c @@ -663,7 +663,7 @@ static int bochs_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent if (ret) goto err_free_dev; - drm_fbdev_generic_setup(dev, 32); + drm_fbdev_generic_setup(dev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return ret; err_free_dev: diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c index 6d9d2921abf4..737cebb655a0 100644 --- a/drivers/gpu/drm/tve200/tve200_drv.c +++ b/drivers/gpu/drm/tve200/tve200_drv.c @@ -226,7 +226,7 @@ static int tve200_probe(struct platform_device *pdev) * Passing in 16 here will make the RGB565 mode the default * Passing in 32 will use XRGB8888 mode */ - drm_fbdev_generic_setup(drm, 16); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 16)); return 0; diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c index f4f2bd79a7cb..fbe1f7368d53 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c @@ -79,7 +79,7 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) if (ret) goto err_irq_fini; - drm_fbdev_generic_setup(&vbox->ddev, 32); + drm_fbdev_generic_setup(&vbox->ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index 162bc18e7497..ecd2b41b87b3 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c @@ -291,7 +291,7 @@ static int vc4_drm_bind(struct device *dev) if (ret < 0) goto unbind_all; - drm_fbdev_generic_setup(drm, 16); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 16)); return 0; diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c index 5f25a8d15464..ef1e1b6e8cac 100644 --- a/drivers/gpu/drm/virtio/virtgpu_drv.c +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c @@ -128,7 +128,7 @@ static int virtio_gpu_probe(struct virtio_device *vdev) if (ret) goto err_deinit; - drm_fbdev_generic_setup(vdev->priv, 32); + drm_fbdev_generic_setup(vdev->priv, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); return 0; err_deinit: diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c index 824b510e337b..2937e72d9fac 100644 --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c @@ -135,7 +135,7 @@ static int zynqmp_dpsub_drm_init(struct zynqmp_dpsub *dpsub) goto err_poll_fini; /* Initialize fbdev generic emulation. */ - drm_fbdev_generic_setup(drm, 24); + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 24)); return 0; diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 3af4624368d8..1da3ef76f499 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -35,6 +35,7 @@ struct drm_fb_helper; #include <drm/drm_client.h> #include <drm/drm_crtc.h> #include <drm/drm_device.h> +#include <linux/bitfield.h> #include <linux/kgdb.h> enum mode_set_atomic { @@ -42,6 +43,17 @@ enum mode_set_atomic { ENTER_ATOMIC_MODE_SET, }; +#define DRM_FB_BPP_MASK GENMASK(7, 0) + +/* Using the GNU statement expression extension */ +#define DRM_FB_SET_OPTION(option, value) \ + ({ \ + WARN_ON(!FIELD_FIT(option##_MASK, value)); \ + FIELD_PREP(option##_MASK, value); \ + }) + +#define DRM_FB_GET_OPTION(option, word) FIELD_GET(option##_MASK, word) + /** * struct drm_fb_helper_surface_size - describes fbdev size and scanout surface size * @fb_width: fbdev width -- 2.35.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] drm/fb-helper: Rename preferred_bpp drm_fbdev_generic_setup() parameter 2022-05-02 8:48 ` [PATCH 2/3] drm/fb-helper: Rename preferred_bpp drm_fbdev_generic_setup() parameter Javier Martinez Canillas @ 2022-05-02 11:34 ` Laurent Pinchart 2022-05-02 13:28 ` Javier Martinez Canillas 0 siblings, 1 reply; 8+ messages in thread From: Laurent Pinchart @ 2022-05-02 11:34 UTC (permalink / raw) To: Javier Martinez Canillas Cc: linux-kernel, Thomas Zimmermann, Alain Volmat, Alex Deucher, Alexandre Belloni, Alexandre Torgue, Alexey Brodkin, Alison Wang, Andrew Jeffery, Andrey Grodzovsky, Boris Brezillon, Brian Starkey, Chen Feng, Chen-Yu Tsai, Chia-I Wu, Christian König, Chun-Kuang Hu, Claudiu Beznea, Daniel Vetter, Dave Airlie, David Airlie, Emma Anholt, Evan Quan, Fabio Estevam, Gerd Hoffmann, Greg Kroah-Hartman, Gurchetan Singh, Hans de Goede, Hao Fang, Hyun Kwon, Jernej Skrabec, Jerome Brunet, Joel Stanley, John Stultz, Jyri Sarha, Kevin Hilman, Kieran Bingham, Laurentiu Palcu, Linus Walleij, Liviu Dudau, Lucas Stach, Maarten Lankhorst, Marek Vasut, Mario Limonciello, Martin Blumenstingl, Matthias Brugger, Maxime Coquelin, Maxime Ripard, Michal Simek, NXP Linux Team, Neil Armstrong, Nicolas Ferre, Pan, Xinhui, Paul Cercueil, Pengutronix Kernel Team, Philipp Zabel, Philippe Cornu, Raphael Gallais-Pou, Sam Ravnborg, Samuel Holland, Sascha Hauer, Shawn Guo, Solomon Chiu, Stefan Agner, Tian Tao, Tomi Valkeinen, Xinliang Liu, Xinwei Kong, Yannick Fertre, Yong Wu, amd-gfx, dri-devel, linux-amlogic, linux-arm-kernel, linux-aspeed, linux-mediatek, linux-mips, linux-renesas-soc, linux-stm32, linux-sunxi, spice-devel, virtualization Hi Javier, Thank you for the patch. On Mon, May 02, 2022 at 10:48:29AM +0200, Javier Martinez Canillas wrote: > By default the bits per pixel for the emulated framebuffer device is set > to dev->mode_config.preferred_depth, but some devices need another value. > > Since this second parameter is only used by a few drivers, and to allow > drivers to use it for passing other configurations when registering the > fbdev, rename @preferred_bpp to @options and make it a multi-field param. > > The DRM_FB_SET_OPTION() and DRM_FB_GET_OPTION() macros are provided for > drivers to set and get an option respectively. For now, only DRM_FB_BPP > option exists but other options would be added later. > > Suggested-by: Thomas Zimmermann <tzimmermann@suse.de> > Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> > --- > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 ++++-- > drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- > drivers/gpu/drm/arm/malidp_drv.c | 2 +- > drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- > drivers/gpu/drm/ast/ast_drv.c | 2 +- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- > drivers/gpu/drm/drm_drv.c | 2 +- > drivers/gpu/drm/drm_fb_helper.c | 16 ++++++++++++---- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- > drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- > drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 +- > drivers/gpu/drm/imx/imx-drm-core.c | 2 +- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- > drivers/gpu/drm/mcde/mcde_drv.c | 2 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- > drivers/gpu/drm/meson/meson_drv.c | 2 +- > drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- > drivers/gpu/drm/pl111/pl111_drv.c | 2 +- > drivers/gpu/drm/qxl/qxl_drv.c | 2 +- > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- > drivers/gpu/drm/sti/sti_drv.c | 2 +- > drivers/gpu/drm/stm/drv.c | 2 +- > drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- > drivers/gpu/drm/tidss/tidss_drv.c | 2 +- > drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- > drivers/gpu/drm/tiny/arcpgu.c | 2 +- > drivers/gpu/drm/tiny/bochs.c | 2 +- > drivers/gpu/drm/tve200/tve200_drv.c | 2 +- > drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +- > drivers/gpu/drm/vc4/vc4_drv.c | 2 +- > drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- > drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 +- > include/drm/drm_fb_helper.h | 12 ++++++++++++ > 33 files changed, 58 insertions(+), 36 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > index b03663f42cc9..f5fae3838cdc 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c > @@ -2118,9 +2118,11 @@ static int amdgpu_pci_probe(struct pci_dev *pdev, > !list_empty(&adev_to_drm(adev)->mode_config.connector_list)) { > /* select 8 bpp console on low vram cards */ > if (adev->gmc.real_vram_size <= (32*1024*1024)) > - drm_fbdev_generic_setup(adev_to_drm(adev), 8); > + drm_fbdev_generic_setup(adev_to_drm(adev), > + DRM_FB_SET_OPTION(DRM_FB_BPP, 8)); > else > - drm_fbdev_generic_setup(adev_to_drm(adev), 32); > + drm_fbdev_generic_setup(adev_to_drm(adev), > + DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > } > > ret = amdgpu_debugfs_init(adev); > diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c > index e89ae0ec60eb..636b0e989398 100644 > --- a/drivers/gpu/drm/arm/hdlcd_drv.c > +++ b/drivers/gpu/drm/arm/hdlcd_drv.c > @@ -321,7 +321,7 @@ static int hdlcd_drm_bind(struct device *dev) > if (ret) > goto err_register; > > - drm_fbdev_generic_setup(drm, 32); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/arm/malidp_drv.c b/drivers/gpu/drm/arm/malidp_drv.c > index d5aef21426cf..8f7c4f3136d5 100644 > --- a/drivers/gpu/drm/arm/malidp_drv.c > +++ b/drivers/gpu/drm/arm/malidp_drv.c > @@ -863,7 +863,7 @@ static int malidp_bind(struct device *dev) > if (ret) > goto register_fail; > > - drm_fbdev_generic_setup(drm, 32); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c > index 7780b72de9e8..c16837fd1f8d 100644 > --- a/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c > +++ b/drivers/gpu/drm/aspeed/aspeed_gfx_drv.c > @@ -343,7 +343,7 @@ static int aspeed_gfx_probe(struct platform_device *pdev) > if (ret) > goto err_unload; > > - drm_fbdev_generic_setup(&priv->drm, 32); > + drm_fbdev_generic_setup(&priv->drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > return 0; > > err_unload: > diff --git a/drivers/gpu/drm/ast/ast_drv.c b/drivers/gpu/drm/ast/ast_drv.c > index 7465c4f0156a..813e9af00983 100644 > --- a/drivers/gpu/drm/ast/ast_drv.c > +++ b/drivers/gpu/drm/ast/ast_drv.c > @@ -126,7 +126,7 @@ static int ast_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > if (ret) > return ret; > > - drm_fbdev_generic_setup(dev, 32); > + drm_fbdev_generic_setup(dev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > } > diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > index 651e3c109360..e18dcd16ff8a 100644 > --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c > @@ -760,7 +760,7 @@ static int atmel_hlcdc_dc_drm_probe(struct platform_device *pdev) > if (ret) > goto err_unload; > > - drm_fbdev_generic_setup(ddev, 24); > + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 24)); > > return 0; > > diff --git a/drivers/gpu/drm/drm_drv.c b/drivers/gpu/drm/drm_drv.c > index 8214a0b1ab7f..6695937945a5 100644 > --- a/drivers/gpu/drm/drm_drv.c > +++ b/drivers/gpu/drm/drm_drv.c > @@ -324,7 +324,7 @@ void drm_minor_release(struct drm_minor *minor) > * if (ret) > * return ret; > * > - * drm_fbdev_generic_setup(drm, 32); > + * drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > * > * return 0; > * } > diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c > index d265a73313c9..f626947bb9b9 100644 > --- a/drivers/gpu/drm/drm_fb_helper.c > +++ b/drivers/gpu/drm/drm_fb_helper.c > @@ -2501,8 +2501,16 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = { > /** > * drm_fbdev_generic_setup() - Setup generic fbdev emulation > * @dev: DRM device > - * @preferred_bpp: Preferred bits per pixel for the device. > - * @dev->mode_config.preferred_depth is used if this is zero. > + * @options: options for the registered framebuffer. > + * > + * The @options parameter is a multi-field parameter that can contain > + * different options for the emulated framebuffer device registered. > + * > + * The options must be set using DRM_FB_SET_OPTION() and obtained using > + * DRM_FB_GET_OPTION(). The options field are the following: > + * > + * * DRM_FB_BPP: bits per pixel for the device. If the field is not set, > + * @dev->mode_config.preferred_depth is used instead. Do I assume correctly that a driver that would need to set multiple options would do something like drm_fbdev_generic_setup(dev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32) | DRM_FB_SET_OPTION(DRM_FB_FW, 1)); ? If so, I would rename DRM_FB_SET_OPTION() to DRM_FB_OPTION() as it's computing the value of the option bitfield, it doesn't actually set it. Apart from that, Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > * > * This function sets up generic fbdev emulation for drivers that supports > * dumb buffers with a virtual address and that can be mmap'ed. > @@ -2525,10 +2533,10 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = { > * > * The fbdev is destroyed by drm_dev_unregister(). > */ > -void drm_fbdev_generic_setup(struct drm_device *dev, > - unsigned int preferred_bpp) > +void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int options) > { > struct drm_fb_helper *fb_helper; > + unsigned int preferred_bpp = DRM_FB_GET_OPTION(DRM_FB_BPP, options); > int ret; > > drm_WARN(dev, !dev->registered, "Device has not been registered.\n"); > diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > index 7a503bf08d0f..7bd8129388f2 100644 > --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c > @@ -334,7 +334,7 @@ static int fsl_dcu_drm_probe(struct platform_device *pdev) > if (ret < 0) > goto put; > > - drm_fbdev_generic_setup(drm, legacyfb_depth); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, legacyfb_depth)); > > return 0; > > diff --git a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c > index 2af51df6dca7..90aa59b77d31 100644 > --- a/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c > +++ b/drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c > @@ -237,7 +237,7 @@ static int kirin_drm_bind(struct device *dev) > if (ret) > goto err_kms_cleanup; > > - drm_fbdev_generic_setup(drm_dev, 32); > + drm_fbdev_generic_setup(drm_dev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/imx/dcss/dcss-kms.c b/drivers/gpu/drm/imx/dcss/dcss-kms.c > index 9b84df34a6a1..a4736ae85881 100644 > --- a/drivers/gpu/drm/imx/dcss/dcss-kms.c > +++ b/drivers/gpu/drm/imx/dcss/dcss-kms.c > @@ -148,7 +148,7 @@ struct dcss_kms_dev *dcss_kms_attach(struct dcss_dev *dcss) > if (ret) > goto cleanup_crtc; > > - drm_fbdev_generic_setup(drm, 32); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return kms; > > diff --git a/drivers/gpu/drm/imx/imx-drm-core.c b/drivers/gpu/drm/imx/imx-drm-core.c > index a57812ec36b1..4151f9b1b645 100644 > --- a/drivers/gpu/drm/imx/imx-drm-core.c > +++ b/drivers/gpu/drm/imx/imx-drm-core.c > @@ -251,7 +251,7 @@ static int imx_drm_bind(struct device *dev) > if (ret) > goto err_poll_fini; > > - drm_fbdev_generic_setup(drm, legacyfb_depth); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, legacyfb_depth)); > > return 0; > > diff --git a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > index 8eb0ad501a7b..9726c901677c 100644 > --- a/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > +++ b/drivers/gpu/drm/ingenic/ingenic-drm-drv.c > @@ -1388,7 +1388,7 @@ static int ingenic_drm_bind(struct device *dev, bool has_components) > goto err_clk_notifier_unregister; > } > > - drm_fbdev_generic_setup(drm, 32); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/mcde/mcde_drv.c b/drivers/gpu/drm/mcde/mcde_drv.c > index e601baa87e55..1382a818c66b 100644 > --- a/drivers/gpu/drm/mcde/mcde_drv.c > +++ b/drivers/gpu/drm/mcde/mcde_drv.c > @@ -238,7 +238,7 @@ static int mcde_drm_bind(struct device *dev) > if (ret < 0) > goto unbind; > > - drm_fbdev_generic_setup(drm, 32); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/mediatek/mtk_drm_drv.c b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > index 247c6ff277ef..146f3f064e3e 100644 > --- a/drivers/gpu/drm/mediatek/mtk_drm_drv.c > +++ b/drivers/gpu/drm/mediatek/mtk_drm_drv.c > @@ -393,7 +393,7 @@ static int mtk_drm_bind(struct device *dev) > if (ret < 0) > goto err_deinit; > > - drm_fbdev_generic_setup(drm, 32); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c > index 1b70938cfd2c..76463b940349 100644 > --- a/drivers/gpu/drm/meson/meson_drv.c > +++ b/drivers/gpu/drm/meson/meson_drv.c > @@ -350,7 +350,7 @@ static int meson_drv_bind_master(struct device *dev, bool has_components) > if (ret) > goto uninstall_irq; > > - drm_fbdev_generic_setup(drm, 32); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c > index 9d71c55a31c0..5e4c8e15eca7 100644 > --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c > +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c > @@ -357,7 +357,7 @@ static int mxsfb_probe(struct platform_device *pdev) > if (ret) > goto err_unload; > > - drm_fbdev_generic_setup(drm, 32); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/pl111/pl111_drv.c b/drivers/gpu/drm/pl111/pl111_drv.c > index 520301b405f1..b9d1762051c8 100644 > --- a/drivers/gpu/drm/pl111/pl111_drv.c > +++ b/drivers/gpu/drm/pl111/pl111_drv.c > @@ -308,7 +308,7 @@ static int pl111_amba_probe(struct amba_device *amba_dev, > if (ret < 0) > goto dev_put; > > - drm_fbdev_generic_setup(drm, priv->variant->fb_bpp); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, priv->variant->fb_bpp)); > > return 0; > > diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c > index 1cb6f0c224bb..fb7936bbdea8 100644 > --- a/drivers/gpu/drm/qxl/qxl_drv.c > +++ b/drivers/gpu/drm/qxl/qxl_drv.c > @@ -122,7 +122,7 @@ qxl_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > if (ret) > goto modeset_cleanup; > > - drm_fbdev_generic_setup(&qdev->ddev, 32); > + drm_fbdev_generic_setup(&qdev->ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > return 0; > > modeset_cleanup: > diff --git a/drivers/gpu/drm/rcar-du/rcar_du_drv.c b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > index 957ea97541d5..c2c1523c5c47 100644 > --- a/drivers/gpu/drm/rcar-du/rcar_du_drv.c > +++ b/drivers/gpu/drm/rcar-du/rcar_du_drv.c > @@ -681,7 +681,7 @@ static int rcar_du_probe(struct platform_device *pdev) > > DRM_INFO("Device %s probed\n", dev_name(&pdev->dev)); > > - drm_fbdev_generic_setup(&rcdu->ddev, 32); > + drm_fbdev_generic_setup(&rcdu->ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/sti/sti_drv.c b/drivers/gpu/drm/sti/sti_drv.c > index d858209cf8de..7fa653b28233 100644 > --- a/drivers/gpu/drm/sti/sti_drv.c > +++ b/drivers/gpu/drm/sti/sti_drv.c > @@ -200,7 +200,7 @@ static int sti_bind(struct device *dev) > > drm_mode_config_reset(ddev); > > - drm_fbdev_generic_setup(ddev, 32); > + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/stm/drv.c b/drivers/gpu/drm/stm/drv.c > index 0da7cce2a1a2..36301d93e566 100644 > --- a/drivers/gpu/drm/stm/drv.c > +++ b/drivers/gpu/drm/stm/drv.c > @@ -203,7 +203,7 @@ static int stm_drm_platform_probe(struct platform_device *pdev) > if (ret) > goto err_put; > > - drm_fbdev_generic_setup(ddev, 16); > + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 16)); > > return 0; > > diff --git a/drivers/gpu/drm/sun4i/sun4i_drv.c b/drivers/gpu/drm/sun4i/sun4i_drv.c > index 275f7e4a03ae..2ec41525fe86 100644 > --- a/drivers/gpu/drm/sun4i/sun4i_drv.c > +++ b/drivers/gpu/drm/sun4i/sun4i_drv.c > @@ -112,7 +112,7 @@ static int sun4i_drv_bind(struct device *dev) > if (ret) > goto finish_poll; > > - drm_fbdev_generic_setup(drm, 32); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/tidss/tidss_drv.c b/drivers/gpu/drm/tidss/tidss_drv.c > index 04cfff89ee51..83bcfdc6d654 100644 > --- a/drivers/gpu/drm/tidss/tidss_drv.c > +++ b/drivers/gpu/drm/tidss/tidss_drv.c > @@ -180,7 +180,7 @@ static int tidss_probe(struct platform_device *pdev) > goto err_irq_uninstall; > } > > - drm_fbdev_generic_setup(ddev, 32); > + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > dev_dbg(dev, "%s done\n", __func__); > > diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c > index eee3c447fbac..e342ea5031c8 100644 > --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c > +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c > @@ -384,7 +384,7 @@ static int tilcdc_init(const struct drm_driver *ddrv, struct device *dev) > goto init_failed; > priv->is_registered = true; > > - drm_fbdev_generic_setup(ddev, bpp); > + drm_fbdev_generic_setup(ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, bpp)); > return 0; > > init_failed: > diff --git a/drivers/gpu/drm/tiny/arcpgu.c b/drivers/gpu/drm/tiny/arcpgu.c > index f0fa3b15c341..7f291db460e9 100644 > --- a/drivers/gpu/drm/tiny/arcpgu.c > +++ b/drivers/gpu/drm/tiny/arcpgu.c > @@ -392,7 +392,7 @@ static int arcpgu_probe(struct platform_device *pdev) > if (ret) > goto err_unload; > > - drm_fbdev_generic_setup(&arcpgu->drm, 16); > + drm_fbdev_generic_setup(&arcpgu->drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 16)); > > return 0; > > diff --git a/drivers/gpu/drm/tiny/bochs.c b/drivers/gpu/drm/tiny/bochs.c > index ed971c8bb446..fc52d9e7d50e 100644 > --- a/drivers/gpu/drm/tiny/bochs.c > +++ b/drivers/gpu/drm/tiny/bochs.c > @@ -663,7 +663,7 @@ static int bochs_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent > if (ret) > goto err_free_dev; > > - drm_fbdev_generic_setup(dev, 32); > + drm_fbdev_generic_setup(dev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > return ret; > > err_free_dev: > diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c > index 6d9d2921abf4..737cebb655a0 100644 > --- a/drivers/gpu/drm/tve200/tve200_drv.c > +++ b/drivers/gpu/drm/tve200/tve200_drv.c > @@ -226,7 +226,7 @@ static int tve200_probe(struct platform_device *pdev) > * Passing in 16 here will make the RGB565 mode the default > * Passing in 32 will use XRGB8888 mode > */ > - drm_fbdev_generic_setup(drm, 16); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 16)); > > return 0; > > diff --git a/drivers/gpu/drm/vboxvideo/vbox_drv.c b/drivers/gpu/drm/vboxvideo/vbox_drv.c > index f4f2bd79a7cb..fbe1f7368d53 100644 > --- a/drivers/gpu/drm/vboxvideo/vbox_drv.c > +++ b/drivers/gpu/drm/vboxvideo/vbox_drv.c > @@ -79,7 +79,7 @@ static int vbox_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) > if (ret) > goto err_irq_fini; > > - drm_fbdev_generic_setup(&vbox->ddev, 32); > + drm_fbdev_generic_setup(&vbox->ddev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > > return 0; > > diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c > index 162bc18e7497..ecd2b41b87b3 100644 > --- a/drivers/gpu/drm/vc4/vc4_drv.c > +++ b/drivers/gpu/drm/vc4/vc4_drv.c > @@ -291,7 +291,7 @@ static int vc4_drm_bind(struct device *dev) > if (ret < 0) > goto unbind_all; > > - drm_fbdev_generic_setup(drm, 16); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 16)); > > return 0; > > diff --git a/drivers/gpu/drm/virtio/virtgpu_drv.c b/drivers/gpu/drm/virtio/virtgpu_drv.c > index 5f25a8d15464..ef1e1b6e8cac 100644 > --- a/drivers/gpu/drm/virtio/virtgpu_drv.c > +++ b/drivers/gpu/drm/virtio/virtgpu_drv.c > @@ -128,7 +128,7 @@ static int virtio_gpu_probe(struct virtio_device *vdev) > if (ret) > goto err_deinit; > > - drm_fbdev_generic_setup(vdev->priv, 32); > + drm_fbdev_generic_setup(vdev->priv, DRM_FB_SET_OPTION(DRM_FB_BPP, 32)); > return 0; > > err_deinit: > diff --git a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > index 824b510e337b..2937e72d9fac 100644 > --- a/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > +++ b/drivers/gpu/drm/xlnx/zynqmp_dpsub.c > @@ -135,7 +135,7 @@ static int zynqmp_dpsub_drm_init(struct zynqmp_dpsub *dpsub) > goto err_poll_fini; > > /* Initialize fbdev generic emulation. */ > - drm_fbdev_generic_setup(drm, 24); > + drm_fbdev_generic_setup(drm, DRM_FB_SET_OPTION(DRM_FB_BPP, 24)); > > return 0; > > diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h > index 3af4624368d8..1da3ef76f499 100644 > --- a/include/drm/drm_fb_helper.h > +++ b/include/drm/drm_fb_helper.h > @@ -35,6 +35,7 @@ struct drm_fb_helper; > #include <drm/drm_client.h> > #include <drm/drm_crtc.h> > #include <drm/drm_device.h> > +#include <linux/bitfield.h> > #include <linux/kgdb.h> > > enum mode_set_atomic { > @@ -42,6 +43,17 @@ enum mode_set_atomic { > ENTER_ATOMIC_MODE_SET, > }; > > +#define DRM_FB_BPP_MASK GENMASK(7, 0) > + > +/* Using the GNU statement expression extension */ > +#define DRM_FB_SET_OPTION(option, value) \ > + ({ \ > + WARN_ON(!FIELD_FIT(option##_MASK, value)); \ > + FIELD_PREP(option##_MASK, value); \ > + }) > + > +#define DRM_FB_GET_OPTION(option, word) FIELD_GET(option##_MASK, word) > + > /** > * struct drm_fb_helper_surface_size - describes fbdev size and scanout surface size > * @fb_width: fbdev width -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 2/3] drm/fb-helper: Rename preferred_bpp drm_fbdev_generic_setup() parameter 2022-05-02 11:34 ` Laurent Pinchart @ 2022-05-02 13:28 ` Javier Martinez Canillas 0 siblings, 0 replies; 8+ messages in thread From: Javier Martinez Canillas @ 2022-05-02 13:28 UTC (permalink / raw) To: Laurent Pinchart Cc: Alexandre Belloni, Emma Anholt, Chun-Kuang Hu, David Airlie, Laurentiu Palcu, Liviu Dudau, Alexandre Torgue, Gurchetan Singh, Paul Cercueil, Gerd Hoffmann, Shawn Guo, linux-stm32, Jerome Brunet, Marek Vasut, Hao Fang, linux-aspeed, Samuel Holland, Kevin Hilman, Neil Armstrong, Alexey Brodkin, Michal Simek, Jernej Skrabec, Xinliang Liu, Chen-Yu Tsai, Joel Stanley, Dave Airlie, Xinwei Kong, virtualization, NXP Linux Team, Thomas Zimmermann, Raphael Gallais-Pou, Martin Blumenstingl, Chen Feng, Sascha Hauer, Alison Wang, linux-mips, Sam Ravnborg, Hans de Goede, linux-mediatek, dri-devel, Alain Volmat, Matthias Brugger, linux-amlogic, Mario Limonciello, Evan Quan, Pengutronix Kernel Team, Yong Wu, linux-arm-kernel, Maxime Coquelin, linux-sunxi, amd-gfx, Tomi Valkeinen, Hyun Kwon, Boris Brezillon, Andrew Jeffery, Greg Kroah-Hartman, Yannick Fertre, Pan, Xinhui, linux-kernel, Claudiu Beznea, linux-renesas-soc, Solomon Chiu, Kieran Bingham, Philippe Cornu, Nicolas Ferre, Alex Deucher, Tian Tao, spice-devel, Jyri Sarha, Christian König Hello Laurent, On 5/2/22 13:34, Laurent Pinchart wrote: > Hi Javier, > > Thank you for the patch. > Thanks a lot for your feedback. [snip] >> +++ b/drivers/gpu/drm/drm_fb_helper.c >> @@ -2501,8 +2501,16 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = { >> /** >> * drm_fbdev_generic_setup() - Setup generic fbdev emulation >> * @dev: DRM device >> - * @preferred_bpp: Preferred bits per pixel for the device. >> - * @dev->mode_config.preferred_depth is used if this is zero. >> + * @options: options for the registered framebuffer. >> + * >> + * The @options parameter is a multi-field parameter that can contain >> + * different options for the emulated framebuffer device registered. >> + * >> + * The options must be set using DRM_FB_SET_OPTION() and obtained using >> + * DRM_FB_GET_OPTION(). The options field are the following: >> + * >> + * * DRM_FB_BPP: bits per pixel for the device. If the field is not set, >> + * @dev->mode_config.preferred_depth is used instead. > > Do I assume correctly that a driver that would need to set multiple > options would do something like > > drm_fbdev_generic_setup(dev, DRM_FB_SET_OPTION(DRM_FB_BPP, 32) | > DRM_FB_SET_OPTION(DRM_FB_FW, 1)); > That's correct, yes. > ? If so, I would rename DRM_FB_SET_OPTION() to DRM_FB_OPTION() as it's > computing the value of the option bitfield, it doesn't actually set it. > Apart from that, > Right. I'll rename it. > Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > Thanks! -- Best regards, Javier Martinez Canillas Linux Engineering Red Hat ^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/3] drm: Allow simpledrm to setup its emulated FB as firmware provided 2022-05-02 8:48 [PATCH 0/3] drm: Allow simpledrm to setup its emulated FB as firmware provided Javier Martinez Canillas 2022-05-02 8:48 ` [PATCH 1/3] drm: Remove superfluous arg when calling to drm_fbdev_generic_setup() Javier Martinez Canillas 2022-05-02 8:48 ` [PATCH 2/3] drm/fb-helper: Rename preferred_bpp drm_fbdev_generic_setup() parameter Javier Martinez Canillas @ 2022-05-02 8:52 ` Javier Martinez Canillas 2022-05-02 10:35 ` [PATCH 0/3] " Thomas Zimmermann 3 siblings, 0 replies; 8+ messages in thread From: Javier Martinez Canillas @ 2022-05-02 8:52 UTC (permalink / raw) To: linux-kernel Cc: dri-devel, linux-fbdev, Daniel Vetter, Thomas Zimmermann, Javier Martinez Canillas Indicate to fbdev subsystem that the registered framebuffer is provided by the system firmware, so that it can handle accordingly. For example, would unregister the FB devices if asked to remove the conflicting framebuffers. Add a new DRM_FB_FW field to drm_fbdev_generic_setup() options parameter. Drivers can use this to indicate the FB helper initialization that the FB registered is provided by the firmware, so it can be configured as such. Suggested-by: Thomas Zimmermann <tzimmermann@suse.de> Signed-off-by: Javier Martinez Canillas <javierm@redhat.com> --- drivers/gpu/drm/drm_fb_helper.c | 9 +++++++++ drivers/gpu/drm/tiny/simpledrm.c | 2 +- include/drm/drm_fb_helper.h | 10 ++++++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c index f626947bb9b9..c2ff986f064d 100644 --- a/drivers/gpu/drm/drm_fb_helper.c +++ b/drivers/gpu/drm/drm_fb_helper.c @@ -1891,6 +1891,10 @@ __drm_fb_helper_initial_config_and_unlock(struct drm_fb_helper *fb_helper, /* don't leak any physical addresses to userspace */ info->flags |= FBINFO_HIDE_SMEM_START; + /* Indicate that the framebuffer is provided by the firmware */ + if (fb_helper->firmware) + info->flags |= FBINFO_MISC_FIRMWARE; + /* Need to drop locks to avoid recursive deadlock in * register_framebuffer. This is ok because the only thing left to do is * register the fbdev emulation instance in kernel_fb_helper_list. */ @@ -2511,6 +2515,8 @@ static const struct drm_client_funcs drm_fbdev_client_funcs = { * * * DRM_FB_BPP: bits per pixel for the device. If the field is not set, * @dev->mode_config.preferred_depth is used instead. + * * DRM_FB_FW: if the framebuffer for the device is provided by the + * system firmware. * * This function sets up generic fbdev emulation for drivers that supports * dumb buffers with a virtual address and that can be mmap'ed. @@ -2537,6 +2543,7 @@ void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int options) { struct drm_fb_helper *fb_helper; unsigned int preferred_bpp = DRM_FB_GET_OPTION(DRM_FB_BPP, options); + bool firmware = DRM_FB_GET_OPTION(DRM_FB_FW, options); int ret; drm_WARN(dev, !dev->registered, "Device has not been registered.\n"); @@ -2569,6 +2576,8 @@ void drm_fbdev_generic_setup(struct drm_device *dev, unsigned int options) preferred_bpp = 32; fb_helper->preferred_bpp = preferred_bpp; + fb_helper->firmware = firmware; + ret = drm_fbdev_client_hotplug(&fb_helper->client); if (ret) drm_dbg_kms(dev, "client hotplug ret=%d\n", ret); diff --git a/drivers/gpu/drm/tiny/simpledrm.c b/drivers/gpu/drm/tiny/simpledrm.c index f5b8e864a5cd..5dcc21ea6180 100644 --- a/drivers/gpu/drm/tiny/simpledrm.c +++ b/drivers/gpu/drm/tiny/simpledrm.c @@ -901,7 +901,7 @@ static int simpledrm_probe(struct platform_device *pdev) if (ret) return ret; - drm_fbdev_generic_setup(dev, 0); + drm_fbdev_generic_setup(dev, DRM_FB_SET_OPTION(DRM_FB_FW, 1)); return 0; } diff --git a/include/drm/drm_fb_helper.h b/include/drm/drm_fb_helper.h index 1da3ef76f499..0eec500e0784 100644 --- a/include/drm/drm_fb_helper.h +++ b/include/drm/drm_fb_helper.h @@ -44,6 +44,7 @@ enum mode_set_atomic { }; #define DRM_FB_BPP_MASK GENMASK(7, 0) +#define DRM_FB_FW_MASK GENMASK(8, 8) /* Using the GNU statement expression extension */ #define DRM_FB_SET_OPTION(option, value) \ @@ -197,6 +198,15 @@ struct drm_fb_helper { * See also: @deferred_setup */ int preferred_bpp; + + /** + * @firmware: + * + * Set if the driver indicates to the FB helper initialization that the + * framebuffer for the device being registered is provided by firmware, + * so that it can pass this on when registering the framebuffer device. + */ + bool firmware; }; static inline struct drm_fb_helper * -- 2.35.1 ^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] drm: Allow simpledrm to setup its emulated FB as firmware provided 2022-05-02 8:48 [PATCH 0/3] drm: Allow simpledrm to setup its emulated FB as firmware provided Javier Martinez Canillas ` (2 preceding siblings ...) 2022-05-02 8:52 ` [PATCH 3/3] drm: Allow simpledrm to setup its emulated FB as firmware provided Javier Martinez Canillas @ 2022-05-02 10:35 ` Thomas Zimmermann 2022-05-02 10:49 ` Javier Martinez Canillas 3 siblings, 1 reply; 8+ messages in thread From: Thomas Zimmermann @ 2022-05-02 10:35 UTC (permalink / raw) To: Javier Martinez Canillas, linux-kernel Cc: Alain Volmat, Alex Deucher, Alexandre Belloni, Alexandre Torgue, Alexey Brodkin, Alison Wang, Andrew Jeffery, Andrey Grodzovsky, Boris Brezillon, Brian Starkey, Chen Feng, Chen-Yu Tsai, Chia-I Wu, Christian König, Chun-Kuang Hu, Claudiu Beznea, Daniel Vetter, Dave Airlie, David Airlie, Emma Anholt, Evan Quan, Fabio Estevam, Gerd Hoffmann, Greg Kroah-Hartman, Gurchetan Singh, Hans de Goede, Hao Fang, Hyun Kwon, Jernej Skrabec, Jerome Brunet, Joel Stanley, John Stultz, Jyri Sarha, Kevin Hilman, Kieran Bingham, Laurent Pinchart, Laurentiu Palcu, Linus Walleij, Liviu Dudau, Lucas De Marchi, Lucas Stach, Maarten Lankhorst, Marek Vasut, Mario Limonciello, Martin Blumenstingl, Matthias Brugger, Maxime Coquelin, Maxime Ripard, Michal Simek, NXP Linux Team, Neil Armstrong, Nicolas Ferre, Nirmoy Das, Noralf Trønnes, Pan, Xinhui, Paul Cercueil, Pengutronix Kernel Team, Philipp Zabel, Philippe Cornu, Raphael Gallais-Pou, Sam Ravnborg, Samuel Holland, Sascha Hauer, Shawn Guo, Solomon Chiu, Stefan Agner, Tian Tao, Tomi Valkeinen, Xinliang Liu, Xinwei Kong, Yannick Fertre, Yong Wu, amd-gfx, dri-devel, linux-amlogic, linux-arm-kernel, linux-aspeed, linux-mediatek, linux-mips, linux-renesas-soc, linux-stm32, linux-sunxi, spice-devel, virtualization [-- Attachment #1.1: Type: text/plain, Size: 3870 bytes --] Hi Javier Am 02.05.22 um 10:48 schrieb Javier Martinez Canillas: > Hello, > > This series contain patches suggested by Thomas Zimmermannas a feedback for > "[RFC PATCH v4 00/11] Fix some race between sysfb device registration and > drivers probe" [0]. > > Since other changes in [0] were more controversial, I decided to just split > this part in a new patch-set and revisit the rest of the patches later. > > Patch #1 is just a cleanup since when working on this noticed that some DRM > drivers were passing as preferred bits per pixel to drm_fbdev_generic_setup() > the value that is the default anyways. > > Patch #2 renames the 'preferred_bpp' drm_fbdev_generic_setup() parameter to > 'options', and make this a multi field parameter so that it can be extended > later to pass other options as well. > > Patch #3 finally adds the new DRM_FB_FW option and makes simpledrm to use it > so that the registered framebuffer device is also marked as firmware provided. For the whole patchset: Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> Thanks a lot! > > [0]: https://lore.kernel.org/lkml/20220429084253.1085911-1-javierm@redhat.com/ > > > Javier Martinez Canillas (3): > drm: Remove superfluous arg when calling to drm_fbdev_generic_setup() > drm/fb-helper: Rename preferred_bpp drm_fbdev_generic_setup() > parameter > drm: Allow simpledrm to setup its emulated FB as firmware provided > > drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 +++-- > drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- > drivers/gpu/drm/arm/malidp_drv.c | 2 +- > drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- > drivers/gpu/drm/ast/ast_drv.c | 2 +- > drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- > drivers/gpu/drm/drm_drv.c | 2 +- > drivers/gpu/drm/drm_fb_helper.c | 25 ++++++++++++++++--- > drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- > .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 2 +- > .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- > drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 +- > drivers/gpu/drm/imx/imx-drm-core.c | 2 +- > drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 2 +- > drivers/gpu/drm/mcde/mcde_drv.c | 2 +- > drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- > drivers/gpu/drm/meson/meson_drv.c | 2 +- > drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- > drivers/gpu/drm/pl111/pl111_drv.c | 2 +- > drivers/gpu/drm/qxl/qxl_drv.c | 2 +- > drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- > drivers/gpu/drm/sti/sti_drv.c | 2 +- > drivers/gpu/drm/stm/drv.c | 2 +- > drivers/gpu/drm/sun4i/sun4i_drv.c | 2 +- > drivers/gpu/drm/tidss/tidss_drv.c | 2 +- > drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 +- > drivers/gpu/drm/tiny/arcpgu.c | 2 +- > drivers/gpu/drm/tiny/bochs.c | 2 +- > drivers/gpu/drm/tiny/cirrus.c | 2 +- > drivers/gpu/drm/tiny/simpledrm.c | 2 +- > drivers/gpu/drm/tve200/tve200_drv.c | 2 +- > drivers/gpu/drm/vboxvideo/vbox_drv.c | 2 +- > drivers/gpu/drm/vc4/vc4_drv.c | 2 +- > drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- > drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 +- > include/drm/drm_fb_helper.h | 22 ++++++++++++++++ > 36 files changed, 80 insertions(+), 39 deletions(-) > -- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Maxfeldstr. 5, 90409 Nürnberg, Germany (HRB 36809, AG Nürnberg) Geschäftsführer: Ivo Totev [-- Attachment #2: OpenPGP digital signature --] [-- Type: application/pgp-signature, Size: 840 bytes --] ^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 0/3] drm: Allow simpledrm to setup its emulated FB as firmware provided 2022-05-02 10:35 ` [PATCH 0/3] " Thomas Zimmermann @ 2022-05-02 10:49 ` Javier Martinez Canillas 0 siblings, 0 replies; 8+ messages in thread From: Javier Martinez Canillas @ 2022-05-02 10:49 UTC (permalink / raw) To: Thomas Zimmermann, linux-kernel Cc: Alexandre Belloni, Emma Anholt, Chun-Kuang Hu, David Airlie, spice-devel, Laurentiu Palcu, Liviu Dudau, Alexandre Torgue, Gurchetan Singh, Paul Cercueil, Nirmoy Das, Gerd Hoffmann, Shawn Guo, linux-stm32, Jerome Brunet, Marek Vasut, Hao Fang, linux-aspeed, Samuel Holland, Kevin Hilman, Neil Armstrong, Alexey Brodkin, Michal Simek, Jernej Skrabec, Xinliang Liu, Chen-Yu Tsai, Noralf Trønnes, Joel Stanley, Dave Airlie, Xinwei Kong, virtualization, NXP Linux Team, Maxime Coquelin, Raphael Gallais-Pou, Martin Blumenstingl, Chen Feng, Sascha Hauer, Alison Wang, Lucas De Marchi, linux-mips, Sam Ravnborg, Hans de Goede, linux-mediatek, dri-devel, Alain Volmat, Matthias Brugger, linux-amlogic, Mario Limonciello, Evan Quan, Pengutronix Kernel Team, Yong Wu, linux-arm-kernel, linux-sunxi, amd-gfx, Tomi Valkeinen, Hyun Kwon, Boris Brezillon, Andrew Jeffery, Greg Kroah-Hartman, Yannick Fertre, Pan, Xinhui, Nicolas Ferre, Claudiu Beznea, linux-renesas-soc, Solomon Chiu, Kieran Bingham, Philippe Cornu, Alex Deucher, Tian Tao, Jyri Sarha, Christian König, Laurent Pinchart Hello Thomas, On 5/2/22 12:35, Thomas Zimmermann wrote: > Hi Javier > > Am 02.05.22 um 10:48 schrieb Javier Martinez Canillas: >> Hello, >> >> This series contain patches suggested by Thomas Zimmermannas a feedback for Ups, I missed a space here. I meant to write "Zimmermann as a feedback..." >> "[RFC PATCH v4 00/11] Fix some race between sysfb device registration and >> drivers probe" [0]. >> >> Since other changes in [0] were more controversial, I decided to just split >> this part in a new patch-set and revisit the rest of the patches later. >> >> Patch #1 is just a cleanup since when working on this noticed that some DRM >> drivers were passing as preferred bits per pixel to drm_fbdev_generic_setup() >> the value that is the default anyways. >> >> Patch #2 renames the 'preferred_bpp' drm_fbdev_generic_setup() parameter to >> 'options', and make this a multi field parameter so that it can be extended >> later to pass other options as well. >> >> Patch #3 finally adds the new DRM_FB_FW option and makes simpledrm to use it >> so that the registered framebuffer device is also marked as firmware provided. > > For the whole patchset: > > Reviewed-by: Thomas Zimmermann <tzimmermann@suse.de> > > Thanks a lot! > Thanks for the prompt review! -- Best regards, Javier Martinez Canillas Linux Engineering Red Hat ^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2022-05-02 13:28 UTC | newest] Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2022-05-02 8:48 [PATCH 0/3] drm: Allow simpledrm to setup its emulated FB as firmware provided Javier Martinez Canillas 2022-05-02 8:48 ` [PATCH 1/3] drm: Remove superfluous arg when calling to drm_fbdev_generic_setup() Javier Martinez Canillas 2022-05-02 8:48 ` [PATCH 2/3] drm/fb-helper: Rename preferred_bpp drm_fbdev_generic_setup() parameter Javier Martinez Canillas 2022-05-02 11:34 ` Laurent Pinchart 2022-05-02 13:28 ` Javier Martinez Canillas 2022-05-02 8:52 ` [PATCH 3/3] drm: Allow simpledrm to setup its emulated FB as firmware provided Javier Martinez Canillas 2022-05-02 10:35 ` [PATCH 0/3] " Thomas Zimmermann 2022-05-02 10:49 ` Javier Martinez Canillas
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).