From patchwork Tue Feb 2 21:36:32 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Deucher X-Patchwork-Id: 8196011 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 BB3D4BEEED for ; Tue, 2 Feb 2016 21:36:53 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id EBE4A20375 for ; Tue, 2 Feb 2016 21:36:52 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id BDCBB201CE for ; Tue, 2 Feb 2016 21:36:51 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 562D389DD5; Tue, 2 Feb 2016 13:36:49 -0800 (PST) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f177.google.com (mail-qk0-f177.google.com [209.85.220.177]) by gabe.freedesktop.org (Postfix) with ESMTPS id B2C9389DBA for ; Tue, 2 Feb 2016 13:36:47 -0800 (PST) Received: by mail-qk0-f177.google.com with SMTP id o6so864299qkc.2 for ; Tue, 02 Feb 2016 13:36:47 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=S5u8GWOCSFsjPsvKrGy4bCT783e3uEhrwpf4vJoY7vs=; b=t+xp1Q98OID6DKd4L/HOnu4AdxnN0jQrhbMXVFQPVLqapNpVDxSVVz6Eo21ioO+p0S nb6exjb6qGsg53/9YlMyv5GlXCW0hDs7FmxspSYvwN4Tgy7o63+EFVw0ZWAiGsmfKTQw O0rYQtnXE+sWyi5+6vvHfIwSip2Q7d3fhdyFDwxEU6eGBlgMPsFSZga3XjG+cIi8plU5 oPGwT6KDqWWvgMu9na0Ihk/SMQJ+kbZnTk3UInTjEF/DFKlH552h5W1NI39I1hNKvCd4 2sgoOBMgrHZIzXfwk9vkznKk72F9O2wRy1TmiYOu5FhAkfzYFDkYMKQbtGE9nROd3bXq d75Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=S5u8GWOCSFsjPsvKrGy4bCT783e3uEhrwpf4vJoY7vs=; b=jbmkuBu5/RENTL6ZSA4k8D3h25bB5wQGQt8EtptsyIpECFllTMS7MgORj3AHuK1Khl dIrQM6yZjABUofItGJ+GpWL7wNPTZe/0EAaudA1UatM9LngyPTAJIhejiOLsMMbwVGeu AY3hZVLJdk4cNbb9/AupFhW+IINXKiBDL7MQMU8K96QDDq+NRCrcSQ5tGcWYCKfTlyzk mbMcrTT1Dzf7QwHxMl7OSCkEgrEerSHtqtFmS+gAJkzO3/tyIOWs88fMTZqWO8WPPKnc gOmuPIgNBMOWz/C0Pv4WpwC/jlrR/WDfenZ5vwnjfuJY41mKXr/+I6/jcNM+i3wT2VQW MpNw== X-Gm-Message-State: AG10YOT9qLmrjg+wUWdITuIt3NfL7q7KeL4DsuogBBRt4i5r4bcn2uUbWkojQhTIP9BBkg== X-Received: by 10.55.201.71 with SMTP id q68mr36540634qki.79.1454449006877; Tue, 02 Feb 2016 13:36:46 -0800 (PST) Received: from cm.localdomain (static-74-96-105-49.washdc.fios.verizon.net. [74.96.105.49]) by smtp.gmail.com with ESMTPSA id d27sm1632670qkj.46.2016.02.02.13.36.46 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 02 Feb 2016 13:36:46 -0800 (PST) From: Alex Deucher X-Google-Original-From: Alex Deucher To: dri-devel@lists.freedesktop.org Subject: [PATCH 2/8] drm/amdgpu: iceland use CI based MC IP Date: Tue, 2 Feb 2016 16:36:32 -0500 Message-Id: <1454448998-12039-2-git-send-email-alexander.deucher@amd.com> X-Mailer: git-send-email 2.5.0 In-Reply-To: <1454448998-12039-1-git-send-email-alexander.deucher@amd.com> References: <1454448998-12039-1-git-send-email-alexander.deucher@amd.com> Cc: Ken Wang , stable@vger.kernel.org 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: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Spam-Status: No, score=-4.5 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 From: Ken Wang Reviewed-by: Alex Deucher Signed-off-by: Ken Wang Cc: stable@vger.kernel.org --- drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 10 +++++++++- drivers/gpu/drm/amd/amdgpu/vi.c | 7 ++++--- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c index 3f95606..069abc8 100644 --- a/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c +++ b/drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c @@ -42,6 +42,7 @@ static void gmc_v7_0_set_irq_funcs(struct amdgpu_device *adev); MODULE_FIRMWARE("radeon/bonaire_mc.bin"); MODULE_FIRMWARE("radeon/hawaii_mc.bin"); +MODULE_FIRMWARE("amdgpu/topaz_mc.bin"); /** * gmc8_mc_wait_for_idle - wait for MC idle callback. @@ -132,13 +133,20 @@ static int gmc_v7_0_init_microcode(struct amdgpu_device *adev) case CHIP_HAWAII: chip_name = "hawaii"; break; + case CHIP_TOPAZ: + chip_name = "topaz"; + break; case CHIP_KAVERI: case CHIP_KABINI: return 0; default: BUG(); } - snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name); + if(adev->asic_type == CHIP_TOPAZ) + snprintf(fw_name, sizeof(fw_name), "amdgpu/%s_mc.bin", chip_name); + else + snprintf(fw_name, sizeof(fw_name), "radeon/%s_mc.bin", chip_name); + err = request_firmware(&adev->mc.fw, fw_name, adev->dev); if (err) goto out; diff --git a/drivers/gpu/drm/amd/amdgpu/vi.c b/drivers/gpu/drm/amd/amdgpu/vi.c index 652e766..d94c625 100644 --- a/drivers/gpu/drm/amd/amdgpu/vi.c +++ b/drivers/gpu/drm/amd/amdgpu/vi.c @@ -61,6 +61,7 @@ #include "vi.h" #include "vi_dpm.h" #include "gmc_v8_0.h" +#include "gmc_v7_0.h" #include "gfx_v8_0.h" #include "sdma_v2_4.h" #include "sdma_v3_0.h" @@ -1109,10 +1110,10 @@ static const struct amdgpu_ip_block_version topaz_ip_blocks[] = }, { .type = AMD_IP_BLOCK_TYPE_GMC, - .major = 8, - .minor = 0, + .major = 7, + .minor = 4, .rev = 0, - .funcs = &gmc_v8_0_ip_funcs, + .funcs = &gmc_v7_0_ip_funcs, }, { .type = AMD_IP_BLOCK_TYPE_IH,