From patchwork Thu Feb 12 20:30:26 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ross Zwisler X-Patchwork-Id: 5822741 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.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 8C23BBF440 for ; Fri, 13 Feb 2015 00:42:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B6C4D2021A for ; Fri, 13 Feb 2015 00:42:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8B9A920256 for ; Fri, 13 Feb 2015 00:41:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 264C1720CF; Thu, 12 Feb 2015 16:41:58 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by gabe.freedesktop.org (Postfix) with ESMTP id 356D6720C5 for ; Thu, 12 Feb 2015 12:30:33 -0800 (PST) Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP; 12 Feb 2015 12:23:21 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.09,566,1418112000"; d="scan'208";a="651414951" Received: from theros.lm.intel.com ([10.232.112.168]) by orsmga001.jf.intel.com with ESMTP; 12 Feb 2015 12:30:31 -0800 From: Ross Zwisler To: linux-kernel@vger.kernel.org Subject: [PATCH] drm/radeon: Fix regression with suspend/resume Date: Thu, 12 Feb 2015 13:30:26 -0700 Message-Id: <1423773026-5941-1-git-send-email-ross.zwisler@linux.intel.com> X-Mailer: git-send-email 1.9.3 MIME-Version: 1.0 X-Mailman-Approved-At: Thu, 12 Feb 2015 16:41:51 -0800 Cc: dri-devel@lists.freedesktop.org, Alex Deucher , Dave Airlie , Ross Zwisler , Lauri Kasanen , =?UTF-8?q?Christian=20K=C3=B6nig?= X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, T_RP_MATCHES_RCVD, 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 This patch reverts the changes made in this commit: deadcb36f49b ("drm/radeon: Use two-ended allocation by size, v2") That patch caused a regression on my system where the bottom of the screen flickers after my laptop goes thorough a suspend and resume. This is reproducible 100% of the time. This patch applies cleanly to v3.19, and fixes the screen flicker issue on my system. Here is the hardware that I'm using (from lspci): 01:00.0 VGA compatible controller: Advanced Micro Devices, Inc. [AMD/ATI] Seymour [Radeon HD 6400M/7400M Series] Signed-off-by: Ross Zwisler Cc: Lauri Kasanen Cc: "Christian König" Cc: Dave Airlie Cc: Alex Deucher Cc: dri-devel@lists.freedesktop.org --- drivers/gpu/drm/radeon/radeon_object.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index 86fc564..dea1baf 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -173,17 +173,6 @@ void radeon_ttm_placement_from_domain(struct radeon_bo *rbo, u32 domain) else rbo->placements[i].lpfn = 0; } - - /* - * Use two-ended allocation depending on the buffer size to - * improve fragmentation quality. - * 512kb was measured as the most optimal number. - */ - if (rbo->tbo.mem.size > 512 * 1024) { - for (i = 0; i < c; i++) { - rbo->placements[i].flags |= TTM_PL_FLAG_TOPDOWN; - } - } } int radeon_bo_create(struct radeon_device *rdev,