updated to use drmm_vram_helper_init().
Signed-off-by: Tian Tao tiantao6@hisilicon.com --- drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/gpu/drm/vboxvideo/vbox_ttm.c index 0066a3c..fd8a53a 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_ttm.c +++ b/drivers/gpu/drm/vboxvideo/vbox_ttm.c @@ -12,15 +12,13 @@
int vbox_mm_init(struct vbox_private *vbox) { - struct drm_vram_mm *vmm; int ret; struct drm_device *dev = &vbox->ddev; struct pci_dev *pdev = to_pci_dev(dev->dev);
- vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0), + ret = drmm_vram_helper_init(dev, pci_resource_start(pdev, 0), vbox->available_vram_size); - if (IS_ERR(vmm)) { - ret = PTR_ERR(vmm); + if (ret) { DRM_ERROR("Error initializing VRAM MM; %d\n", ret); return ret; } @@ -33,5 +31,4 @@ int vbox_mm_init(struct vbox_private *vbox) void vbox_mm_fini(struct vbox_private *vbox) { arch_phys_wc_del(vbox->fb_mtrr); - drm_vram_helper_release_mm(&vbox->ddev); }
On Wed, Mar 03, 2021 at 09:39:46AM +0800, Tian Tao wrote:
updated to use drmm_vram_helper_init().
Signed-off-by: Tian Tao tiantao6@hisilicon.com
Hans, do you plan to pick this up? -Daniel
drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/gpu/drm/vboxvideo/vbox_ttm.c index 0066a3c..fd8a53a 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_ttm.c +++ b/drivers/gpu/drm/vboxvideo/vbox_ttm.c @@ -12,15 +12,13 @@
int vbox_mm_init(struct vbox_private *vbox) {
struct drm_vram_mm *vmm; int ret; struct drm_device *dev = &vbox->ddev; struct pci_dev *pdev = to_pci_dev(dev->dev);
vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0),
- ret = drmm_vram_helper_init(dev, pci_resource_start(pdev, 0), vbox->available_vram_size);
- if (IS_ERR(vmm)) {
ret = PTR_ERR(vmm);
- if (ret) { DRM_ERROR("Error initializing VRAM MM; %d\n", ret); return ret; }
@@ -33,5 +31,4 @@ int vbox_mm_init(struct vbox_private *vbox) void vbox_mm_fini(struct vbox_private *vbox) { arch_phys_wc_del(vbox->fb_mtrr);
- drm_vram_helper_release_mm(&vbox->ddev);
}
2.7.4
Hi,
On 3/11/21 2:11 PM, Daniel Vetter wrote:
On Wed, Mar 03, 2021 at 09:39:46AM +0800, Tian Tao wrote:
updated to use drmm_vram_helper_init().
Signed-off-by: Tian Tao tiantao6@hisilicon.com
Hans, do you plan to pick this up?
The drm patch-workflow falls outside my daily kernel-work workflow, so it is always a bit of a task-switch for me to switch to dealing with the "dim" workflow. ATM I don't have any other drm work pending, so I would appreciate it if someone else can pick this up.
The change does look good to me:
Reviewed-by: Hans de Goede hdegoede@redhat.com
Regards,
Hans
-Daniel
drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/gpu/drm/vboxvideo/vbox_ttm.c index 0066a3c..fd8a53a 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_ttm.c +++ b/drivers/gpu/drm/vboxvideo/vbox_ttm.c @@ -12,15 +12,13 @@
int vbox_mm_init(struct vbox_private *vbox) {
struct drm_vram_mm *vmm; int ret; struct drm_device *dev = &vbox->ddev; struct pci_dev *pdev = to_pci_dev(dev->dev);
vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0),
- ret = drmm_vram_helper_init(dev, pci_resource_start(pdev, 0), vbox->available_vram_size);
- if (IS_ERR(vmm)) {
ret = PTR_ERR(vmm);
- if (ret) { DRM_ERROR("Error initializing VRAM MM; %d\n", ret); return ret; }
@@ -33,5 +31,4 @@ int vbox_mm_init(struct vbox_private *vbox) void vbox_mm_fini(struct vbox_private *vbox) { arch_phys_wc_del(vbox->fb_mtrr);
- drm_vram_helper_release_mm(&vbox->ddev);
}
2.7.4
On Thu, Mar 11, 2021 at 02:13:57PM +0100, Hans de Goede wrote:
Hi,
On 3/11/21 2:11 PM, Daniel Vetter wrote:
On Wed, Mar 03, 2021 at 09:39:46AM +0800, Tian Tao wrote:
updated to use drmm_vram_helper_init().
Signed-off-by: Tian Tao tiantao6@hisilicon.com
Hans, do you plan to pick this up?
The drm patch-workflow falls outside my daily kernel-work workflow, so it is always a bit of a task-switch for me to switch to dealing with the "dim" workflow. ATM I don't have any other drm work pending, so I would appreciate it if someone else can pick this up.
The change does look good to me:
Reviewed-by: Hans de Goede hdegoede@redhat.com
I'll push, thanks for reviewing. -Daniel
Regards,
Hans
-Daniel
drivers/gpu/drm/vboxvideo/vbox_ttm.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/drivers/gpu/drm/vboxvideo/vbox_ttm.c b/drivers/gpu/drm/vboxvideo/vbox_ttm.c index 0066a3c..fd8a53a 100644 --- a/drivers/gpu/drm/vboxvideo/vbox_ttm.c +++ b/drivers/gpu/drm/vboxvideo/vbox_ttm.c @@ -12,15 +12,13 @@
int vbox_mm_init(struct vbox_private *vbox) {
struct drm_vram_mm *vmm; int ret; struct drm_device *dev = &vbox->ddev; struct pci_dev *pdev = to_pci_dev(dev->dev);
vmm = drm_vram_helper_alloc_mm(dev, pci_resource_start(pdev, 0),
- ret = drmm_vram_helper_init(dev, pci_resource_start(pdev, 0), vbox->available_vram_size);
- if (IS_ERR(vmm)) {
ret = PTR_ERR(vmm);
- if (ret) { DRM_ERROR("Error initializing VRAM MM; %d\n", ret); return ret; }
@@ -33,5 +31,4 @@ int vbox_mm_init(struct vbox_private *vbox) void vbox_mm_fini(struct vbox_private *vbox) { arch_phys_wc_del(vbox->fb_mtrr);
- drm_vram_helper_release_mm(&vbox->ddev);
}
2.7.4
dri-devel@lists.freedesktop.org