[Openchrome-devel] drm-openchrome: Branch 'drm-next-4.13' - 2 commits - drivers/gpu/drm

[Kevin Brace]

 drivers/gpu/drm/openchrome/via_ttm.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 86882dcfa6617ed9b2a419b72abcee9fe8e3afa5
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 11 17:57:42 2017 -0700

    Converting TTM_PL_PRIV0 to TTM_PL_PRIV
    
    This commit is the one commit fb1fe61 should have been.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_ttm.c b/drivers/gpu/drm/openchrome/via_ttm.c
index 2d8b1086af38..a4566a2cf74c 100644
--- a/drivers/gpu/drm/openchrome/via_ttm.c
+++ b/drivers/gpu/drm/openchrome/via_ttm.c
@@ -258,7 +258,7 @@ via_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
 		man->gpu_offset = 0;
 		break;
 
-	case TTM_PL_PRIV0:
+	case TTM_PL_PRIV:
 		/* MMIO region */
 		man->func = &ttm_bo_manager_func;
 		man->flags = TTM_MEMTYPE_FLAG_FIXED | TTM_MEMTYPE_FLAG_MAPPABLE;
@@ -468,7 +468,7 @@ via_bo_move(struct ttm_buffer_object *bo, bool evict, bool interruptible,
 	        && (new_mem->mem_type == TTM_PL_TT))
         || ((old_mem->mem_type == TTM_PL_TT)
             && (new_mem->mem_type == TTM_PL_SYSTEM))
-	    || (new_mem->mem_type == TTM_PL_PRIV0)) {
+	    || (new_mem->mem_type == TTM_PL_PRIV)) {
 		BUG_ON(old_mem->mm_node != NULL);
 		*old_mem = *new_mem;
 		new_mem->mm_node = NULL;
@@ -527,7 +527,7 @@ via_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
 #endif
 		break;
 
-	case TTM_PL_PRIV0:
+	case TTM_PL_PRIV:
 		mem->bus.base = pci_resource_start(dev->pdev, 1);
 		break;
 
@@ -609,7 +609,7 @@ int via_mm_init(struct via_device *dev_priv)
 
     start = (unsigned long long) pci_resource_start(dev->pdev, 1);
     len = pci_resource_len(dev->pdev, 1);
-    ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_PRIV0, len >> PAGE_SHIFT);
+    ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_PRIV, len >> PAGE_SHIFT);
     if (ret) {
         DRM_ERROR("Failed to map MMIO: %d\n", ret);
         goto exit;
@@ -625,7 +625,7 @@ int via_mm_init(struct via_device *dev_priv)
     ret = via_bo_pin(bo, &dev_priv->mmio);
     if (ret) {
         DRM_ERROR("Failed to map a buffer object for MMIO: %d\n", ret);
-        ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_PRIV0);
+        ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_PRIV);
         goto exit;
     }
 
commit 0651d9557f1d6c5d4bb064608d1178c26dca3176
Author: Kevin Brace <kevinbrace at gmx.com>
Date:   Fri Aug 11 17:52:48 2017 -0700

    Reversing commit fb1fe61
    
    This commit was a bad commit.
    
    Signed-off-by: Kevin Brace <kevinbrace at gmx.com>

diff --git a/drivers/gpu/drm/openchrome/via_ttm.c b/drivers/gpu/drm/openchrome/via_ttm.c
index 2bbc7ce06a87..2d8b1086af38 100644
--- a/drivers/gpu/drm/openchrome/via_ttm.c
+++ b/drivers/gpu/drm/openchrome/via_ttm.c
@@ -258,7 +258,7 @@ via_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
 		man->gpu_offset = 0;
 		break;
 
-	case TTM_PL_FLAG_PRIV:
+	case TTM_PL_PRIV0:
 		/* MMIO region */
 		man->func = &ttm_bo_manager_func;
 		man->flags = TTM_MEMTYPE_FLAG_FIXED | TTM_MEMTYPE_FLAG_MAPPABLE;
@@ -468,7 +468,7 @@ via_bo_move(struct ttm_buffer_object *bo, bool evict, bool interruptible,
 	        && (new_mem->mem_type == TTM_PL_TT))
         || ((old_mem->mem_type == TTM_PL_TT)
             && (new_mem->mem_type == TTM_PL_SYSTEM))
-	    || (new_mem->mem_type == TTM_PL_FLAG_PRIV)) {
+	    || (new_mem->mem_type == TTM_PL_PRIV0)) {
 		BUG_ON(old_mem->mm_node != NULL);
 		*old_mem = *new_mem;
 		new_mem->mm_node = NULL;
@@ -527,7 +527,7 @@ via_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
 #endif
 		break;
 
-	case TTM_PL_FLAG_PRIV:
+	case TTM_PL_PRIV0:
 		mem->bus.base = pci_resource_start(dev->pdev, 1);
 		break;
 
@@ -609,7 +609,7 @@ int via_mm_init(struct via_device *dev_priv)
 
     start = (unsigned long long) pci_resource_start(dev->pdev, 1);
     len = pci_resource_len(dev->pdev, 1);
-    ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_FLAG_PRIV, len >> PAGE_SHIFT);
+    ret = ttm_bo_init_mm(&dev_priv->bdev, TTM_PL_PRIV0, len >> PAGE_SHIFT);
     if (ret) {
         DRM_ERROR("Failed to map MMIO: %d\n", ret);
         goto exit;
@@ -625,7 +625,7 @@ int via_mm_init(struct via_device *dev_priv)
     ret = via_bo_pin(bo, &dev_priv->mmio);
     if (ret) {
         DRM_ERROR("Failed to map a buffer object for MMIO: %d\n", ret);
-        ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_FLAG_PRIV);
+        ttm_bo_clean_mm(&dev_priv->bdev, TTM_PL_PRIV0);
         goto exit;
     }