All of lore.kernel.org
 help / color / mirror / Atom feed
From: Arnd Bergmann <arnd@arndb.de>
To: "Alex Deucher" <alexander.deucher@amd.com>,
	"Christian König" <christian.koenig@amd.com>,
	"David (ChunMing) Zhou" <David1.Zhou@amd.com>,
	"David Airlie" <airlied@linux.ie>,
	"Daniel Vetter" <daniel@ffwll.ch>
Cc: clang-built-linux@googlegroups.com,
	amd-gfx@lists.freedesktop.org, linux-kernel@vger.kernel.org,
	dri-devel@lists.freedesktop.org, Arnd Bergmann <arnd@arndb.de>,
	Andrey Grodzovsky <andrey.grodzovsky@amd.com>,
	Luben Tuikov <Luben.Tuikov@amd.com>,
	Hawking Zhang <Hawking.Zhang@amd.com>,
	Huang Rui <ray.huang@amd.com>
Subject: [PATCH 1/6] drm/amdgpu: make pmu support optional, again
Date: Wed,  2 Oct 2019 14:01:22 +0200	[thread overview]
Message-ID: <20191002120136.1777161-2-arnd@arndb.de> (raw)
In-Reply-To: <20191002120136.1777161-1-arnd@arndb.de>

When CONFIG_PERF_EVENTS is disabled, we cannot compile the pmu
portion of the amdgpu driver:

drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c:48:38: error: no member named 'hw' in 'struct perf_event'
        struct hw_perf_event *hwc = &event->hw;
                                     ~~~~~  ^
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c:51:13: error: no member named 'attr' in 'struct perf_event'
        if (event->attr.type != event->pmu->type)
            ~~~~~  ^
...

The same bug was already fixed by commit d155bef0636e ("amdgpu: make pmu
support optional") but broken again by what looks like an incorrectly
rebased patch.

Fixes: 64f55e629237 ("drm/amdgpu: Add RAS EEPROM table.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 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 42e2c1f57152..00962a659009 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.20.0


WARNING: multiple messages have this Message-ID (diff)
From: Arnd Bergmann <arnd@arndb.de>
To: "Alex Deucher" <alexander.deucher@amd.com>,
	"Christian König" <christian.koenig@amd.com>,
	"David (ChunMing) Zhou" <David1.Zhou@amd.com>,
	"David Airlie" <airlied@linux.ie>,
	"Daniel Vetter" <daniel@ffwll.ch>
Cc: Arnd Bergmann <arnd@arndb.de>, Huang Rui <ray.huang@amd.com>,
	linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org,
	clang-built-linux@googlegroups.com,
	Luben Tuikov <Luben.Tuikov@amd.com>,
	amd-gfx@lists.freedesktop.org,
	Hawking Zhang <Hawking.Zhang@amd.com>
Subject: [PATCH 1/6] drm/amdgpu: make pmu support optional, again
Date: Wed,  2 Oct 2019 14:01:22 +0200	[thread overview]
Message-ID: <20191002120136.1777161-2-arnd@arndb.de> (raw)
In-Reply-To: <20191002120136.1777161-1-arnd@arndb.de>

When CONFIG_PERF_EVENTS is disabled, we cannot compile the pmu
portion of the amdgpu driver:

drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c:48:38: error: no member named 'hw' in 'struct perf_event'
        struct hw_perf_event *hwc = &event->hw;
                                     ~~~~~  ^
drivers/gpu/drm/amd/amdgpu/amdgpu_pmu.c:51:13: error: no member named 'attr' in 'struct perf_event'
        if (event->attr.type != event->pmu->type)
            ~~~~~  ^
...

The same bug was already fixed by commit d155bef0636e ("amdgpu: make pmu
support optional") but broken again by what looks like an incorrectly
rebased patch.

Fixes: 64f55e629237 ("drm/amdgpu: Add RAS EEPROM table.")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
---
 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 42e2c1f57152..00962a659009 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.20.0

_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel

  reply	other threads:[~2019-10-02 12:02 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-10-02 12:01 [PATCH 0/6] amdgpu build fixes Arnd Bergmann
2019-10-02 12:01 ` Arnd Bergmann
2019-10-02 12:01 ` Arnd Bergmann [this message]
2019-10-02 12:01   ` [PATCH 1/6] drm/amdgpu: make pmu support optional, again Arnd Bergmann
2019-10-02 12:01 ` [PATCH 2/6] drm/amdgpu: hide another #warning Arnd Bergmann
2019-10-02 12:01 ` [PATCH 3/6] drm/amdgpu: display_mode_vba_21: remove uint typedef Arnd Bergmann
2019-10-02 12:01   ` Arnd Bergmann
2019-10-02 12:01 ` [PATCH 4/6] drm/amd/display: fix dcn21 Makefile for clang Arnd Bergmann
2019-10-02 12:01   ` Arnd Bergmann
2019-10-02 14:17   ` Alex Deucher
2019-10-02 14:17     ` Alex Deucher
2019-10-02 14:51     ` Arnd Bergmann
2019-10-02 15:12       ` Alex Deucher
2019-10-02 15:12         ` Alex Deucher
2019-10-02 15:39         ` Arnd Bergmann
2019-10-02 16:33           ` Alex Deucher
2019-10-02 21:14   ` Nick Desaulniers
2019-10-02 21:24     ` Alex Deucher
2019-10-02 21:24       ` Alex Deucher
2019-10-02 21:27       ` Nick Desaulniers
2019-10-02 12:01 ` [PATCH 5/6] [RESEND] drm/amd/display: hide an unused variable Arnd Bergmann
2019-10-02 12:01 ` [PATCH 6/6] [RESEND] drm/amdgpu: work around llvm bug #42576 Arnd Bergmann
2019-10-02 16:51   ` Nick Desaulniers
2019-10-02 17:07     ` Nathan Chancellor
2019-10-02 21:06       ` Nick Desaulniers
2019-10-02 18:47 ` [PATCH 0/6] amdgpu build fixes Alex Deucher
2019-10-02 18:47   ` Alex Deucher
2019-10-02 18:53   ` Arnd Bergmann
2019-10-02 18:53     ` Arnd Bergmann

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=20191002120136.1777161-2-arnd@arndb.de \
    --to=arnd@arndb.de \
    --cc=David1.Zhou@amd.com \
    --cc=Hawking.Zhang@amd.com \
    --cc=Luben.Tuikov@amd.com \
    --cc=airlied@linux.ie \
    --cc=alexander.deucher@amd.com \
    --cc=amd-gfx@lists.freedesktop.org \
    --cc=andrey.grodzovsky@amd.com \
    --cc=christian.koenig@amd.com \
    --cc=clang-built-linux@googlegroups.com \
    --cc=daniel@ffwll.ch \
    --cc=dri-devel@lists.freedesktop.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=ray.huang@amd.com \
    /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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.