drm/amdkcl: test whether drm checking on dev->dev_private

introduced by v5.5-rc2-1531-ge62bf83aa1bb This patch is caused by 'drm/amdgpu: Embed drm_device into amdgpu_device (v2)' Signed-off-by: Yang Xiong <Yang.Xiong@amd.com> Reviewed-by: Flora Cui <flora.cui@amd.com> Change-Id: If527052c8053141eadd77cbf77e4fc16850808b5
mariux64 · Sep 3, 2020 · f9896ea · f9896ea
1 parent d430036
commit f9896ea
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
@@ -160,6 +160,8 @@ int amdgpu_driver_load_kms(struct drm_device *dev, unsigned long flags)
 	if (adev == NULL) {
 		return -ENOMEM;
 	}
+#endif
+#ifdef AMDKCL_CHECK_DRM_DEVICE_DEV_PRIVATE
 	dev->dev_private = (void *)adev;
 #endif
 

diff --git a/include/kcl/backport/kcl_drm_backport.h b/include/kcl/backport/kcl_drm_backport.h
@@ -77,6 +77,14 @@ int _kcl_drm_syncobj_find_fence(struct drm_file *file_private,
 #define AMDKCL_AMDGPU_DEBUGFS_CLEANUP
 #endif
 
+/*
+ * commit v5.5-rc2-1531-ge62bf83aa1bb
+ * drm/irq: remove check on dev->dev_private
+ */
+#if DRM_VERSION_CODE < DRM_VERSION(5, 6, 0)
+#define AMDKCL_CHECK_DRM_DEVICE_DEV_PRIVATE
+#endif
+
 #ifndef HAVE_DRM_GEM_OBJECT_LOOKUP_2ARGS
 static inline struct drm_gem_object *
 _kcl_drm_gem_object_lookup(struct drm_file *filp, u32 handle)