[Openchrome-devel] drm-openchrome: 5 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Jan 27 19:14:26 UTC 2017
drivers/gpu/drm/via/via_crtc.c | 2 +-
drivers/gpu/drm/via/via_drv.c | 10 +++++-----
drivers/gpu/drm/via/via_drv.h | 6 +++---
drivers/gpu/drm/via/via_fence.c | 2 +-
drivers/gpu/drm/via/via_ttm.c | 6 +++---
5 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit 3dbe4ef8c574eda3913689dfacc68ea51710b257
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jan 27 13:12:35 2017 -0600
Version bumped to 3.0.22
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 97d8acd..5cf7549 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -30,11 +30,11 @@
#define DRIVER_AUTHOR "The OpenChrome Project"
#define DRIVER_NAME "via"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20170124"
+#define DRIVER_DATE "20170127"
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 0
-#define DRIVER_PATCHLEVEL 21
+#define DRIVER_PATCHLEVEL 22
#include <linux/module.h>
commit 6e09e5e2413c3e36eb5289e71548b8e44e5e7717
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jan 27 13:11:41 2017 -0600
Renamed ttm_buffer_object_destroy as via_ttm_bo_destroy
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c
index 7225225..debc759 100644
--- a/drivers/gpu/drm/via/via_ttm.c
+++ b/drivers/gpu/drm/via/via_ttm.c
@@ -97,7 +97,7 @@ via_ttm_global_release(struct drm_global_reference *global_ref,
}
static void
-ttm_buffer_object_destroy(struct ttm_buffer_object *bo)
+via_ttm_bo_destroy(struct ttm_buffer_object *bo)
{
struct ttm_heap *heap = container_of(bo, struct ttm_heap, pbo);
@@ -715,7 +715,7 @@ via_bo_create(struct ttm_bo_device *bdev,
ret = ttm_bo_init(bdev, bo, size, origin, &placement,
page_align >> PAGE_SHIFT,
interruptible, NULL, acc_size,
- sg, NULL, ttm_buffer_object_destroy);
+ sg, NULL, via_ttm_bo_destroy);
if (unlikely(ret)) {
DRM_ERROR("Failed to initialize a TTM Buffer Object.");
commit f1a3f7269269c57101eb2a08f6f18b635c1a2a0c
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jan 27 13:06:08 2017 -0600
Calling via_mmio_setup from via_device_init
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 722bdd6..b9e2c5b 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -250,6 +250,8 @@ via_device_init(struct via_device *dev_priv)
goto exit;
}
+ via_mmio_setup(dev_priv);
+
exit:
DRM_DEBUG("Exiting via_device_init.\n");
return ret;
@@ -343,8 +345,6 @@ via_driver_load(struct drm_device *dev, unsigned long chipset)
goto init_error;
}
- via_mmio_setup(dev_priv);
-
chip_revision_info(dev);
#if __OS_HAS_AGP
commit c9bf9b376cb217f1943b8c395416debdf4c035f9
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jan 27 13:04:15 2017 -0600
Changing via_mmio_setup argument
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 235bbcd..722bdd6 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -122,7 +122,7 @@ static void via_agp_engine_init(struct via_device *dev_priv)
#endif
static void
-via_mmio_setup(struct drm_device *dev)
+via_mmio_setup(struct via_device *dev_priv)
{
void __iomem *regs = ioport_map(0x3c0, 100);
u8 val;
@@ -343,7 +343,7 @@ via_driver_load(struct drm_device *dev, unsigned long chipset)
goto init_error;
}
- via_mmio_setup(dev);
+ via_mmio_setup(dev_priv);
chip_revision_info(dev);
commit 410298ad48e5cf1052ad41cfaf39c459b682d5bd
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Jan 27 12:57:44 2017 -0600
Renaming ttm_allocate_kernel_buffer as via_ttm_allocate_kernel_buffer
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index ef0a729..3a496f7 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -1965,7 +1965,7 @@ via_crtc_init(struct drm_device *dev, int index)
|| dev->pdev->device == PCI_DEVICE_ID_VIA_KM400)
cursor_size = 32 * 32 * 4;
- if (ttm_allocate_kernel_buffer(&dev_priv->bdev, cursor_size, 16,
+ if (via_ttm_allocate_kernel_buffer(&dev_priv->bdev, cursor_size, 16,
TTM_PL_FLAG_VRAM, &iga->cursor_kmap))
DRM_ERROR("failed to create cursor\n");
}
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 5f72023..235bbcd 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -359,7 +359,7 @@ via_driver_load(struct drm_device *dev, unsigned long chipset)
#endif
if (pci_is_pcie(dev->pdev)) {
/* Allocate GART. */
- ret = ttm_allocate_kernel_buffer(&dev_priv->bdev, SGDMA_MEMORY,
+ ret = via_ttm_allocate_kernel_buffer(&dev_priv->bdev, SGDMA_MEMORY,
16, TTM_PL_FLAG_VRAM,
&dev_priv->gart);
if (likely(!ret)) {
@@ -371,7 +371,7 @@ via_driver_load(struct drm_device *dev, unsigned long chipset)
}
/* Allocate VQ. (Virtual Queue) */
- ret = ttm_allocate_kernel_buffer(&dev_priv->bdev, VQ_MEMORY, 16,
+ ret = via_ttm_allocate_kernel_buffer(&dev_priv->bdev, VQ_MEMORY, 16,
TTM_PL_FLAG_VRAM, &dev_priv->vq);
if (likely(!ret)) {
DRM_INFO("Allocated %u KB of VQ (Virtual Queue) memory.\n", VQ_MEMORY >> 10);
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index d89f802..97d8acd 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -249,7 +249,7 @@ extern int via_bo_create(struct ttm_bo_device *bdev, unsigned long size,
struct ttm_buffer_object **p_bo);
extern int via_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
extern int via_bo_unpin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
-extern int ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
+extern int via_ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
uint32_t alignment, uint32_t domain,
struct ttm_bo_kmap_obj *kmap);
diff --git a/drivers/gpu/drm/via/via_fence.c b/drivers/gpu/drm/via/via_fence.c
index 379e3ce..de91ae4 100644
--- a/drivers/gpu/drm/via/via_fence.c
+++ b/drivers/gpu/drm/via/via_fence.c
@@ -202,7 +202,7 @@ via_fence_pool_init(struct drm_device *dev, char *name, int domain,
return ERR_PTR(-ENOMEM);
/* allocate fence sync bo */
- ret = ttm_allocate_kernel_buffer(&dev_priv->bdev, PAGE_SIZE, 16,
+ ret = via_ttm_allocate_kernel_buffer(&dev_priv->bdev, PAGE_SIZE, 16,
domain, &pool->fence_sync);
if (unlikely(ret)) {
DRM_ERROR("allocate fence sync bo error.\n");
diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c
index 9a6bfdf..7225225 100644
--- a/drivers/gpu/drm/via/via_ttm.c
+++ b/drivers/gpu/drm/via/via_ttm.c
@@ -775,7 +775,7 @@ via_bo_unpin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap)
}
int
-ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
+via_ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
uint32_t alignment, uint32_t domain,
struct ttm_bo_kmap_obj *kmap)
{
More information about the Openchrome-devel
mailing list