From patchwork Fri Oct 4 02:15:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Huacai Chen X-Patchwork-Id: 11173617 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id AB31813B1 for ; Fri, 4 Oct 2019 02:13:00 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 8E821207FF for ; Fri, 4 Oct 2019 02:13:00 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8E821207FF Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=lemote.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=dri-devel-bounces@lists.freedesktop.org Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 65B346E293; Fri, 4 Oct 2019 02:12:58 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x541.google.com (mail-pg1-x541.google.com [IPv6:2607:f8b0:4864:20::541]) by gabe.freedesktop.org (Postfix) with ESMTPS id 526DB6E293 for ; Fri, 4 Oct 2019 02:12:56 +0000 (UTC) Received: by mail-pg1-x541.google.com with SMTP id 23so2863181pgk.3 for ; Thu, 03 Oct 2019 19:12:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=CbztEByvGzHsECJN5H1J52dAe2UKr0hWe9DWy6b2oF0=; b=qM7sQwi6VCCtRICWmUnzkLoZLVdNJYBCvXBPDTHf3R8gaKE16m2VJRb4wjjgQEzSkr 2MTv2V2J2rca1d4EQPVazzOKBscQ4PXm7KBDJyiKpM2ezH+2ucMl08CwEX+8q5YWt9P1 Kb7t5+20ckuF11lQwpuogzDAkFkU0d2YtYkA6gm6hG63sX+u/MtvxIw49ZyYzny/qkXE C3VzwILXOTZtdTV+PtaP4qcLj1qrl21nSQLN2VQQu4exXxYqA0M2mAeIJlmfUlFrhzm7 VVyHzd6MqxqoUUkAR0MI4Ntxs8FWT8wWWGjhYdgU8gUOnOv6CWXoU6sVOkrQh7eVNE53 Bu9A== X-Gm-Message-State: APjAAAXzHqdNGQaz1oRMGgPfdsfiYYMXAw6gascyBsxktifNkCMHdaq9 yP8M5Ky2zsnHE8biLbgYP9siWklmINo= X-Google-Smtp-Source: APXvYqxRX5bHjaCZd18s/RsczWVFfcIuQE4XX1YoAQzjW6pzaxprLgtXd5n+fKE7R/3mzfqVeQ7KzA== X-Received: by 2002:a17:90a:17c5:: with SMTP id q63mr13993070pja.106.1570155175811; Thu, 03 Oct 2019 19:12:55 -0700 (PDT) Received: from software.domain.org ([103.118.43.97]) by smtp.gmail.com with ESMTPSA id b14sm4324037pfi.95.2019.10.03.19.12.50 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Thu, 03 Oct 2019 19:12:55 -0700 (PDT) From: Huacai Chen To: David Airlie Subject: [PATCH] drm/amdgpu: Fix build error when !CONFIG_PERF_EVENTS Date: Fri, 4 Oct 2019 10:15:11 +0800 Message-Id: <1570155311-1272-1-git-send-email-chenhc@lemote.com> X-Mailer: git-send-email 2.7.0 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=CbztEByvGzHsECJN5H1J52dAe2UKr0hWe9DWy6b2oF0=; b=cssnydM97Ir5FPA/VgrUlaL8jHxaVn2a5xX5DYEtZ/Wiok4lDv9ytd82qT55JOJ/1n OrWNeiMSYrdH9FEoy1LPKMMrBY0OQeTaEkBREo3phtwVobv0jcQdlwMAUElWxBZYEdXj vI7j2YhQN4T9uPZj5mCugJ6YvyFWVY5CmzU9dxyK2kkdfZGpZbJWspWlGwCzxyLF6dUA +pIADK2R8P1yyVQeco18Q1mwQyXAdYQbwbcaN8HSMV1zbqOfxCboWm9Ey/P+2U48RxRE aFo6QLnziQB1dCAXpJAYJA2/2dk4ipAhrydgDcClPI2Ho7lcAJMhoWsWyPT5Dc1POzYu ymOQ== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: dri-devel@lists.freedesktop.org, Luben Tuikov , Alex Deucher , Huacai Chen MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" In previous release amdgpu_pmu.o is only built when CONFIG_PERF_EVENTS is selected. But after commit 64f55e629237e4752db1 ("drm/amdgpu: Add RAS EEPROM table.") it is duplicated in amdgpu-y. This change causes a build error when !CONFIG_PERF_EVENTS, so fix it. Fixes: 64f55e629237e4752db1 ("drm/amdgpu: Add RAS EEPROM table.") Cc: Andrey Grodzovsky Cc: Luben Tuikov Signed-off-by: Huacai Chen --- drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/gpu/drm/amd/amdgpu/Makefile b/drivers/gpu/drm/amd/amdgpu/Makefile index 42e2c1f..00962a6 100644 --- a/drivers/gpu/drm/amd/amdgpu/Makefile +++ b/drivers/gpu/drm/amd/amdgpu/Makefile @@ -54,7 +54,7 @@ amdgpu-y += amdgpu_device.o amdgpu_kms.o \ amdgpu_gtt_mgr.o amdgpu_vram_mgr.o amdgpu_virt.o amdgpu_atomfirmware.o \ amdgpu_vf_error.o amdgpu_sched.o amdgpu_debugfs.o amdgpu_ids.o \ amdgpu_gmc.o amdgpu_xgmi.o amdgpu_csa.o amdgpu_ras.o amdgpu_vm_cpu.o \ - amdgpu_vm_sdma.o amdgpu_pmu.o amdgpu_discovery.o amdgpu_ras_eeprom.o smu_v11_0_i2c.o + amdgpu_vm_sdma.o amdgpu_discovery.o amdgpu_ras_eeprom.o smu_v11_0_i2c.o amdgpu-$(CONFIG_PERF_EVENTS) += amdgpu_pmu.o