| Message ID | 20221020103755.24058-1-tzimmermann@suse.de |
|---|---|
| Headers | show |
| Series | drm/fb-helper: Untangle fbdev emulation and helpers | expand |
Am 20.10.22 um 12:37 schrieb Thomas Zimmermann: > Don't set struct drm_driver.lastclose. It's used to restore the > fbdev console. But as amdgpu uses generic fbdev emulation, the > console is being restored by the DRM client helpers already. See > the call to drm_client_dev_restore() in drm_lastclose(). ??? The commit message doesn't match what the patch is doing. You are removing output_poll_changed instead of lastclose here. Did something got mixed up? Cheers, Christian. > > Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> > --- > drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 1 - > drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 -- > 2 files changed, 3 deletions(-) > > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > index 23998f727c7f9..fb7186c5ade2a 100644 > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c > @@ -1224,7 +1224,6 @@ amdgpu_display_user_framebuffer_create(struct drm_device *dev, > > const struct drm_mode_config_funcs amdgpu_mode_funcs = { > .fb_create = amdgpu_display_user_framebuffer_create, > - .output_poll_changed = drm_fb_helper_output_poll_changed, > }; > > static const struct drm_prop_enum_list amdgpu_underscan_enum_list[] = > diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > index f6a9e8fdd87d6..e9a28a5363b9a 100644 > --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c > @@ -82,7 +82,6 @@ > #include <drm/drm_atomic_uapi.h> > #include <drm/drm_atomic_helper.h> > #include <drm/drm_blend.h> > -#include <drm/drm_fb_helper.h> > #include <drm/drm_fourcc.h> > #include <drm/drm_edid.h> > #include <drm/drm_vblank.h> > @@ -2810,7 +2809,6 @@ const struct amdgpu_ip_block_version dm_ip_block = > static const struct drm_mode_config_funcs amdgpu_dm_mode_funcs = { > .fb_create = amdgpu_display_user_framebuffer_create, > .get_format_info = amd_get_format_info, > - .output_poll_changed = drm_fb_helper_output_poll_changed, > .atomic_check = amdgpu_dm_atomic_check, > .atomic_commit = drm_atomic_helper_commit, > };
Hi Am 20.10.22 um 13:48 schrieb Christian König: > Am 20.10.22 um 12:37 schrieb Thomas Zimmermann: >> Don't set struct drm_driver.lastclose. It's used to restore the >> fbdev console. But as amdgpu uses generic fbdev emulation, the >> console is being restored by the DRM client helpers already. See >> the call to drm_client_dev_restore() in drm_lastclose(). > > ??? > > The commit message doesn't match what the patch is doing. You are > removing output_poll_changed instead of lastclose here. > > Did something got mixed up? Arghh. There are patches for lastclose and output_poll_changed. The reason for removing them is the same, but thanks to copy and paste the names are wrong. So the patch is correct, but the description isn't. Will be fixed. Best regards Thomas > > Cheers, > Christian. > >> >> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> >> --- >> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 1 - >> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 -- >> 2 files changed, 3 deletions(-) >> >> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c >> b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c >> index 23998f727c7f9..fb7186c5ade2a 100644 >> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c >> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c >> @@ -1224,7 +1224,6 @@ amdgpu_display_user_framebuffer_create(struct >> drm_device *dev, >> const struct drm_mode_config_funcs amdgpu_mode_funcs = { >> .fb_create = amdgpu_display_user_framebuffer_create, >> - .output_poll_changed = drm_fb_helper_output_poll_changed, >> }; >> static const struct drm_prop_enum_list amdgpu_underscan_enum_list[] = >> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> index f6a9e8fdd87d6..e9a28a5363b9a 100644 >> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c >> @@ -82,7 +82,6 @@ >> #include <drm/drm_atomic_uapi.h> >> #include <drm/drm_atomic_helper.h> >> #include <drm/drm_blend.h> >> -#include <drm/drm_fb_helper.h> >> #include <drm/drm_fourcc.h> >> #include <drm/drm_edid.h> >> #include <drm/drm_vblank.h> >> @@ -2810,7 +2809,6 @@ const struct amdgpu_ip_block_version dm_ip_block = >> static const struct drm_mode_config_funcs amdgpu_dm_mode_funcs = { >> .fb_create = amdgpu_display_user_framebuffer_create, >> .get_format_info = amd_get_format_info, >> - .output_poll_changed = drm_fb_helper_output_poll_changed, >> .atomic_check = amdgpu_dm_atomic_check, >> .atomic_commit = drm_atomic_helper_commit, >> }; >
Separate generic fbdev emulation from the helper code that is shared among the various fbdev implementations within DRM. Affects many drivers. The goal of this patchset is to improve readability and streamline the fbdev helper code within DRM. In the long term, we want to get to a point where drivers or memory managers can pick and combine the various helpers for optimal fbdev support. Patches 1 to 8 start by preparing drivers. Setting lastclose is not required by generic fbdev emulation. Two drivers depend on fb helpers implicitly including other Linux header files. Fixing this in patches 9 and 10 allows to remove unnecesary include statements from the fb-helper header in patch 11. Do some renaming in patches 12 to 14. There are currently various implementation of the fbdev I/O helpers with varying feature sets. The fb helpers for fbdev I/O should all call fb_sync, which is what fbdev's internal implementation does. For DRM, damage handling needs to be performed after updating a framebuffer. The damage worker is part of the fb helpers, but the actual update logic only works with generic fbdev emulation. Separate the two, which also gives other drivers an option so set their own damage handling if neccessary. The full-featured I/O helpers can be moved under a shared implementation and called by all drivers. Patches 15 to 18 resolve these issues. Patch 19 changes fbdev disablement to work at the level of display detection. If disabled, generic fbdev emulation will be initialized, but no display will be detected. It can later be enabled by changing the parameter in sysfs and plugging in a connector. Patches 20 and 21 move the generic fbdev emulation into their own source and header files and clean up the include statements throughout DRM. Many drivers only call drm_fbdev_generic_setup() and can avoid including other Linux header files. Built on x86-64, aarch64, arm, ppc64le. Tested with various combinations of bochs, radeon, simpledrm. Thomas Zimmermann (21): drm/amdgpu: Don't set struct drm_driver.lastclose drm/imx: Don't set struct drm_driver.lastclose drm/ingenic: Don't set struct drm_driver.lastclose drm/komeda: Don't set struct drm_driver.lastclose drm/logicvc: Don't set struct drm_driver.lastclose drm/mcde: Don't set struct drm_driver.lastclose drm/rockchip: Don't set struct drm_driver.lastclose drm/vboxvideo: Don't set struct drm_driver.lastclose drm/panel-ili9341: Include <linux/backlight.h> drm/tve200: Include <linux/of.h> drm/fb-helper: Cleanup include statements in header file drm/fb_helper: Rename field fbdev to info in struct drm_fb_helper drm/fb-helper: Rename drm_fb_helper_alloc_fbi() to use _info postfix drm/fb-helper: Rename drm_fb_helper_unregister_fbi() to use _info postfix drm/fb-helper: Disconnect damage worker from update logic drm/fb-helper: Call fb_sync in I/O functions drm/fb-helper: Perform all fbdev I/O with the same implementation drm/fb_helper: Minimize damage-helper overhead drm/fb-helper: Always initialize generic fbdev emulation drm/fb-helper: Move generic fbdev emulation into separate source file drm/fb-helper: Remove unnecessary include statements drivers/gpu/drm/Makefile | 2 +- .../gpu/drm/amd/amdgpu/amdgpu_connectors.c | 1 - drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 - drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 - .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 - .../gpu/drm/arm/display/komeda/komeda_drv.c | 2 +- .../gpu/drm/arm/display/komeda/komeda_kms.c | 2 - drivers/gpu/drm/arm/hdlcd_crtc.c | 1 - drivers/gpu/drm/arm/hdlcd_drv.c | 2 +- drivers/gpu/drm/arm/malidp_drv.c | 2 +- drivers/gpu/drm/armada/armada_fbdev.c | 6 +- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 2 +- drivers/gpu/drm/ast/ast_drv.c | 1 + drivers/gpu/drm/ast/ast_drv.h | 1 - drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 +- drivers/gpu/drm/bridge/tc358762.c | 2 +- drivers/gpu/drm/drm_crtc_helper.c | 1 - drivers/gpu/drm/drm_fb_helper.c | 1081 ++++++----------- drivers/gpu/drm/drm_fbdev.c | 512 ++++++++ drivers/gpu/drm/drm_gem_framebuffer_helper.c | 1 - drivers/gpu/drm/drm_probe_helper.c | 1 - drivers/gpu/drm/etnaviv/etnaviv_drv.h | 3 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 6 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 +- drivers/gpu/drm/gma500/framebuffer.c | 6 +- drivers/gpu/drm/gud/gud_drv.c | 2 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 1 + .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 - .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 2 +- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 2 +- drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 1 - drivers/gpu/drm/i915/display/intel_fbdev.c | 8 +- drivers/gpu/drm/imx/dcss/dcss-kms.c | 3 +- drivers/gpu/drm/imx/imx-drm-core.c | 2 +- drivers/gpu/drm/imx/imx-ldb.c | 2 +- drivers/gpu/drm/imx/imx-tve.c | 1 - drivers/gpu/drm/imx/parallel-display.c | 2 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 3 +- drivers/gpu/drm/kmb/kmb_drv.c | 2 +- drivers/gpu/drm/kmb/kmb_plane.c | 1 - drivers/gpu/drm/logicvc/logicvc_drm.c | 2 +- drivers/gpu/drm/logicvc/logicvc_mode.c | 2 - drivers/gpu/drm/mcde/mcde_drv.c | 3 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 2 +- drivers/gpu/drm/meson/meson_drv.c | 2 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 1 + drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/msm/msm_fbdev.c | 4 +- drivers/gpu/drm/mxsfb/lcdif_drv.c | 2 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 2 +- drivers/gpu/drm/nouveau/nouveau_fbcon.c | 27 +- drivers/gpu/drm/omapdrm/omap_fbdev.c | 6 +- drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 3 +- drivers/gpu/drm/pl111/pl111_drv.c | 2 +- drivers/gpu/drm/qxl/qxl_drv.c | 1 + drivers/gpu/drm/qxl/qxl_drv.h | 1 - drivers/gpu/drm/radeon/radeon_fb.c | 6 +- drivers/gpu/drm/rcar-du/rcar_du_drv.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 2 +- drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 2 - drivers/gpu/drm/solomon/ssd130x.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/tegra/fb.c | 8 +- drivers/gpu/drm/tidss/tidss_drv.c | 2 +- drivers/gpu/drm/tidss/tidss_kms.c | 1 - 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/gm12u320.c | 2 +- drivers/gpu/drm/tiny/hx8357d.c | 2 +- drivers/gpu/drm/tiny/ili9163.c | 2 +- drivers/gpu/drm/tiny/ili9225.c | 2 +- drivers/gpu/drm/tiny/ili9341.c | 2 +- drivers/gpu/drm/tiny/ili9486.c | 2 +- drivers/gpu/drm/tiny/mi0283qt.c | 2 +- drivers/gpu/drm/tiny/ofdrm.c | 2 +- drivers/gpu/drm/tiny/panel-mipi-dbi.c | 2 +- drivers/gpu/drm/tiny/repaper.c | 2 +- drivers/gpu/drm/tiny/simpledrm.c | 2 +- drivers/gpu/drm/tiny/st7586.c | 2 +- drivers/gpu/drm/tiny/st7735r.c | 2 +- drivers/gpu/drm/tve200/tve200_drv.c | 3 +- drivers/gpu/drm/udl/udl_drv.c | 2 +- drivers/gpu/drm/v3d/v3d_drv.c | 1 - drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +- drivers/gpu/drm/vboxvideo/vbox_main.c | 1 - drivers/gpu/drm/vc4/vc4_drv.c | 2 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + drivers/gpu/drm/virtio/virtgpu_drv.h | 1 - drivers/gpu/drm/vkms/vkms_drv.c | 2 +- drivers/gpu/drm/vmwgfx/vmwgfx_fb.c | 3 + drivers/gpu/drm/xen/xen_drm_front_gem.c | 1 - drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 2 +- include/drm/drm_fb_helper.h | 59 +- include/drm/drm_fbdev.h | 15 + 99 files changed, 1019 insertions(+), 883 deletions(-) create mode 100644 drivers/gpu/drm/drm_fbdev.c create mode 100644 include/drm/drm_fbdev.h base-commit: 8c797a984264f04708d2099e83c85978a0fede89 prerequisite-patch-id: c2b2f08f0eccc9f5df0c0da49fa1d36267deb11d prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24 prerequisite-patch-id: 3f204510fcbf9530d6540bd8e6128cce598988b6