]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
drm/rockchip: Run DRM default client setup
authorThomas Zimmermann <tzimmermann@suse.de>
Tue, 24 Sep 2024 07:12:35 +0000 (09:12 +0200)
committerThomas Zimmermann <tzimmermann@suse.de>
Thu, 26 Sep 2024 07:31:27 +0000 (09:31 +0200)
Call drm_client_setup() to run the kernel's default client setup
for DRM. Set fbdev_probe in struct drm_driver, so that the client
setup can start the common fbdev client.

v5:
- select DRM_CLIENT_SELECTION

Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
Cc: Sandy Huang <hjc@rock-chips.com>
Cc: "Heiko Stübner" <heiko@sntech.de>
Cc: Andy Yan <andy.yan@rock-chips.com>
Acked-by: Heiko Stuebner <heiko@sntech.de>
Link: https://patchwork.freedesktop.org/patch/msgid/20240924071734.98201-38-tzimmermann@suse.de
drivers/gpu/drm/rockchip/Kconfig
drivers/gpu/drm/rockchip/rockchip_drm_drv.c

index 23c49e91f1ccfcee6ed302feefdaf0cc0d20b688..258dd38e1a8e83f2c1913637f00b52be91e6b821 100644 (file)
@@ -2,6 +2,7 @@
 config DRM_ROCKCHIP
        tristate "DRM Support for Rockchip"
        depends on DRM && ROCKCHIP_IOMMU
+       select DRM_CLIENT_SELECTION
        select DRM_GEM_DMA_HELPER
        select DRM_KMS_HELPER
        select DRM_PANEL
index b84451d5918734bd16445f8d4631d3640a24f972..d86ec0c5c3a611c32011f2774d4b7c6b5140b103 100644 (file)
@@ -17,6 +17,7 @@
 #include <linux/iommu.h>
 
 #include <drm/drm_aperture.h>
+#include <drm/drm_client_setup.h>
 #include <drm/drm_drv.h>
 #include <drm/drm_fbdev_dma.h>
 #include <drm/drm_gem_dma_helper.h>
@@ -191,7 +192,7 @@ static int rockchip_drm_bind(struct device *dev)
        if (ret)
                goto err_kms_helper_poll_fini;
 
-       drm_fbdev_dma_setup(drm_dev, 0);
+       drm_client_setup(drm_dev, NULL);
 
        return 0;
 err_kms_helper_poll_fini:
@@ -226,6 +227,7 @@ static const struct drm_driver rockchip_drm_driver = {
        .driver_features        = DRIVER_MODESET | DRIVER_GEM | DRIVER_ATOMIC,
        .dumb_create            = rockchip_gem_dumb_create,
        .gem_prime_import_sg_table      = rockchip_gem_prime_import_sg_table,
+       DRM_FBDEV_DMA_DRIVER_OPS,
        .fops                   = &rockchip_drm_driver_fops,
        .name   = DRIVER_NAME,
        .desc   = DRIVER_DESC,