diff options
author | Jordan Crouse <jcrouse@codeaurora.org> | 2019-04-10 10:58:16 -0600 |
---|---|---|
committer | Rob Clark <robdclark@chromium.org> | 2019-04-21 07:52:36 -0700 |
commit | b02872df58aca66d0e7af3ec5065dbc6f0630dd1 (patch) | |
tree | 43ee9969171994ebdc9f490aa97fc1e6546e781b /drivers/gpu/drm/msm/adreno | |
parent | b55ee6b243bd2743b9cb20b6aa812091748c4304 (diff) | |
download | linux-b02872df58aca66d0e7af3ec5065dbc6f0630dd1.tar.gz linux-b02872df58aca66d0e7af3ec5065dbc6f0630dd1.tar.bz2 linux-b02872df58aca66d0e7af3ec5065dbc6f0630dd1.zip |
drm/msm/a6xx: Don't enable GPU state code if dependencies are missing
Add CONFIG_DRM_MSM_GPU_STATE to conditionally compile Adreno GPU state
code depending on the availability of the dependencies.
Reported-by: Hulk Robot <hulkci@huawei.com>
Reported-by: YueHaibing <yuehaibing@huawei.com>
Fixes: 1707add81551 ("drm/msm/a6xx: Add a6xx gpu state")
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
Signed-off-by: Rob Clark <robdclark@chromium.org>
Diffstat (limited to 'drivers/gpu/drm/msm/adreno')
-rw-r--r-- | drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c index 7028bb784427..ec24508b9d68 100644 --- a/drivers/gpu/drm/msm/adreno/a6xx_gpu.c +++ b/drivers/gpu/drm/msm/adreno/a6xx_gpu.c @@ -807,14 +807,16 @@ static const struct adreno_gpu_funcs funcs = { .active_ring = a6xx_active_ring, .irq = a6xx_irq, .destroy = a6xx_destroy, -#if defined(CONFIG_DEBUG_FS) || defined(CONFIG_DEV_COREDUMP) +#if defined(CONFIG_DRM_MSM_GPU_STATE) .show = a6xx_show, #endif .gpu_busy = a6xx_gpu_busy, .gpu_get_freq = a6xx_gmu_get_freq, .gpu_set_freq = a6xx_gmu_set_freq, +#if defined(CONFIG_DRM_MSM_GPU_STATE) .gpu_state_get = a6xx_gpu_state_get, .gpu_state_put = a6xx_gpu_state_put, +#endif }, .get_timestamp = a6xx_get_timestamp, }; |