|
@@ -175,6 +175,7 @@ armada_gem_linear_back(struct drm_device *dev, struct armada_gem_object *obj)
|
|
|
|
|
|
obj->phys_addr = obj->linear->start;
|
|
obj->phys_addr = obj->linear->start;
|
|
obj->dev_addr = obj->linear->start;
|
|
obj->dev_addr = obj->linear->start;
|
|
|
|
+ obj->mapped = true;
|
|
}
|
|
}
|
|
|
|
|
|
DRM_DEBUG_DRIVER("obj %p phys %#llx dev %#llx\n", obj,
|
|
DRM_DEBUG_DRIVER("obj %p phys %#llx dev %#llx\n", obj,
|
|
@@ -205,7 +206,6 @@ armada_gem_alloc_private_object(struct drm_device *dev, size_t size)
|
|
return NULL;
|
|
return NULL;
|
|
|
|
|
|
drm_gem_private_object_init(dev, &obj->obj, size);
|
|
drm_gem_private_object_init(dev, &obj->obj, size);
|
|
- obj->dev_addr = DMA_ERROR_CODE;
|
|
|
|
|
|
|
|
DRM_DEBUG_DRIVER("alloc private obj %p size %zu\n", obj, size);
|
|
DRM_DEBUG_DRIVER("alloc private obj %p size %zu\n", obj, size);
|
|
|
|
|
|
@@ -229,8 +229,6 @@ static struct armada_gem_object *armada_gem_alloc_object(struct drm_device *dev,
|
|
return NULL;
|
|
return NULL;
|
|
}
|
|
}
|
|
|
|
|
|
- obj->dev_addr = DMA_ERROR_CODE;
|
|
|
|
-
|
|
|
|
mapping = obj->obj.filp->f_mapping;
|
|
mapping = obj->obj.filp->f_mapping;
|
|
mapping_set_gfp_mask(mapping, GFP_HIGHUSER | __GFP_RECLAIMABLE);
|
|
mapping_set_gfp_mask(mapping, GFP_HIGHUSER | __GFP_RECLAIMABLE);
|
|
|
|
|
|
@@ -610,5 +608,6 @@ int armada_gem_map_import(struct armada_gem_object *dobj)
|
|
return -EINVAL;
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
dobj->dev_addr = sg_dma_address(dobj->sgt->sgl);
|
|
dobj->dev_addr = sg_dma_address(dobj->sgt->sgl);
|
|
|
|
+ dobj->mapped = true;
|
|
return 0;
|
|
return 0;
|
|
}
|
|
}
|