diff options
| author | Jerome Glisse <jglisse@redhat.com> | 2010-08-16 11:54:36 -0400 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-08-20 08:43:06 +1000 |
| commit | 2cbeb4efc2b9739fe6019b613ae658bd2119a3eb (patch) | |
| tree | 2b4af7ef508dd2d8395a9d9adba004c4df76cdb5 /drivers/gpu/drm | |
| parent | 1b2f1489633888d4a06028315dc19d65768a1c05 (diff) | |
| download | blackbird-op-linux-2cbeb4efc2b9739fe6019b613ae658bd2119a3eb.tar.gz blackbird-op-linux-2cbeb4efc2b9739fe6019b613ae658bd2119a3eb.zip | |
drm/radeon/kms: fix GTT/VRAM overlapping test
GTT/VRAM overlapping test had a typo which leaded to not
detecting case when vram_end > gtt_end. This patch fix the
logic and should fix #16574
Signed-off-by: Jerome Glisse <jglisse@redhat.com>
Cc: stable@kernel.org
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm')
| -rw-r--r-- | drivers/gpu/drm/radeon/radeon_device.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index 4f7a170d1566..69b3c2291e92 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -199,7 +199,7 @@ void radeon_vram_location(struct radeon_device *rdev, struct radeon_mc *mc, u64 mc->mc_vram_size = mc->aper_size; } mc->vram_end = mc->vram_start + mc->mc_vram_size - 1; - if (rdev->flags & RADEON_IS_AGP && mc->vram_end > mc->gtt_start && mc->vram_end <= mc->gtt_end) { + if (rdev->flags & RADEON_IS_AGP && mc->vram_end > mc->gtt_start && mc->vram_start <= mc->gtt_end) { dev_warn(rdev->dev, "limiting VRAM to PCI aperture size\n"); mc->real_vram_size = mc->aper_size; mc->mc_vram_size = mc->aper_size; |
