]> git.baikalelectronics.ru Git - kernel.git/commitdiff
drm/vboxvideo: drop DRM_MTRR_WC #define
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 15 Apr 2020 07:39:37 +0000 (09:39 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 28 Apr 2020 13:06:49 +0000 (15:06 +0200)
Doesn't apply to upstream kernels since a rather long time.

Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200415074034.175360-3-daniel.vetter@ffwll.ch
drivers/gpu/drm/vboxvideo/vbox_ttm.c

index 976423d0c3ccacc588fcf1e6a2a43e7b679b8736..f5a06675da43c67abcf187f7bddc9b95f88e5f3a 100644 (file)
@@ -24,25 +24,13 @@ int vbox_mm_init(struct vbox_private *vbox)
                return ret;
        }
 
-#ifdef DRM_MTRR_WC
-       vbox->fb_mtrr = drm_mtrr_add(pci_resource_start(dev->pdev, 0),
-                                    pci_resource_len(dev->pdev, 0),
-                                    DRM_MTRR_WC);
-#else
        vbox->fb_mtrr = arch_phys_wc_add(pci_resource_start(dev->pdev, 0),
                                         pci_resource_len(dev->pdev, 0));
-#endif
        return 0;
 }
 
 void vbox_mm_fini(struct vbox_private *vbox)
 {
-#ifdef DRM_MTRR_WC
-       drm_mtrr_del(vbox->fb_mtrr,
-                    pci_resource_start(vbox->ddev.pdev, 0),
-                    pci_resource_len(vbox->ddev.pdev, 0), DRM_MTRR_WC);
-#else
        arch_phys_wc_del(vbox->fb_mtrr);
-#endif
        drm_vram_helper_release_mm(&vbox->ddev);
 }