From patchwork Wed Aug 21 12:58:57 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Zimmermann X-Patchwork-Id: 13771421 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 946E5C52D6F for ; Wed, 21 Aug 2024 13:04:08 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id BADCF10E5F6; Wed, 21 Aug 2024 13:03:55 +0000 (UTC) Authentication-Results: gabe.freedesktop.org; dkim=pass (1024-bit key; unprotected) header.d=suse.de header.i=@suse.de header.b="cPMdBm+x"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="hdBEDYxf"; dkim=pass (1024-bit key) header.d=suse.de header.i=@suse.de header.b="cPMdBm+x"; dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de header.b="hdBEDYxf"; dkim-atps=neutral Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.223.131]) by gabe.freedesktop.org (Postfix) with ESMTPS id 343B189FEA; Wed, 21 Aug 2024 13:03:54 +0000 (UTC) Received: from imap1.dmz-prg2.suse.org (imap1.dmz-prg2.suse.org [IPv6:2a07:de40:b281:104:10:150:64:97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 716EB2007C; Wed, 21 Aug 2024 13:03:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1724245432; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9tFvcuOsGvZ1M9kapmBuM1FTromTr6whp0KRuvlQL20=; b=cPMdBm+xxMwYGQkVc4Dm3SJ9FSzUFCPtDQ9G3y0x8UIR1ZQH6Gc4ObYsftl8gg3g1fqNOm U1U+gvzCSeFaAOjxDUS7UHhOa1b5vWAOnS4CdPkbapYnuccRx9sgfjV8HlUIOlnuCJB8C7 Cx+rJAEHRJ6alC734SWFgN3kR1mrzho= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1724245432; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9tFvcuOsGvZ1M9kapmBuM1FTromTr6whp0KRuvlQL20=; b=hdBEDYxfLLcNj//vmtt9/9EslvNdq+FXJuLR6BAdPXUFkTrocoZZhS0gCGLPMefzYAZgeW o8ObK04fxpFyFSBw== Authentication-Results: smtp-out2.suse.de; dkim=pass header.d=suse.de header.s=susede2_rsa header.b=cPMdBm+x; dkim=pass header.d=suse.de header.s=susede2_ed25519 header.b=hdBEDYxf DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_rsa; t=1724245432; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9tFvcuOsGvZ1M9kapmBuM1FTromTr6whp0KRuvlQL20=; b=cPMdBm+xxMwYGQkVc4Dm3SJ9FSzUFCPtDQ9G3y0x8UIR1ZQH6Gc4ObYsftl8gg3g1fqNOm U1U+gvzCSeFaAOjxDUS7UHhOa1b5vWAOnS4CdPkbapYnuccRx9sgfjV8HlUIOlnuCJB8C7 Cx+rJAEHRJ6alC734SWFgN3kR1mrzho= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de; s=susede2_ed25519; t=1724245432; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9tFvcuOsGvZ1M9kapmBuM1FTromTr6whp0KRuvlQL20=; b=hdBEDYxfLLcNj//vmtt9/9EslvNdq+FXJuLR6BAdPXUFkTrocoZZhS0gCGLPMefzYAZgeW o8ObK04fxpFyFSBw== Received: from imap1.dmz-prg2.suse.org (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by imap1.dmz-prg2.suse.org (Postfix) with ESMTPS id 2A54813770; Wed, 21 Aug 2024 13:03:52 +0000 (UTC) Received: from dovecot-director2.suse.de ([2a07:de40:b281:106:10:150:64:167]) by imap1.dmz-prg2.suse.org with ESMTPSA id rradCLjlxWbXGQAAD6G6ig (envelope-from ); Wed, 21 Aug 2024 13:03:52 +0000 From: Thomas Zimmermann To: daniel@ffwll.ch, airlied@gmail.com, jfalempe@redhat.com, javierm@redhat.com Cc: dri-devel@lists.freedesktop.org, amd-gfx@lists.freedesktop.org, intel-gfx@lists.freedesktop.org, intel-xe@lists.freedesktop.org, nouveau@lists.freedesktop.org, Thomas Zimmermann Subject: [PATCH v2 00/86] drm: Provide client setup helper and convert drivers Date: Wed, 21 Aug 2024 14:58:57 +0200 Message-ID: <20240821130348.73038-1-tzimmermann@suse.de> X-Mailer: git-send-email 2.46.0 MIME-Version: 1.0 X-Rspamd-Queue-Id: 716EB2007C X-Spamd-Result: default: False [-3.51 / 50.00]; BAYES_HAM(-3.00)[100.00%]; NEURAL_HAM_LONG(-1.00)[-1.000]; MID_CONTAINS_FROM(1.00)[]; R_DKIM_ALLOW(-0.20)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; NEURAL_HAM_SHORT(-0.20)[-1.000]; MIME_GOOD(-0.10)[text/plain]; MX_GOOD(-0.01)[]; FREEMAIL_TO(0.00)[ffwll.ch,gmail.com,redhat.com]; FUZZY_BLOCKED(0.00)[rspamd.com]; MIME_TRACE(0.00)[0:+]; RCVD_VIA_SMTP_AUTH(0.00)[]; ARC_NA(0.00)[]; RCPT_COUNT_SEVEN(0.00)[10]; FREEMAIL_ENVRCPT(0.00)[gmail.com]; TO_DN_SOME(0.00)[]; RCVD_TLS_ALL(0.00)[]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; DNSWL_BLOCKED(0.00)[2a07:de40:b281:104:10:150:64:97:from]; RCVD_COUNT_TWO(0.00)[2]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DBL_BLOCKED_OPENRESOLVER(0.00)[suse.de:dkim,suse.de:mid,imap1.dmz-prg2.suse.org:helo,imap1.dmz-prg2.suse.org:rdns]; DKIM_SIGNED(0.00)[suse.de:s=susede2_rsa,suse.de:s=susede2_ed25519]; DKIM_TRACE(0.00)[suse.de:+] X-Rspamd-Server: rspamd2.dmz-prg2.suse.org X-Rspamd-Action: no action X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" Provide drm_client_setup() to initialize in-kernel DRM clients. Then convert all drivers to the new interface. Remove old interfaces for the fbdev client. So far, the only supported DRM client in the kernel is for fbdev emulation with its fbcon support. Long term, we want to move away from fbcon. Possible replacements are DRM-based loggers, boot-up logos or maybe even a console. The exact kind of client should be configurable by the user. You can find examples of such clients at [1] and [2]. To do this, we need one single interface for drivers to initialize the configured in-kernel clients, replacing the current call to initialize fbdev emulation. The fbdev emulation also depends on the DRM driver's management, so drivers differ in what fbdev code they run. We need to abstract this as well. This patchset addresses these topics. While there are many patches, most of them are small, straight-forward changes to drivers or rearrange existing code. Patches 1 to 3 add a driver-neutral setup function for the fbdev client. The new callback fbdev_probe in struct drm_driver creates the GEM buffer for fbdev output. It replaces the existing callback fb_probe from struct drm_fb_helper_funcs, which currently does the same. The client code is equal to code in exisisting fbdev emulation, except for its use of fbdev_probe. Patch 4 adds drm_client_setup(), a client-agnostic interface to initialize the in-kernel DRM clients. It only supports the new fbdev emulation setup, but additional clients will be added here. Hopefully this will hide future changes to DRM client initialization from drivers. Patches 5 to 49 rework all drivers with GEM memory management based on DMA helpers. This is fairly straigh-forward. The fbdev-dma helpers provide an implementation of the fbdev_probe helpers. Each driver sets the new callback in its instance of struct drm_driver and calls drm_client_setup(). Then the old fbdev-dma client goes away. Patches 50 to 63 do the same for drivers with SHMEM-based GEM memory management. The fbdev client code is again the same as before, except for the fbdev_probe callback. Patches 64 to 73 do the same for drivers with TTM-based GEM memory management. Patches 74 to 85 do the same for the remaining drivers with custom fbdev emulation. As before, the new fbdev client code is mostly the same the old one; except for the fbdev_probe function. The changes for i915/xe and omapdrm are a bit mor einvolved, but nothing too complicated. Patch 86 removes the obsolete fb_probe callback from struct drm_fb_helper_funcs. This patchset has been tested on various hardware with the various memory managers involved. v2: - add drm_client_setup_with_fourcc() - xe: set fbdev_probe in xe_display_driver_set_hooks() - do cleanups [1] https://lore.kernel.org/dri-devel/20240801100640.462606-4-jfalempe@redhat.com/ [2] https://lists.freedesktop.org/archives/dri-devel/2019-March/212113.html Thomas Zimmermann (86): drm/fbdev-helper: Move color-mode lookup into 4CC format helper drm/fbdev-helper: Set and clear VGA switcheroo client from fb_info drm/fbdev: Add memory-agnostic fbdev client drm: Add client-agnostic setup helper drm/fbdev-dma: Support struct drm_driver.fbdev_probe drm/arcgpu: Run DRM default client setup drm/arm/komeda: Run DRM default client setup drm/arm/hdlcd: Run DRM default client setup drm/arm/malidp: Run DRM default client setup drm/aspeed: Run DRM default client setup drm/atmel-hdlcd: Run DRM default client setup drm/fsl-dcu: Run DRM default client setup drm/hisilicon/kirin: Run DRM default client setup drm/hx8357d: Run DRM default client setup drm/ili9163: Run DRM default client setup drm/ili9225: Run DRM default client setup drm/ili9341: Run DRM default client setup drm/ili9486: Run DRM default client setup drm/imx/dcss: Run DRM default client setup drm/imx/ipuv3: Run DRM default client setup drm/imx/lcdc: Run DRM default client setup drm/ingenic: Run DRM default client setup drm/kmb: Run DRM default client setup drm/logicvc: Run DRM default client setup drm/mcde: Run DRM default client setup drm/mediatek: Run DRM default client setup drm/meson: Run DRM default client setup drm/mi0283qt: Run DRM default client setup drm/mxsfb/lcdif: Run DRM default client setup drm/msxfb: Run DRM default client setup drm/panel/ili9341: Run DRM default client setup drm/panel-mipi-dbi: Run DRM default client setup drm/pl111: Run DRM default client setup drm/renesas/rcar-du: Run DRM default client setup drm/renesas/rz-du: Run DRM default client setup drm/renesas/shmobile: Run DRM default client setup drm/repaper: Run DRM default client setup drm/rockchip: Run DRM default client setup drm/sti: Run DRM default client setup drm/stm: Run DRM default client setup drm/sun4i: Run DRM default client setup drm/tidss: Run DRM default client setup drm/tilcdc: Run DRM default client setup drm/st7586: Run DRM default client setup drm/st7735r: Run DRM default client setup drm/tve200: Run DRM default client setup drm/vc4: Run DRM default client setup drm/xlnx: Run DRM default client setup drm/fbdev-dma: Remove obsolete setup function drm/fbdev-shmem: Support struct drm_driver.fbdev_probe drm/ast: Run DRM default client setup drm/cirrus: Run DRM default client setup drm/gm12u320: Run DRM default client setup drm/gud: Run DRM default client setup drm/hyperv_drm: Run DRM default client setup drm/mgag200: Run DRM default client setup drm/ofdrm: Use DRM default client setup drm/simpledrm: Run DRM default client setup drm/solomon: Run DRM default client setup drm/udl: Run DRM default client setup drm/virtgpu: Run DRM default client setup drm/vkms: Run DRM default client setup drm/fbdev-shmem: Remove obsolete setup function drm/fbdev-ttm: Support struct drm_driver.fbdev_probe drm/amdgpu: Run DRM default client setup drm/bochs: Run DRM default client setup drm/hisilicon/hibmc: Run DRM default client setup drm/loongson: Run DRM default client setup drm/nouveau: Run DRM default client setup drm/qxl: Run DRM default client setup drm/vboxvideo: Run DRM default client setup drm/vmwgfx: Run DRM default client setup drm/fbdev-ttm: Remove obsolete setup function drm/armada: Run DRM default client setup drm/exynos-drm: Run DRM default client setup drm/gma500: Run DRM default client setup drm/msm: Run DRM default client setup drm/radeon: Run DRM default client setup drm/tegra: Run DRM default client setup drm/i915: Remove struct drm_fb_helper from struct intel_fbdev drm/i915: Move custom restore code into separate callback drm/i915: Move custom hotplug code into separate callback drm/{i915,xe}: Run DRM default client setup drm/omapdrm: Remove struct drm_fb_helper from struct omap_fbdev. drm/omapdrm: Run DRM default client setup drm/fb-helper: Remove struct drm_fb_helper.fb_probe drivers/gpu/drm/Makefile | 5 +- drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 +- .../gpu/drm/arm/display/komeda/komeda_drv.c | 4 +- .../gpu/drm/arm/display/komeda/komeda_kms.c | 2 + drivers/gpu/drm/arm/hdlcd_drv.c | 4 +- drivers/gpu/drm/arm/malidp_drv.c | 4 +- drivers/gpu/drm/armada/armada_drm.h | 11 +- drivers/gpu/drm/armada/armada_drv.c | 4 +- drivers/gpu/drm/armada/armada_fbdev.c | 115 +------- drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +- drivers/gpu/drm/ast/ast_drv.c | 6 +- drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 4 +- drivers/gpu/drm/drm_client_setup.c | 69 +++++ drivers/gpu/drm/drm_fb_helper.c | 109 +++----- drivers/gpu/drm/drm_fbdev_client.c | 141 ++++++++++ drivers/gpu/drm/drm_fbdev_dma.c | 170 +++-------- drivers/gpu/drm/drm_fbdev_shmem.c | 170 +++-------- drivers/gpu/drm/drm_fbdev_ttm.c | 225 ++++----------- drivers/gpu/drm/drm_fourcc.c | 30 +- drivers/gpu/drm/exynos/exynos_drm_drv.c | 4 +- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 101 +------ drivers/gpu/drm/exynos/exynos_drm_fbdev.h | 15 +- drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 4 +- drivers/gpu/drm/gma500/fbdev.c | 100 +------ drivers/gpu/drm/gma500/psb_drv.c | 4 +- drivers/gpu/drm/gma500/psb_drv.h | 12 +- drivers/gpu/drm/gud/gud_drv.c | 4 +- .../gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- .../gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 2 + .../gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 +- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +- drivers/gpu/drm/i915/display/intel_fbdev.c | 263 ++++++------------ drivers/gpu/drm/i915/display/intel_fbdev.h | 8 + drivers/gpu/drm/i915/i915_driver.c | 2 + drivers/gpu/drm/imx/dcss/dcss-kms.c | 4 +- drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 4 +- drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 4 +- drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +- drivers/gpu/drm/kmb/kmb_drv.c | 4 +- drivers/gpu/drm/logicvc/logicvc_drm.c | 16 +- drivers/gpu/drm/loongson/lsdc_drv.c | 4 +- drivers/gpu/drm/mcde/mcde_drv.c | 4 +- drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- drivers/gpu/drm/meson/meson_drv.c | 4 +- drivers/gpu/drm/mgag200/mgag200_drv.c | 5 +- drivers/gpu/drm/msm/msm_drv.c | 4 +- drivers/gpu/drm/msm/msm_drv.h | 13 +- drivers/gpu/drm/msm/msm_fbdev.c | 144 ++-------- drivers/gpu/drm/mxsfb/lcdif_drv.c | 4 +- drivers/gpu/drm/mxsfb/mxsfb_drv.c | 4 +- drivers/gpu/drm/nouveau/nouveau_drm.c | 10 +- drivers/gpu/drm/omapdrm/omap_drv.c | 1 + drivers/gpu/drm/omapdrm/omap_drv.h | 3 + drivers/gpu/drm/omapdrm/omap_fbdev.c | 161 +++-------- drivers/gpu/drm/omapdrm/omap_fbdev.h | 8 + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 4 +- drivers/gpu/drm/pl111/pl111_drv.c | 4 +- drivers/gpu/drm/qxl/qxl_drv.c | 4 +- drivers/gpu/drm/radeon/radeon_drv.c | 16 +- drivers/gpu/drm/radeon/radeon_fbdev.c | 114 +------- drivers/gpu/drm/radeon/radeon_mode.h | 12 +- drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 4 +- drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 4 +- .../gpu/drm/renesas/shmobile/shmob_drm_drv.c | 5 +- drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 +- drivers/gpu/drm/solomon/ssd130x.c | 4 +- drivers/gpu/drm/sti/sti_drv.c | 4 +- drivers/gpu/drm/stm/drv.c | 5 +- drivers/gpu/drm/sun4i/sun4i_drv.c | 4 +- drivers/gpu/drm/tegra/drm.c | 5 +- drivers/gpu/drm/tegra/drm.h | 12 +- drivers/gpu/drm/tegra/fbdev.c | 98 +------ drivers/gpu/drm/tidss/tidss_drv.c | 4 +- drivers/gpu/drm/tilcdc/tilcdc_drv.c | 4 +- drivers/gpu/drm/tiny/arcpgu.c | 4 +- drivers/gpu/drm/tiny/bochs.c | 4 +- drivers/gpu/drm/tiny/cirrus.c | 4 +- drivers/gpu/drm/tiny/gm12u320.c | 4 +- drivers/gpu/drm/tiny/hx8357d.c | 4 +- drivers/gpu/drm/tiny/ili9163.c | 4 +- drivers/gpu/drm/tiny/ili9225.c | 4 +- drivers/gpu/drm/tiny/ili9341.c | 4 +- drivers/gpu/drm/tiny/ili9486.c | 4 +- drivers/gpu/drm/tiny/mi0283qt.c | 4 +- drivers/gpu/drm/tiny/ofdrm.c | 9 +- drivers/gpu/drm/tiny/panel-mipi-dbi.c | 4 +- drivers/gpu/drm/tiny/repaper.c | 4 +- drivers/gpu/drm/tiny/simpledrm.c | 9 +- drivers/gpu/drm/tiny/st7586.c | 4 +- drivers/gpu/drm/tiny/st7735r.c | 4 +- drivers/gpu/drm/tve200/tve200_drv.c | 9 +- drivers/gpu/drm/udl/udl_drv.c | 4 +- drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +- drivers/gpu/drm/vc4/vc4_drv.c | 5 +- drivers/gpu/drm/virtio/virtgpu_drv.c | 6 +- drivers/gpu/drm/vkms/vkms_drv.c | 4 +- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 5 +- drivers/gpu/drm/xe/display/xe_display.c | 4 + drivers/gpu/drm/xlnx/zynqmp_kms.c | 4 +- include/drm/drm_client_setup.h | 15 + include/drm/drm_drv.h | 18 ++ include/drm/drm_fb_helper.h | 43 +-- include/drm/drm_fbdev_client.h | 19 ++ include/drm/drm_fbdev_dma.h | 13 +- include/drm/drm_fbdev_shmem.h | 13 +- include/drm/drm_fbdev_ttm.h | 15 +- include/drm/drm_fourcc.h | 1 + 107 files changed, 1030 insertions(+), 1564 deletions(-) create mode 100644 drivers/gpu/drm/drm_client_setup.c create mode 100644 drivers/gpu/drm/drm_fbdev_client.c create mode 100644 include/drm/drm_client_setup.h create mode 100644 include/drm/drm_fbdev_client.h base-commit: 70d6d55dea574b7b78ccf714699cc5d8d62fcc2c prerequisite-patch-id: 0aa359f6144c4015c140c8a6750be19099c676fb prerequisite-patch-id: c67e5d886a47b7d0266d81100837557fda34cb24 prerequisite-patch-id: cbc453ee02fae02af22fbfdce56ab732c7a88c36