Skip to content

Commit ebc27c2

Browse files
committed
fixup! WIP: drm/apple: Add DCP display driver
1 parent 605a982 commit ebc27c2

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

drivers/gpu/drm/apple/apple_drv.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
#include <drm/drm_atomic.h>
2222
#include <drm/drm_atomic_helper.h>
2323
#include <drm/drm_blend.h>
24+
#include <drm/drm_client_setup.h>
2425
#include <drm/drm_crtc.h>
2526
#include <drm/drm_drv.h>
2627
#include <drm/drm_fb_helper.h>
@@ -67,6 +68,7 @@ static int apple_drm_gem_dumb_create(struct drm_file *file_priv,
6768

6869
static const struct drm_driver apple_drm_driver = {
6970
DRM_GEM_DMA_DRIVER_OPS_WITH_DUMB_CREATE(apple_drm_gem_dumb_create),
71+
DRM_FBDEV_DMA_DRIVER_OPS,
7072
.name = DRIVER_NAME,
7173
.desc = DRIVER_DESC,
7274
.date = "20221106",
@@ -625,7 +627,7 @@ static int apple_drm_init(struct device *dev)
625627

626628
fb_size = fb_r.end - fb_r.start + 1;
627629
ret = aperture_remove_conflicting_devices(fb_r.start, fb_size,
628-
&apple_drm_driver);
630+
apple_drm_driver.name);
629631
if (ret) {
630632
dev_err(dev, "Failed remove fb: %d\n", ret);
631633
goto err_unbind;
@@ -676,7 +678,7 @@ static int apple_drm_init(struct device *dev)
676678
if (ret)
677679
goto err_unbind;
678680

679-
drm_fbdev_dma_setup(&apple->drm, 32);
681+
drm_client_setup_with_fourcc(&apple->drm, DRM_FORMAT_XRGB8888);
680682

681683
return 0;
682684

0 commit comments

Comments
 (0)