Merge tag 'amd-drm-fixes-5.8-2020-06-17' of git://people.freedesktop.org/~agd5f/linux...

amd-drm-fixes-5.8-2020-06-17:

amdgpu:
- Fix kvfree/kfree mixup
- Fix hawaii device id in powertune configuration
- Display FP fixes
- Documentation fixes

amdkfd:
- devcgroup check fix

Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Alex Deucher <alexdeucher@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200617220733.3773183-1-alexander.deucher@amd.com

diff --cc drivers/gpu/drm/amd/amdkfd/kfd_priv.h
index f0587d94294d7e71ff759932ad5108c833065bf2,06c5fdb1e81874d3dc098f6c94d3196fc81278f8..fee60921fccf224a4f37250009506c8270bd5a4c
--- 1/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
--- 2/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
+++ b/drivers/gpu/drm/amd/amdkfd/kfd_priv.h
@@@ -1073,10 -1074,10 +1074,10 @@@ void kfd_dec_compute_active(struct kfd_
  /* Check with device cgroup if @kfd device is accessible */
  static inline int kfd_devcgroup_check_permission(struct kfd_dev *kfd)
  {
 -#if defined(CONFIG_CGROUP_DEVICE)
 +#if defined(CONFIG_CGROUP_DEVICE) || defined(CONFIG_CGROUP_BPF)
        struct drm_device *ddev = kfd->ddev;
  
-       return devcgroup_check_permission(DEVCG_DEV_CHAR, ddev->driver->major,
+       return devcgroup_check_permission(DEVCG_DEV_CHAR, DRM_MAJOR,
                                          ddev->render->index,
                                          DEVCG_ACC_WRITE | DEVCG_ACC_READ);
  #else