drm/ttm: init mem->bus in common code.
Subsystems (7)
Dave Airlie
maintainerPATCH 1/2 drm/ttm: init mem->bus in common code.
From: Dave Airlie <[email protected]>
The drivers all do the same thing here.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 ------ drivers/gpu/drm/drm_gem_vram_helper.c | 6 ------ drivers/gpu/drm/nouveau/nouveau_bo.c | 6 ------ drivers/gpu/drm/qxl/qxl_ttm.c | 6 ------ drivers/gpu/drm/radeon/radeon_ttm.c | 6 ------ drivers/gpu/drm/ttm/ttm_bo_util.c | 5 +++++ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 6 ------ 7 files changed, 5 insertions(+), 36 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0 -6
@@ -751,12 +751,6 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resostruct amdgpu_device *adev =amdgpu_ttm_adev (bdev);struct drm_mm_node *mm_node = mem->mm_node; - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* system memory */
drivers/gpu/drm/drm_gem_vram_helper.c +0 -6
@@ -1038,14 +1038,8 @@ static int bo_driver_io_mem_reserve(struct ttm_bo_device *bdev, {struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bdev); - mem->bus.addr =NULL ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* nothing to do */ - mem->bus.offset =0 ; - mem->bus.base =0 ; - mem->bus.is_iomem = false;break ;case TTM_PL_VRAM : mem->bus.offset = mem->start <<PAGE_SHIFT ;
drivers/gpu/drm/nouveau/nouveau_bo.c +0 -6
@@ -1380,12 +1380,6 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resource *reg)struct nvkm_device *device =nvxx_device (&drm->client.device);struct nouveau_mem *mem =nouveau_mem (reg); - reg->bus.addr =NULL ; - reg->bus.offset =0 ; - reg->bus.size = reg->num_pages <<PAGE_SHIFT ; - reg->bus.base =0 ; - reg->bus.is_iomem = false; -switch (reg->mem_type) {case TTM_PL_SYSTEM :/* System memory */
drivers/gpu/drm/qxl/qxl_ttm.c +0 -6
@@ -75,12 +75,6 @@ int qxl_ttm_io_mem_reserve(struct ttm_bo_device *bdev, {struct qxl_device *qdev =qxl_get_qdev (bdev); - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* system memory */
drivers/gpu/drm/radeon/radeon_ttm.c +0 -6
@@ -380,12 +380,6 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_reso {struct radeon_device *rdev =radeon_get_rdev (bdev); - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* system memory */
drivers/gpu/drm/ttm/ttm_bo_util.c +5 -0
@@ -138,6 +138,11 @@ int ttm_mem_io_reserve(struct ttm_bo_device *bdev,if (!bdev->driver->io_mem_reserve)return 0 ; + mem->bus.addr =NULL ; + mem->bus.offset =0 ; + mem->bus.size = mem->num_pages <<PAGE_SHIFT ; + mem->bus.base =0 ; + mem->bus.is_iomem = false; retry: ret = bdev->driver->io_mem_reserve (bdev, mem);if (ret == -ENOSPC ) {
drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +0 -6
@@ -717,12 +717,6 @@ static int vmw_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resourc { struct vmw_private *dev_priv = container_of(bdev, struct vmw_private, bdev); - mem->bus.addr =NULL ; - mem->bus.is_iomem = false; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; -switch (mem->mem_type) {case TTM_PL_SYSTEM :case VMW_PL_GMR :
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerPATCH 2/2 drm/ttm: drop bus.size from bus placement.
From: Dave Airlie <[email protected]>
This is always calculated the same, and only used in a couple of places.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 ++- drivers/gpu/drm/radeon/radeon_ttm.c | 7 ++++--- drivers/gpu/drm/ttm/ttm_bo_util.c | 7 ++++--- include/drm/ttm/ttm_bo_api.h | 2 -- 4 files changed, 10 insertions(+), 9 deletions(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +2 -1
@@ -750,6 +750,7 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_reso {struct amdgpu_device *adev =amdgpu_ttm_adev (bdev);struct drm_mm_node *mm_node = mem->mm_node; +size_t bus_size = (size_t )mem->num_pages <<PAGE_SHIFT ;switch (mem->mem_type) {case TTM_PL_SYSTEM :
@@ -760,7 +761,7 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resocase TTM_PL_VRAM : mem->bus.offset = mem->start <<PAGE_SHIFT ;/* check if it's visible */ -if ((mem->bus.offset + mem->bus.size) > adev->gmc.visible_vram_size) +if ((mem->bus.offset + bus_size) > adev->gmc.visible_vram_size)return -EINVAL ;/* Only physically contiguous buffers apply. In a contiguous * buffer, size of the first mm_node would match the number of
drivers/gpu/drm/radeon/radeon_ttm.c +4 -3
@@ -379,6 +379,7 @@ static int radeon_bo_move(struct ttm_buffer_object *bo, bool evict,static int radeon_ttm_io_mem_reserve (struct ttm_bo_device *bdev,struct ttm_resource *mem) {struct radeon_device *rdev =radeon_get_rdev (bdev); +size_t bus_size = (size_t )mem->num_pages <<PAGE_SHIFT ;switch (mem->mem_type) {case TTM_PL_SYSTEM :
@@ -397,7 +398,7 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resocase TTM_PL_VRAM : mem->bus.offset = mem->start <<PAGE_SHIFT ;/* check if it's visible */ -if ((mem->bus.offset + mem->bus.size) > rdev->mc.visible_vram_size) +if ((mem->bus.offset + bus_size) > rdev->mc.visible_vram_size)return -EINVAL ; mem->bus.base = rdev->mc.aper_base; mem->bus.is_iomem = true;
@@ -409,11 +410,11 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resoif (mem->placement &TTM_PL_FLAG_WC ) mem->bus.addr =ioremap_wc (mem->bus.base + mem->bus.offset, - mem->bus.size); + bus_size);else mem->bus.addr =ioremap (mem->bus.base + mem->bus.offset, - mem->bus.size); + bus_size);if (!mem->bus.addr)return -ENOMEM ;
drivers/gpu/drm/ttm/ttm_bo_util.c +4 -3
@@ -140,7 +140,6 @@ int ttm_mem_io_reserve(struct ttm_bo_device *bdev, mem->bus.addr =NULL ; mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; mem->bus.base =0 ; mem->bus.is_iomem = false; retry:
@@ -214,12 +213,14 @@ static int ttm_resource_ioremap(struct ttm_bo_device *bdev,if (mem->bus.addr) { addr = mem->bus.addr; }else { +size_t bus_size = (size_t )mem->num_pages <<PAGE_SHIFT ; +if (mem->placement &TTM_PL_FLAG_WC ) addr =ioremap_wc (mem->bus.base + mem->bus.offset, - mem->bus.size); + bus_size);else addr =ioremap (mem->bus.base + mem->bus.offset, - mem->bus.size); + bus_size);if (!addr) { (void )ttm_mem_io_lock (man, false);ttm_mem_io_free (bdev, mem);
include/drm/ttm/ttm_bo_api.h +0 -2
@@ -62,7 +62,6 @@ struct ttm_resource_manager;* @addr: mapped virtual address * @base: bus base address * @is_iomem: is this io memory ? -* @size: size in byte * @offset: offset from the base address * @io_reserved_vm: The VM system has a refcount in @io_reserved_count * @io_reserved_count: Refcounting the numbers of callers to ttm_mem_io_reserve
@@ -72,7 +71,6 @@ struct ttm_resource_manager;struct ttm_bus_placement {void *addr;phys_addr_t base; -unsigned long size;unsigned long offset;bool is_iomem;bool io_reserved_vm;
Signature · 6 lines
2.27.0 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainer(cc'ing Christian, just in case he misses them). 2 small cleanups.
Quoted 139 lines · Dave Airlie
From: Dave Airlie <[email protected]>
The drivers all do the same thing here.
Signed-off-by Dave Airlie <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 ------ drivers/gpu/drm/drm_gem_vram_helper.c | 6 ------ drivers/gpu/drm/nouveau/nouveau_bo.c | 6 ------ drivers/gpu/drm/qxl/qxl_ttm.c | 6 ------ drivers/gpu/drm/radeon/radeon_ttm.c | 6 ------ drivers/gpu/drm/ttm/ttm_bo_util.c | 5 +++++ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 6 ------ 7 files changed, 5 insertions(+), 36 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-6@@ -751,12 +751,6 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resostruct amdgpu_device *adev =amdgpu_ttm_adev (bdev);struct drm_mm_node *mm_node = mem->mm_node; - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* system memory */ drivers/gpu/drm/drm_gem_vram_helper.c +0
-6@@ -1038,14 +1038,8 @@ static int bo_driver_io_mem_reserve(struct ttm_bo_device *bdev, {struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bdev); - mem->bus.addr =NULL ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* nothing to do */ - mem->bus.offset =0 ; - mem->bus.base =0 ; - mem->bus.is_iomem = false;break ;case TTM_PL_VRAM : mem->bus.offset = mem->start <<PAGE_SHIFT ;drivers/gpu/drm/nouveau/nouveau_bo.c +0
-6@@ -1380,12 +1380,6 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resource *reg)struct nvkm_device *device =nvxx_device (&drm->client.device);struct nouveau_mem *mem =nouveau_mem (reg); - reg->bus.addr =NULL ; - reg->bus.offset =0 ; - reg->bus.size = reg->num_pages <<PAGE_SHIFT ; - reg->bus.base =0 ; - reg->bus.is_iomem = false; -switch (reg->mem_type) {case TTM_PL_SYSTEM :/* System memory */ drivers/gpu/drm/qxl/qxl_ttm.c +0
-6@@ -75,12 +75,6 @@ int qxl_ttm_io_mem_reserve(struct ttm_bo_device *bdev, {struct qxl_device *qdev =qxl_get_qdev (bdev); - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* system memory */ drivers/gpu/drm/radeon/radeon_ttm.c +0
-6@@ -380,12 +380,6 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_reso {struct radeon_device *rdev =radeon_get_rdev (bdev); - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* system memory */ drivers/gpu/drm/ttm/ttm_bo_util.c +5
-0@@ -138,6 +138,11 @@ int ttm_mem_io_reserve(struct ttm_bo_device *bdev,if (!bdev->driver->io_mem_reserve)return 0 ; + mem->bus.addr =NULL ; + mem->bus.offset =0 ; + mem->bus.size = mem->num_pages <<PAGE_SHIFT ; + mem->bus.base =0 ; + mem->bus.is_iomem = false; retry: ret = bdev->driver->io_mem_reserve (bdev, mem);if (ret == -ENOSPC ) {drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +0
-7@@ -717,12 +717,6 @@ static int vmw_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resourc { struct vmw_private *dev_priv = container_of(bdev, struct vmw_private, bdev); - mem->bus.addr =NULL ; - mem->bus.is_iomem = false; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; -switch (mem->mem_type) {case TTM_PL_SYSTEM :case VMW_PL_GMR : --2.27.0
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
I've totally missed those and still don't see any reference in any inbox to the original mail or patch #2 in this series.
But this patch at least looks like it makes a lot of sense.
BTW: Does anybody know why we separate base and offset here? That distinction seems to be superfluous as well.
Christian.
Am 11.08.20 um 10:02 schrieb Dave Airlie:
Quoted 141 lines
(cc'ing Christian, just in case he misses them). 2 small cleanups.
Quoted 138 lines · Dave Airlie
From: Dave Airlie <[email protected]>
The drivers all do the same thing here.
Signed-off-by Dave Airlie <[email protected]>--- drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 6 ------ drivers/gpu/drm/drm_gem_vram_helper.c | 6 ------ drivers/gpu/drm/nouveau/nouveau_bo.c | 6 ------ drivers/gpu/drm/qxl/qxl_ttm.c | 6 ------ drivers/gpu/drm/radeon/radeon_ttm.c | 6 ------ drivers/gpu/drm/ttm/ttm_bo_util.c | 5 +++++ drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 6 ------ 7 files changed, 5 insertions(+), 36 deletions(-)drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +0
-6@@ -751,12 +751,6 @@ static int amdgpu_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resostruct amdgpu_device *adev =amdgpu_ttm_adev (bdev);struct drm_mm_node *mm_node = mem->mm_node; - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* system memory */ drivers/gpu/drm/drm_gem_vram_helper.c +0
-6@@ -1038,14 +1038,8 @@ static int bo_driver_io_mem_reserve(struct ttm_bo_device *bdev, {struct drm_vram_mm *vmm =drm_vram_mm_of_bdev (bdev); - mem->bus.addr =NULL ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* nothing to do */ - mem->bus.offset =0 ; - mem->bus.base =0 ; - mem->bus.is_iomem = false;break ;case TTM_PL_VRAM : mem->bus.offset = mem->start <<PAGE_SHIFT ;drivers/gpu/drm/nouveau/nouveau_bo.c +0
-6@@ -1380,12 +1380,6 @@ nouveau_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resource *reg)struct nvkm_device *device =nvxx_device (&drm->client.device);struct nouveau_mem *mem =nouveau_mem (reg); - reg->bus.addr =NULL ; - reg->bus.offset =0 ; - reg->bus.size = reg->num_pages <<PAGE_SHIFT ; - reg->bus.base =0 ; - reg->bus.is_iomem = false; -switch (reg->mem_type) {case TTM_PL_SYSTEM :/* System memory */ drivers/gpu/drm/qxl/qxl_ttm.c +0
-6@@ -75,12 +75,6 @@ int qxl_ttm_io_mem_reserve(struct ttm_bo_device *bdev, {struct qxl_device *qdev =qxl_get_qdev (bdev); - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* system memory */ drivers/gpu/drm/radeon/radeon_ttm.c +0
-6@@ -380,12 +380,6 @@ static int radeon_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_reso {struct radeon_device *rdev =radeon_get_rdev (bdev); - mem->bus.addr =NULL ; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; - mem->bus.is_iomem = false; -switch (mem->mem_type) {case TTM_PL_SYSTEM :/* system memory */ drivers/gpu/drm/ttm/ttm_bo_util.c +5
-0@@ -138,6 +138,11 @@ int ttm_mem_io_reserve(struct ttm_bo_device *bdev,if (!bdev->driver->io_mem_reserve)return 0 ; + mem->bus.addr =NULL ; + mem->bus.offset =0 ; + mem->bus.size = mem->num_pages <<PAGE_SHIFT ; + mem->bus.base =0 ; + mem->bus.is_iomem = false; retry: ret = bdev->driver->io_mem_reserve (bdev, mem);if (ret == -ENOSPC ) {drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c +0
-7@@ -717,12 +717,6 @@ static int vmw_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_resourc { struct vmw_private *dev_priv = container_of(bdev, struct vmw_private, bdev); - mem->bus.addr =NULL ; - mem->bus.is_iomem = false; - mem->bus.offset =0 ; - mem->bus.size = mem->num_pages <<PAGE_SHIFT ; - mem->bus.base =0 ; -switch (mem->mem_type) {case TTM_PL_SYSTEM :case VMW_PL_GMR : --2.27.0
Quoted 4 lines
Quoted 4 lines
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Dave Airlie
maintainerQuoted 3 lines · Christian König
I've totally missed those and still don't see any reference in any inbox to the original mail or patch #2 in this series.
I forgot to cc you on the original posting, but they should be on dri-devel
https://patchwork.freedesktop.org/series/80517/
Quoted 5 lines
But this patch at least looks like it makes a lot of sense.
BTW: Does anybody know why we separate base and offset here? That distinction seems to be superfluous as well.
I think base is only used for premapped objects,
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel
Am 11.08.20 um 10:49 schrieb Dave Airlie:
Quoted 7 lines
Quoted 2 lines · Christian König
I've totally missed those and still don't see any reference in any inbox to the original mail or patch #2 in this series.
I forgot to cc you on the original posting, but they should be on dri-devel
Quoted 5 lines
Quoted 4 lines
But this patch at least looks like it makes a lot of sense.
BTW: Does anybody know why we separate base and offset here? That distinction seems to be superfluous as well.
I think base is only used for premapped objects,
Yeah, but take a look how it is used. As far as I know we don't have a single case where we don't do "mem->bus.base + mem->bus.offset".
If that's true (needs double checking) then why the heck do we have two fields for this?
Regards,
Christian.
Quoted 2 lines
Dave.
_______________________________________________
dri-devel mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/dri-devel