From patchwork Sun Aug 4 11:12:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mark Kettenis X-Patchwork-Id: 2838407 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 806149F485 for ; Sun, 4 Aug 2013 11:12:36 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id BA65820160 for ; Sun, 4 Aug 2013 11:12:35 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8FCEC2015E for ; Sun, 4 Aug 2013 11:12:34 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 5C8D3E6D3B for ; Sun, 4 Aug 2013 04:12:34 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from glazunov.sibelius.xs4all.nl (sibelius.xs4all.nl [83.163.83.176]) by gabe.freedesktop.org (Postfix) with ESMTP id E33AAE5F35 for ; Sun, 4 Aug 2013 04:12:22 -0700 (PDT) Received: from glazunov.sibelius.xs4all.nl (kettenis@localhost [127.0.0.1]) by glazunov.sibelius.xs4all.nl (8.14.5/8.14.3) with ESMTP id r74BCLQT012434 for ; Sun, 4 Aug 2013 13:12:21 +0200 (CEST) Received: (from kettenis@localhost) by glazunov.sibelius.xs4all.nl (8.14.5/8.14.3/Submit) id r74BCKkg028119; Sun, 4 Aug 2013 13:12:20 +0200 (CEST) Date: Sun, 4 Aug 2013 13:12:20 +0200 (CEST) Message-Id: <201308041112.r74BCKkg028119@glazunov.sibelius.xs4all.nl> From: Mark Kettenis To: dri-devel@lists.freedesktop.org Subject: [PATCH] drm/radeon: program the MC if loading firmware fails on ARUBA 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 X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 Failure to load the firmwares on ARUBA isn't considered fatal. However modesetting doesn't quite work in that case. On an HP Pavillion Sleekbook 15 with A4-4335M APU, I end up with a screen full of garbage. Calling evergreen_mc_program() fixes the issue. Diff below is against the OpenBSD codebase, which corresponds to Linux 3.8.13. Signed-off-by: Mark Kettenis diff --git a/sys/dev/pci/drm/radeon/ni.c b/sys/dev/pci/drm/radeon/ni.c index cebaf8a..1b29475 100644 --- a/sys/dev/pci/drm/radeon/ni.c +++ b/sys/dev/pci/drm/radeon/ni.c @@ -1519,6 +1519,7 @@ static int cayman_startup(struct radeon_device *rdev) r = ni_init_microcode(rdev); if (r) { DRM_ERROR("Failed to load firmware!\n"); + evergreen_mc_program(rdev); return r; } }