From patchwork Tue Oct 2 12:20:37 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Florian Zumbiehl X-Patchwork-Id: 1537651 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id A485D40135 for ; Tue, 2 Oct 2012 14:56:43 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 8248CA0AE9 for ; Tue, 2 Oct 2012 07:56:43 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org X-Greylist: delayed 2646 seconds by postgrey-1.32 at gabe; Tue, 02 Oct 2012 15:04:48 CEST Received: from rain.florz.dyndns.org (rain.florz.de [62.216.164.86]) by gabe.freedesktop.org (Postfix) with ESMTP id BD1609E77A for ; Tue, 2 Oct 2012 06:04:48 -0700 (PDT) Received: from florz.florz.dyndns.org ([192.168.0.121]) by rain.florz.dyndns.org with esmtp (Exim 4.69) (envelope-from ) id 1TJ1Sn-0000Yv-8g; Tue, 02 Oct 2012 14:20:37 +0200 Received: from florz by florz.florz.dyndns.org with local (Exim 4.72) (envelope-from ) id 1TJ1Sn-0000ca-0w; Tue, 02 Oct 2012 14:20:37 +0200 Date: Tue, 2 Oct 2012 14:20:37 +0200 From: Florian Zumbiehl To: airlied@redhat.com Subject: [PATCH] drm/savage: re-add busmaster enable, regression fix Message-ID: <20121002122036.GN1162@florz.florz.dyndns.org> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.20 (2009-06-14) X-Mailman-Approved-At: Tue, 02 Oct 2012 07:55:20 -0700 Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , 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 466e69b8b03b8c1987367912782bc12988ad8794 dropped busmaster enable from the global drm code and moved it to the individual drivers, but missed the savage driver. So, this re-adds busmaster enable to the savage driver, fixing the regression. Signed-off-by: Florian Zumbiehl Reviewed-by: Alex Deucher diff --git a/drivers/gpu/drm/savage/savage_bci.c b/drivers/gpu/drm/savage/savage_bci.c index 6eb507a..7d3f0f0 100644 --- a/drivers/gpu/drm/savage/savage_bci.c +++ b/drivers/gpu/drm/savage/savage_bci.c @@ -547,6 +547,8 @@ int savage_driver_load(struct drm_device *dev, unsigned long chipset) dev_priv->chipset = (enum savage_family)chipset; + pci_set_master(dev->pdev); + return 0; }