Merge tag 'io_uring-6.8-2024-02-16' of git://git.kernel.dk/linux

[linux-2.6-microblaze.git] / drivers / gpu / drm / drm_fbdev_dma.c

diff --git a/drivers/gpu/drm/drm_fbdev_dma.c b/drivers/gpu/drm/drm_fbdev_dma.c
index f353daf..6c9427b 100644 (file)
--- a/drivers/gpu/drm/drm_fbdev_dma.c
+++ b/drivers/gpu/drm/drm_fbdev_dma.c
@@ -54,21 +54,17 @@ static void drm_fbdev_dma_fb_destroy(struct fb_info *info)
 static int drm_fbdev_dma_fb_mmap(struct fb_info *info, struct vm_area_struct *vma)
 {
        struct drm_fb_helper *fb_helper = info->par;
-       struct drm_device *dev = fb_helper->dev;
-
-       if (drm_WARN_ON_ONCE(dev, !fb_helper->dev->driver->gem_prime_mmap))
-               return -ENODEV;
 
-       return fb_helper->dev->driver->gem_prime_mmap(fb_helper->buffer->gem, vma);
+       return drm_gem_prime_mmap(fb_helper->buffer->gem, vma);
 }
 
 static const struct fb_ops drm_fbdev_dma_fb_ops = {
        .owner = THIS_MODULE,
        .fb_open = drm_fbdev_dma_fb_open,
        .fb_release = drm_fbdev_dma_fb_release,
-       __FB_DEFAULT_SYS_OPS_RDWR,
+       __FB_DEFAULT_DMAMEM_OPS_RDWR,
        DRM_FB_HELPER_DEFAULT_OPS,
-       __FB_DEFAULT_SYS_OPS_DRAW,
+       __FB_DEFAULT_DMAMEM_OPS_DRAW,
        .fb_mmap = drm_fbdev_dma_fb_mmap,
        .fb_destroy = drm_fbdev_dma_fb_destroy,
 };
@@ -127,7 +123,6 @@ static int drm_fbdev_dma_helper_fb_probe(struct drm_fb_helper *fb_helper,
        drm_fb_helper_fill_info(info, fb_helper, sizes);
 
        info->fbops = &drm_fbdev_dma_fb_ops;
-       info->flags = FBINFO_DEFAULT;
 
        /* screen */
        info->flags |= FBINFO_VIRTFB; /* system memory */