[PATCH 13/13] drm/radeon/kms: enable use of unmappable VRAM V2
This patch enable the use of unmappable VRAM thanks to previous TTM infrastructure change. V2 update after io_mem_reserve/io_mem_free callback balancing Signed-off-by: Jerome Glisse jgli...@redhat.com --- drivers/gpu/drm/radeon/evergreen.c |5 - drivers/gpu/drm/radeon/r100.c |5 - drivers/gpu/drm/radeon/r600.c |5 - drivers/gpu/drm/radeon/rv770.c |5 - 4 files changed, 0 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 7672f11..48e0dfb 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -475,11 +475,6 @@ int evergreen_mc_init(struct radeon_device *rdev) rdev-mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024; rdev-mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024; rdev-mc.visible_vram_size = rdev-mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } r600_vram_gtt_location(rdev, rdev-mc); radeon_update_bandwidth_info(rdev); diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 7a4a4fc..f53dd52 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2035,11 +2035,6 @@ void r100_vram_init_sizes(struct radeon_device *rdev) else rdev-mc.mc_vram_size = rdev-mc.real_vram_size; } - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } } void r100_vga_set_state(struct radeon_device *rdev, bool state) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 13c9cc3..fa3c1fe 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -713,11 +713,6 @@ int r600_mc_init(struct radeon_device *rdev) rdev-mc.mc_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.real_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.visible_vram_size = rdev-mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } r600_vram_gtt_location(rdev, rdev-mc); if (rdev-flags RADEON_IS_IGP) diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 2b8a4e1..599121b 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -905,11 +905,6 @@ int rv770_mc_init(struct radeon_device *rdev) rdev-mc.mc_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.real_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.visible_vram_size = rdev-mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } r600_vram_gtt_location(rdev, rdev-mc); radeon_update_bandwidth_info(rdev); -- 1.7.0.1 -- Download Intel#174; Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[PATCH 13/13] drm/radeon/kms: enable use of unmappable VRAM V2
This patch enable the use of unmappable VRAM thanks to previous TTM infrastructure change. V2 update after io_mem_reserve/io_mem_free callback balancing Signed-off-by: Jerome Glisse jgli...@redhat.com --- drivers/gpu/drm/radeon/evergreen.c |5 - drivers/gpu/drm/radeon/r100.c |5 - drivers/gpu/drm/radeon/r600.c |5 - drivers/gpu/drm/radeon/rv770.c |5 - 4 files changed, 0 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 7672f11..48e0dfb 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -475,11 +475,6 @@ int evergreen_mc_init(struct radeon_device *rdev) rdev-mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024; rdev-mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024; rdev-mc.visible_vram_size = rdev-mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } r600_vram_gtt_location(rdev, rdev-mc); radeon_update_bandwidth_info(rdev); diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 7a1180d..fc95907 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2026,11 +2026,6 @@ void r100_vram_init_sizes(struct radeon_device *rdev) else rdev-mc.mc_vram_size = rdev-mc.real_vram_size; } - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } } void r100_vga_set_state(struct radeon_device *rdev, bool state) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index a948947..4206c8d 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -713,11 +713,6 @@ int r600_mc_init(struct radeon_device *rdev) rdev-mc.mc_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.real_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.visible_vram_size = rdev-mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } r600_vram_gtt_location(rdev, rdev-mc); if (rdev-flags RADEON_IS_IGP) diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 2b8a4e1..599121b 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -905,11 +905,6 @@ int rv770_mc_init(struct radeon_device *rdev) rdev-mc.mc_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.real_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.visible_vram_size = rdev-mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } r600_vram_gtt_location(rdev, rdev-mc); radeon_update_bandwidth_info(rdev); -- 1.6.6.1 -- Download Intel#174; Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel
[PATCH 13/13] drm/radeon/kms: enable use of unmappable VRAM V2
This patch enable the use of unmappable VRAM thanks to previous TTM infrastructure change. V2 update after io_mem_reserve/io_mem_free callback balancing Signed-off-by: Jerome Glisse jgli...@redhat.com --- drivers/gpu/drm/radeon/evergreen.c |5 - drivers/gpu/drm/radeon/r100.c |5 - drivers/gpu/drm/radeon/r600.c |5 - drivers/gpu/drm/radeon/rv770.c |5 - 4 files changed, 0 insertions(+), 20 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 7672f11..48e0dfb 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -475,11 +475,6 @@ int evergreen_mc_init(struct radeon_device *rdev) rdev-mc.mc_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024; rdev-mc.real_vram_size = RREG32(CONFIG_MEMSIZE) * 1024 * 1024; rdev-mc.visible_vram_size = rdev-mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } r600_vram_gtt_location(rdev, rdev-mc); radeon_update_bandwidth_info(rdev); diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 7a1180d..fc95907 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2026,11 +2026,6 @@ void r100_vram_init_sizes(struct radeon_device *rdev) else rdev-mc.mc_vram_size = rdev-mc.real_vram_size; } - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } } void r100_vga_set_state(struct radeon_device *rdev, bool state) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index a948947..4206c8d 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -713,11 +713,6 @@ int r600_mc_init(struct radeon_device *rdev) rdev-mc.mc_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.real_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.visible_vram_size = rdev-mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } r600_vram_gtt_location(rdev, rdev-mc); if (rdev-flags RADEON_IS_IGP) diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index 2b8a4e1..599121b 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -905,11 +905,6 @@ int rv770_mc_init(struct radeon_device *rdev) rdev-mc.mc_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.real_vram_size = RREG32(CONFIG_MEMSIZE); rdev-mc.visible_vram_size = rdev-mc.aper_size; - /* FIXME remove this once we support unmappable VRAM */ - if (rdev-mc.mc_vram_size rdev-mc.aper_size) { - rdev-mc.mc_vram_size = rdev-mc.aper_size; - rdev-mc.real_vram_size = rdev-mc.aper_size; - } r600_vram_gtt_location(rdev, rdev-mc); radeon_update_bandwidth_info(rdev); -- 1.6.6.1 -- Download Intel#174; Parallel Studio Eval Try the new software tools for yourself. Speed compiling, find bugs proactively, and fine-tune applications for parallel performance. See why Intel Parallel Studio got high marks during beta. http://p.sf.net/sfu/intel-sw-dev -- ___ Dri-devel mailing list Dri-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/dri-devel