OSDN Git Service

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>
Thu, 3 Oct 2019 14:11:06 +0000 (09:11 -0500)
commit128a01f4724ae72f8916ad20856dda152e9cd012
treea723387d40c74512edc4029e2494e2fec4c80503
parentcabe144bfd0c106c2e55d900320c2464c42ab94c
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