]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit922d53f60c9ce658c7166ffa33efb795a5055d57
treef790b741de2ac992bd4a2a8911e7e02c71c5ec08
parentec6f6a1dabfbb56883529cc176c2765afe668cfb
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 01295f621ef8 ("amdgpu: make pmu
support optional") but broken again by what looks like an incorrectly
rebased patch.

Fixes: 1687a3a95fc0 ("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