Skip to content

Commit e879693

Browse files
author
Thomas Zimmermann
committed
drm/vmwgfx: Run DRM default client setup
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 <[email protected]> Cc: Zack Rusin <[email protected]> Cc: Broadcom internal kernel review list <[email protected]> Reviewed-by: Zack Rusin <[email protected]> Acked-by: Javier Martinez Canillas <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
1 parent 1339120 commit e879693

File tree

2 files changed

+5
-1
lines changed

2 files changed

+5
-1
lines changed

drivers/gpu/drm/vmwgfx/Kconfig

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ config DRM_VMWGFX
33
tristate "DRM driver for VMware Virtual GPU"
44
depends on DRM && PCI && MMU
55
depends on (X86 && HYPERVISOR_GUEST) || ARM64
6+
select DRM_CLIENT_SELECTION
67
select DRM_TTM
78
select DRM_TTM_HELPER
89
select MAPPING_DIRTY_HELPERS

drivers/gpu/drm/vmwgfx/vmwgfx_drv.c

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include "ttm_object.h"
3737

3838
#include <drm/drm_aperture.h>
39+
#include <drm/drm_client_setup.h>
3940
#include <drm/drm_drv.h>
4041
#include <drm/drm_fbdev_ttm.h>
4142
#include <drm/drm_gem_ttm_helper.h>
@@ -1628,6 +1629,8 @@ static const struct drm_driver driver = {
16281629
.prime_handle_to_fd = vmw_prime_handle_to_fd,
16291630
.gem_prime_import_sg_table = vmw_prime_import_sg_table,
16301631

1632+
DRM_FBDEV_TTM_DRIVER_OPS,
1633+
16311634
.fops = &vmwgfx_driver_fops,
16321635
.name = VMWGFX_DRIVER_NAME,
16331636
.desc = VMWGFX_DRIVER_DESC,
@@ -1679,7 +1682,7 @@ static int vmw_probe(struct pci_dev *pdev, const struct pci_device_id *ent)
16791682

16801683
vmw_fifo_resource_inc(vmw);
16811684
vmw_svga_enable(vmw);
1682-
drm_fbdev_ttm_setup(&vmw->drm, 0);
1685+
drm_client_setup(&vmw->drm, NULL);
16831686

16841687
vmw_debugfs_gem_init(vmw);
16851688
vmw_debugfs_resource_managers_init(vmw);

0 commit comments

Comments
 (0)