From: Dave Airlie Date: Fri, 19 Jun 2020 00:02:28 +0000 (+1000) Subject: Merge tag 'amd-drm-fixes-5.8-2020-06-17' of git://people.freedesktop.org/~agd5f/linux... X-Git-Tag: v5.8-rc2~18^2 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=8a7a3d1d0dcf2bb63dafe7275020420005e13e54;p=users%2Fhch%2Fconfigfs.git Merge tag 'amd-drm-fixes-5.8-2020-06-17' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 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 From: Alex Deucher Link: https://patchwork.freedesktop.org/patch/msgid/20200617220733.3773183-1-alexander.deucher@amd.com --- 8a7a3d1d0dcf2bb63dafe7275020420005e13e54 diff --cc drivers/gpu/drm/amd/amdkfd/kfd_priv.h index f0587d94294d,06c5fdb1e818..fee60921fccf --- a/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