From: Huacai Chen <chenhc@lemote.com>
To: David Airlie <airlied@linux.ie>
Cc: dri-devel@lists.freedesktop.org,
Luben Tuikov <Luben.Tuikov@amd.com>,
Alex Deucher <alexander.deucher@amd.com>,
Huacai Chen <chenhc@lemote.com>
Subject: [PATCH] drm/amdgpu: Fix build error when !CONFIG_PERF_EVENTS
Date: Fri, 4 Oct 2019 10:15:11 +0800 [thread overview]
Message-ID: <1570155311-1272-1-git-send-email-chenhc@lemote.com> (raw)
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 <andrey.grodzovsky@amd.com>
Cc: Luben Tuikov <Luben.Tuikov@amd.com>
Signed-off-by: Huacai Chen <chenhc@lemote.com>
---
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
--
2.7.0
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next reply other threads:[~2019-10-04 2:12 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-10-04 2:15 Huacai Chen [this message]
2019-10-04 12:27 ` [PATCH] drm/amdgpu: Fix build error when !CONFIG_PERF_EVENTS Alex Deucher
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1570155311-1272-1-git-send-email-chenhc@lemote.com \
--to=chenhc@lemote.com \
--cc=Luben.Tuikov@amd.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=dri-devel@lists.freedesktop.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).