| Message ID | 20200415074034.175360-3-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | devm_drm_dev_alloc, v2 | expand |
Hi, On 4/15/20 9:39 AM, Daniel Vetter wrote: > Doesn't apply to upstream kernels since a rather long time. > > Acked-by: Sam Ravnborg <sam@ravnborg.org> > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> > Cc: Hans de Goede <hdegoede@redhat.com> LGTM: Reviewed-by: Hans de Goede <hdegoede@redhat.com> Regards, Hans > --- > drivers/gpu/drm/vboxvideo/vbox_ttm.c | 12 ------------ > 1 file changed, 12 deletions(-) > > diff --git a/drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/gpu/drm/vboxvideo/vbox_ttm.c > index 976423d0c3cc..f5a06675da43 100644 > --- a/drivers/gpu/drm/vboxvideo/vbox_ttm.c > +++ b/drivers/gpu/drm/vboxvideo/vbox_ttm.c > @@ -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); > } >
diff --git a/drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/gpu/drm/vboxvideo/vbox_ttm.c index 976423d0c3cc..f5a06675da43 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_ttm.c +++ b/drivers/gpu/drm/vboxvideo/vbox_ttm.c @@ -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); }