b0e40e0805
VRAM MM and GEM VRAM buffer objects are only used with each other; connected via 3 function pointers. Simplify this code by making the memory manager call the rsp. functions of the BOs directly; and remove the functions from the BO's public interface. v2: * typos in commit message Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20190911110910.30698-3-tzimmermann@suse.de
49 lines
1.2 KiB
C
49 lines
1.2 KiB
C
// SPDX-License-Identifier: MIT
|
|
/*
|
|
* Copyright (C) 2013-2017 Oracle Corporation
|
|
* This file is based on ast_ttm.c
|
|
* Copyright 2012 Red Hat Inc.
|
|
* Authors: Dave Airlie <airlied@redhat.com>
|
|
* Michael Thayer <michael.thayer@oracle.com>
|
|
*/
|
|
#include <linux/pci.h>
|
|
#include <drm/drm_file.h>
|
|
#include "vbox_drv.h"
|
|
|
|
int vbox_mm_init(struct vbox_private *vbox)
|
|
{
|
|
struct drm_vram_mm *vmm;
|
|
int ret;
|
|
struct drm_device *dev = &vbox->ddev;
|
|
|
|
vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(dev->pdev, 0),
|
|
vbox->available_vram_size);
|
|
if (IS_ERR(vmm)) {
|
|
ret = PTR_ERR(vmm);
|
|
DRM_ERROR("Error initializing VRAM MM; %d\n", ret);
|
|
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);
|
|
}
|