2.6.35 and 2.6.36 do not contain blit support for evergreen asics so if they use unmappable vram, you can end up with an unreachable buffer address. This should not be applied to drm-next as that tree already contains evergreen blit support. This should only be applied to the 2.6.35 and 2.6.36 stable trees.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30188
Signed-off-by: Alex Deucher alexdeucher@gmail.com Cc: stable@kernel.org --- drivers/gpu/drm/radeon/evergreen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 2117cf5..f8c0f15 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1480,6 +1480,8 @@ 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; + /* limit it to the aperture size for now as there is no blit support in 2.6.35/36*/ + rdev->mc.real_vram_size = rdev->mc.visible_vram_size; r600_vram_gtt_location(rdev, &rdev->mc); radeon_update_bandwidth_info(rdev);
I need the ack from the DRM maintainer before I can add a patch to the stable tree that is not upstream in Linus's tree, as it is a major exception to the rule.
David?
On Tue, Oct 12, 2010 at 12:20:31PM -0400, Alex Deucher wrote:
2.6.35 and 2.6.36 do not contain blit support for evergreen asics so if they use unmappable vram, you can end up with an unreachable buffer address. This should not be applied to drm-next as that tree already contains evergreen blit support. This should only be applied to the 2.6.35 and 2.6.36 stable trees.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30188
Signed-off-by: Alex Deucher alexdeucher@gmail.com Cc: stable@kernel.org
drivers/gpu/drm/radeon/evergreen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 2117cf5..f8c0f15 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1480,6 +1480,8 @@ 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;
- /* limit it to the aperture size for now as there is no blit support in 2.6.35/36*/
- rdev->mc.real_vram_size = rdev->mc.visible_vram_size; r600_vram_gtt_location(rdev, &rdev->mc); radeon_update_bandwidth_info(rdev);
-- 1.7.1.1
stable mailing list stable@linux.kernel.org http://linux.kernel.org/mailman/listinfo/stable
On Tue, Oct 19, 2010 at 5:00 PM, Greg KH greg@kroah.com wrote:
I need the ack from the DRM maintainer before I can add a patch to the stable tree that is not upstream in Linus's tree, as it is a major exception to the rule.
A better fix ended up making it into 2.6.36 afterall, so we don't anything for 2.6.36. http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdif...
However, either patch will work for 2.6.35.
Alex
David?
On Tue, Oct 12, 2010 at 12:20:31PM -0400, Alex Deucher wrote:
2.6.35 and 2.6.36 do not contain blit support for evergreen asics so if they use unmappable vram, you can end up with an unreachable buffer address. This should not be applied to drm-next as that tree already contains evergreen blit support. This should only be applied to the 2.6.35 and 2.6.36 stable trees.
Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=30188
Signed-off-by: Alex Deucher alexdeucher@gmail.com Cc: stable@kernel.org
drivers/gpu/drm/radeon/evergreen.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 2117cf5..f8c0f15 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1480,6 +1480,8 @@ 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;
- /* limit it to the aperture size for now as there is no blit support in 2.6.35/36*/
- rdev->mc.real_vram_size = rdev->mc.visible_vram_size;
r600_vram_gtt_location(rdev, &rdev->mc); radeon_update_bandwidth_info(rdev);
-- 1.7.1.1
stable mailing list stable@linux.kernel.org http://linux.kernel.org/mailman/listinfo/stable
On Wed, Oct 20, 2010 at 7:00 AM, Greg KH greg@kroah.com wrote:
I need the ack from the DRM maintainer before I can add a patch to the stable tree that is not upstream in Linus's tree, as it is a major exception to the rule.
David
For 2.6.35
Acked-by: Dave Airlie airlied@redhat.com
for 2.6.36 we are all good.
Dave.
dri-devel@lists.freedesktop.org
-
Alex Deucher -
Dave Airlie -
Greg KH