From patchwork Wed May 29 16:24:25 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 2631201 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 91BAF3FC23 for ; Wed, 29 May 2013 16:24:59 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 98DCBE6490 for ; Wed, 29 May 2013 09:24:59 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qc0-f181.google.com (mail-qc0-f181.google.com [209.85.216.181]) by gabe.freedesktop.org (Postfix) with ESMTP id 82BE8E6490 for ; Wed, 29 May 2013 09:24:32 -0700 (PDT) Received: by mail-qc0-f181.google.com with SMTP id u11so4804884qcx.26 for ; Wed, 29 May 2013 09:24:31 -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:x-mailer:in-reply-to:references; bh=YsVZgRxEdqnmeMtW6+xEfYCKr+37mKAGkjy2bXCS954=; b=RXAzkvSjd3+Fn537qhaFJrPHa+BvuJ21emlCCfSdAN2zUWYYYokHh9g5lJ0AOCIwO6 T6/3mgvrlzpDT7QYqD32OoNtWwsFwOu74EF/9S1El9xeOu1duGrmLfq1cAcpULkmVXD6 RqYU9gQd97RDQtNuXDX22XoXOVI+Lo8bbVxBRDs50MDwL+wy9fvvFKrBndhF8qkQL/wY XP44/sGA6hgdzy7vgENhn51RPdLcI2on+NK0eOrvpR+RHfOfaVvSW4ozgLLs9L7Y55I3 4Q8b8mv61XnsXSkx3y2zptDAB9J1G0xR3+C2+rVPH6k1HA9VRzRV3xFgKYGFRPxJUN88 a/iQ== X-Received: by 10.224.68.10 with SMTP id t10mr3782273qai.24.1369844671924; Wed, 29 May 2013 09:24:31 -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 y1sm32279229qad.5.2013.05.29.09.24.30 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Wed, 29 May 2013 09:24:31 -0700 (PDT) From: alexdeucher@gmail.com To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: narrow scope of Apple re-POST hack Date: Wed, 29 May 2013 12:24:25 -0400 Message-Id: <1369844665-13838-1-git-send-email-alexdeucher@gmail.com> X-Mailer: git-send-email 1.7.7.5 In-Reply-To: <1369244301-25974-1-git-send-email-alexdeucher@gmail.com> References: <1369244301-25974-1-git-send-email-alexdeucher@gmail.com> Cc: Alex Deucher , Matthew Garrett 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: , 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 From: Alex Deucher This narrows the scope of the apple re-POST hack added in: drm/radeon: re-POST the asic on Apple hardware when booted via EFI That patch prevents UVD from working on macs when booted in EFI mode. The original patch fixed macbook2,1 systems which were r5xx and hence have no UVD. Limit the hack to those systems to prevent UVD breakage on newer systems. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=63935 Cc: Matthew Garrett Signed-off-by: Alex Deucher Acked-by: Matthew Garrett --- drivers/gpu/drm/radeon/radeon_device.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index af82c9b..1899738 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -467,8 +467,10 @@ bool radeon_card_posted(struct radeon_device *rdev) { uint32_t reg; + /* required for EFI mode on macbook2,1 which uses an r5xx asic */ if (efi_enabled(EFI_BOOT) && - rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) + (rdev->pdev->subsystem_vendor == PCI_VENDOR_ID_APPLE) && + (rdev->family < CHIP_R600)) return false; if (ASIC_IS_NODCE(rdev))