DRM 5.18 backport
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2043115
Bugzilla: https://bugzilla.redhat.com/show_bug.cgi?id=2012748
x86 relevant commit is "drm/i915/rpl-s: Add PCI IDS for Raptor Lake S"
diff against upstream DRM:
diff --git a/drivers/gpu/drm/drm_cache.c b/drivers/gpu/drm/drm_cache.c
index 7051c9c909c2..f230c7ba48ee 100644
--- a/drivers/gpu/drm/drm_cache.c
+++ b/drivers/gpu/drm/drm_cache.c
@@ -27,6 +27,7 @@
/*
* Authors: Thomas Hellström <thomas-at-tungstengraphics-dot-com>
*/
+
#include <linux/cc_platform.h>
#include <linux/export.h>
#include <linux/highmem.h>
diff --git a/drivers/gpu/drm/virtio/virtgpu_kms.c b/drivers/gpu/drm/virtio/virtgpu_kms.c
index 3313b92db531..21f410901694 100644
--- a/drivers/gpu/drm/virtio/virtgpu_kms.c
+++ b/drivers/gpu/drm/virtio/virtgpu_kms.c
@@ -279,7 +279,7 @@ void virtio_gpu_deinit(struct drm_device *dev)
flush_work(&vgdev->ctrlq.dequeue_work);
flush_work(&vgdev->cursorq.dequeue_work);
flush_work(&vgdev->config_changed_work);
- virtio_reset_device(vgdev->vdev);
+ vgdev->vdev->config->reset(vgdev->vdev);
vgdev->vdev->config->del_vqs(vgdev->vdev);
}
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Edited by Karol Herbst