drivers/gpu/drm/via/init_ttm.c | 14 +++++++------- drivers/gpu/drm/via/via_drv.c | 2 +- drivers/gpu/drm/via/via_drv.h | 2 +- drivers/gpu/drm/via/via_mem.h | 4 ++-- drivers/gpu/drm/via/via_ttm.c | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-)
New commits: commit 556a8efe1cb40b14255fccdf66d418208a0dec84 Author: Kevin Brace <kevinbr...@gmx.com> Date: Tue Jan 17 10:13:40 2017 -0600 Version bumped to 3.0.12 Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h index 85219a7..3ac41dc 100644 --- a/drivers/gpu/drm/via/via_drv.h +++ b/drivers/gpu/drm/via/via_drv.h @@ -31,7 +31,7 @@ #define DRIVER_MAJOR 3 #define DRIVER_MINOR 0 -#define DRIVER_PATCHLEVEL 11 +#define DRIVER_PATCHLEVEL 12 #include <linux/module.h> commit 82af31d218661977b12f71401b4fd9427c77ac3f Author: Kevin Brace <kevinbr...@gmx.com> Date: Tue Jan 17 10:10:52 2017 -0600 Changed ttm_global_fini to via_ttm_global_release Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/via/init_ttm.c b/drivers/gpu/drm/via/init_ttm.c index c291ed9..66bd79a 100644 --- a/drivers/gpu/drm/via/init_ttm.c +++ b/drivers/gpu/drm/via/init_ttm.c @@ -39,7 +39,7 @@ via_ttm_global_mem_release(struct drm_global_reference *ref) } void -ttm_global_fini(struct drm_global_reference *global_ref, +via_ttm_global_release(struct drm_global_reference *global_ref, struct ttm_bo_global_ref *global_bo, struct ttm_bo_device *bdev) { @@ -96,7 +96,7 @@ via_ttm_global_init(struct drm_global_reference *global_ref, DRM_FILE_PAGE_OFFSET, dma32); if (rc) { DRM_ERROR("Error initialising bo driver: %d\n", rc); - ttm_global_fini(global_ref, global_bo, NULL); + via_ttm_global_release(global_ref, global_bo, NULL); } return rc; } diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c index 744b639..63d8d26 100644 --- a/drivers/gpu/drm/via/via_drv.c +++ b/drivers/gpu/drm/via/via_drv.c @@ -303,7 +303,7 @@ static int via_driver_unload(struct drm_device *dev) if (dev_priv->vram_mtrr >= 0) arch_phys_wc_del(dev_priv->vram_mtrr); - ttm_global_fini(&dev_priv->mem_global_ref, + via_ttm_global_release(&dev_priv->mem_global_ref, &dev_priv->bo_global_ref, &dev_priv->bdev); diff --git a/drivers/gpu/drm/via/via_mem.h b/drivers/gpu/drm/via/via_mem.h index 5280a0e..90bf52d 100644 --- a/drivers/gpu/drm/via/via_mem.h +++ b/drivers/gpu/drm/via/via_mem.h @@ -46,7 +46,7 @@ extern int via_ttm_global_init(struct drm_global_reference *global_ref, struct ttm_bo_device *bdev, struct drm_device *dev, bool dma32); -extern void ttm_global_fini(struct drm_global_reference *global_ref, +extern void via_ttm_global_release(struct drm_global_reference *global_ref, struct ttm_bo_global_ref *global_bo, struct ttm_bo_device *bdev); commit 3374c2026718625ada2f6685f56cb6646c3e99a1 Author: Kevin Brace <kevinbr...@gmx.com> Date: Tue Jan 17 10:09:40 2017 -0600 Changed ttm_global_mem_release to via_ttm_global_mem_release Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/via/init_ttm.c b/drivers/gpu/drm/via/init_ttm.c index 6a68a45..c291ed9 100644 --- a/drivers/gpu/drm/via/init_ttm.c +++ b/drivers/gpu/drm/via/init_ttm.c @@ -33,7 +33,7 @@ via_ttm_global_mem_init(struct drm_global_reference *ref) } static void -ttm_global_mem_release(struct drm_global_reference *ref) +via_ttm_global_mem_release(struct drm_global_reference *ref) { ttm_mem_global_release(ref->object); } @@ -67,7 +67,7 @@ via_ttm_global_init(struct drm_global_reference *global_ref, global_ref->global_type = DRM_GLOBAL_TTM_MEM; global_ref->size = sizeof(struct ttm_mem_global); global_ref->init = &via_ttm_global_mem_init; - global_ref->release = &ttm_global_mem_release; + global_ref->release = &via_ttm_global_mem_release; rc = drm_global_item_ref(global_ref); if (unlikely(rc != 0)) { commit 3cf99a2a3ff94b0f6b804e5bd455c9bb2167e7fc Author: Kevin Brace <kevinbr...@gmx.com> Date: Tue Jan 17 10:07:43 2017 -0600 Changed ttm_global_mem_init to via_ttm_global_mem_init Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/via/init_ttm.c b/drivers/gpu/drm/via/init_ttm.c index e0dbeaa..6a68a45 100644 --- a/drivers/gpu/drm/via/init_ttm.c +++ b/drivers/gpu/drm/via/init_ttm.c @@ -27,7 +27,7 @@ #define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT) static int -ttm_global_mem_init(struct drm_global_reference *ref) +via_ttm_global_mem_init(struct drm_global_reference *ref) { return ttm_mem_global_init(ref->object); } @@ -66,7 +66,7 @@ via_ttm_global_init(struct drm_global_reference *global_ref, global_ref->global_type = DRM_GLOBAL_TTM_MEM; global_ref->size = sizeof(struct ttm_mem_global); - global_ref->init = &ttm_global_mem_init; + global_ref->init = &via_ttm_global_mem_init; global_ref->release = &ttm_global_mem_release; rc = drm_global_item_ref(global_ref); commit cdd5b0304fe601229e0d00c5fd631d347ebd5988 Author: Kevin Brace <kevinbr...@gmx.com> Date: Tue Jan 17 10:07:05 2017 -0600 Changed ttm_global_init to via_ttm_global_init Signed-off-by: Kevin Brace <kevinbr...@gmx.com> diff --git a/drivers/gpu/drm/via/init_ttm.c b/drivers/gpu/drm/via/init_ttm.c index a6f041e..e0dbeaa 100644 --- a/drivers/gpu/drm/via/init_ttm.c +++ b/drivers/gpu/drm/via/init_ttm.c @@ -54,7 +54,7 @@ ttm_global_fini(struct drm_global_reference *global_ref, } int -ttm_global_init(struct drm_global_reference *global_ref, +via_ttm_global_init(struct drm_global_reference *global_ref, struct ttm_bo_global_ref *global_bo, struct ttm_bo_driver *driver, struct ttm_bo_device *bdev, diff --git a/drivers/gpu/drm/via/via_mem.h b/drivers/gpu/drm/via/via_mem.h index ce8441f..5280a0e 100644 --- a/drivers/gpu/drm/via/via_mem.h +++ b/drivers/gpu/drm/via/via_mem.h @@ -40,7 +40,7 @@ extern struct ttm_tt * via_sgdma_backend_init(struct ttm_bo_device *bdev, unsigned long size, uint32_t page_flags, struct page *dummy_read_page); -extern int ttm_global_init(struct drm_global_reference *global_ref, +extern int via_ttm_global_init(struct drm_global_reference *global_ref, struct ttm_bo_global_ref *global_bo, struct ttm_bo_driver *driver, struct ttm_bo_device *bdev, diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c index d17d9f2..b0a0976 100644 --- a/drivers/gpu/drm/via/via_ttm.c +++ b/drivers/gpu/drm/via/via_ttm.c @@ -480,7 +480,7 @@ int via_ttm_init(struct drm_device *dev) { struct drm_via_private *dev_priv = dev->dev_private; - int ret = ttm_global_init(&dev_priv->mem_global_ref, + int ret = via_ttm_global_init(&dev_priv->mem_global_ref, &dev_priv->bo_global_ref, &via_bo_driver, &dev_priv->bdev, dev_priv->dev, false); _______________________________________________ Openchrome-devel mailing list Openchrome-devel@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/openchrome-devel