From patchwork Wed Jul 16 17:26:34 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 4568621 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 45E5AC0514 for ; Wed, 16 Jul 2014 17:26:45 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 8723C201C0 for ; Wed, 16 Jul 2014 17:26:44 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 99236201BA for ; Wed, 16 Jul 2014 17:26:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 1F9A86E003; Wed, 16 Jul 2014 10:26:42 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f169.google.com (mail-qc0-f169.google.com [209.85.216.169]) by gabe.freedesktop.org (Postfix) with ESMTP id A33FB6E003 for ; Wed, 16 Jul 2014 10:26:40 -0700 (PDT) Received: by mail-qc0-f169.google.com with SMTP id m20so1079216qcx.28 for ; Wed, 16 Jul 2014 10:26:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id; bh=ZiW0juXpxO47rW8KR4ruaAaS1hHW081XOkN0DbrQHBk=; b=ID5gF4oWE0pOy0dkM6vU6NXBKqaBfEXtVb/L+0zxexKb3lG6HnFmggMDhPkSZLB3eN p5TkSH9wvDco8p9xITdRoDJeGIA5T/aq79NjZAEVw1VPk7HqZoN6vDy3pWVLpuQrWODi BA3edQEoz0yCag1KtPlHI3zpxRn0CqnB/h49CK1Wh7MbdQhc/D7rnTtx86CfFkxbYyji Q6zH9z12UC+xvAIfj2uk7OHQ9NGBxHHR+N0iPS7UahC6VohyKjqmniW+xAQ3U7DzbAS8 AcneRVQbCOUOmmfwmPW0YmseZqR0d9PJHICv5v488AQrjgAQeH0TIEjwBz0+YmixoUCn 3eTw== X-Received: by 10.140.107.131 with SMTP id h3mr32255907qgf.83.1405531599969; Wed, 16 Jul 2014 10:26:39 -0700 (PDT) Received: from localhost.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by mx.google.com with ESMTPSA id 98sm17938383qgh.5.2014.07.16.10.26.39 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Jul 2014 10:26:39 -0700 (PDT) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: remove visible vram size limit on bo allocation Date: Wed, 16 Jul 2014 13:26:34 -0400 Message-Id: <1405531594-25297-1-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 1.8.3.1 Cc: Alex Deucher X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Now that fallback to gtt is fixed for cpu access, we can remove this limit. Signed-off-by: Alex Deucher Reviewed-by: Christian König --- drivers/gpu/drm/radeon/radeon_gem.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index fdd189b..07a13c9 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -55,8 +55,11 @@ int radeon_gem_object_create(struct radeon_device *rdev, int size, alignment = PAGE_SIZE; } - /* maximun bo size is the minimun btw visible vram and gtt size */ - max_size = min(rdev->mc.visible_vram_size, rdev->mc.gtt_size); + /* Maximum bo size is the gtt size since we use the gtt to handle + * vram to system pool migrations. We could probably remove this + * check altogether with a little additional work. + */ + max_size = rdev->mc.gtt_size; if (size > max_size) { DRM_DEBUG("Allocation size %dMb bigger than %ldMb limit\n", size >> 20, max_size >> 20);