From patchwork Tue Oct 12 16:20:31 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 248481 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id o9CGKrRV003435 for ; Tue, 12 Oct 2010 16:21:14 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 373EC9F081 for ; Tue, 12 Oct 2010 09:20:53 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pz0-f49.google.com (mail-pz0-f49.google.com [209.85.210.49]) by gabe.freedesktop.org (Postfix) with ESMTP id 027249E88B for ; Tue, 12 Oct 2010 09:20:42 -0700 (PDT) Received: by pzk36 with SMTP id 36so21654pzk.36 for ; Tue, 12 Oct 2010 09:20:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:from:to:cc:subject:date :message-id:x-mailer; bh=m/T2gaYODHR52S28hMLRHtTUJKT06dIJFAX+EU7n+Bw=; b=nmi4Imm7Vy6aeK+qDt0/g1MgzGXm0oK+X/FM01J3O1zYSEDjKOCvGeZFVJsEw6YGuw vevkn1c9JmYOF5g2RzpsA95c8k9jpaewTWL6Me6Ll7O0LipExEbHotpqCVFK2ddDDVyN PmR/fGbf5ADuJW/2GsYl84K2ZRiTiyptMamOw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer; b=nPvKmbOIPYqgGlwRU2rH5rff51PTqotyPOAMZ+CTugMyTSH5/CDn5IuRgJPWa26ADL ruoz2YJ3X4Vf5YEtlYUx3P77EXWMM7zV8NSl0QDqVVEf4ZTqBJVP0pgeNz8YufMdxhyQ VWXkz7OG2DFY44djPQEpqoQD+mmDFIXxqp5GQ= Received: by 10.142.109.16 with SMTP id h16mr6173937wfc.166.1286900440620; Tue, 12 Oct 2010 09:20:40 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-7.washdc.fios.verizon.net [74.96.105.7]) by mx.google.com with ESMTPS id l14sm2467883vcr.18.2010.10.12.09.20.38 (version=SSLv3 cipher=RC4-MD5); Tue, 12 Oct 2010 09:20:39 -0700 (PDT) From: Alex Deucher To: airlied@gmail.com, dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon/kms: fix possible sigbus in evergreen accel code Date: Tue, 12 Oct 2010 12:20:31 -0400 Message-Id: <1286900431-7497-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.1.1 Cc: stable@kernel.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Tue, 12 Oct 2010 16:21:14 +0000 (UTC) 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);