drm/amdgpu: make pmu support optional, again
authorArnd Bergmann <arnd@arndb.de>
Wed, 2 Oct 2019 12:01:22 +0000 (14:01 +0200)
committerAlex Deucher <alexander.deucher@amd.com>
Wed, 2 Oct 2019 17:58:33 +0000 (12:58 -0500)
commitec3e5c0f0c2b716e768c0eee0fec30d572939ef5
treef790b741de2ac992bd4a2a8911e7e02c71c5ec08
parent055e547478a11a6360c7ce05e2afc3e366968a12
drm/amdgpu: make pmu support optional, again

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>
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
drivers/gpu/drm/amd/amdgpu/Makefile