[PATCH v1 1/4] Drivers: hv: Move legacy Hyper-V PCI video device's ids to linux/hyperv.h
From: Vitaly Kuznetsov <vkuznets@redhat.com>
Date: 2022-08-18 14:25:29
Also in:
dri-devel, lkml
Subsystem:
drm drivers, drm drivers and misc gpu patches, framebuffer layer, hyper-v/azure core and drivers, the rest · Maintainers:
David Airlie, Simona Vetter, Maarten Lankhorst, Maxime Ripard, Thomas Zimmermann, Helge Deller, "K. Y. Srinivasan", Haiyang Zhang, Wei Liu, Dexuan Cui, Long Li, Linus Torvalds
There are already two places in kernel with PCI_VENDOR_ID_MICROSOFT/ PCI_DEVICE_ID_HYPERV_VIDEO and there's a need to use these from core Vmbus code. Move the defines to a common header. No functional change. Signed-off-by: Vitaly Kuznetsov <vkuznets@redhat.com> --- drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 3 --- drivers/video/fbdev/hyperv_fb.c | 4 ---- include/linux/hyperv.h | 4 ++++ 3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
index 4a8941fa0815..46f6c454b820 100644
--- a/drivers/gpu/drm/hyperv/hyperv_drm_drv.c
+++ b/drivers/gpu/drm/hyperv/hyperv_drm_drv.c@@ -23,9 +23,6 @@ #define DRIVER_MAJOR 1 #define DRIVER_MINOR 0 -#define PCI_VENDOR_ID_MICROSOFT 0x1414 -#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 - DEFINE_DRM_GEM_FOPS(hv_fops); static struct drm_driver hyperv_driver = {
diff --git a/drivers/video/fbdev/hyperv_fb.c b/drivers/video/fbdev/hyperv_fb.c
index 886c564787f1..b58b445bb529 100644
--- a/drivers/video/fbdev/hyperv_fb.c
+++ b/drivers/video/fbdev/hyperv_fb.c@@ -74,10 +74,6 @@ #define SYNTHVID_DEPTH_WIN8 32 #define SYNTHVID_FB_SIZE_WIN8 (8 * 1024 * 1024) -#define PCI_VENDOR_ID_MICROSOFT 0x1414 -#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 - - enum pipe_msg_type { PIPE_MSG_INVALID, PIPE_MSG_DATA,
diff --git a/include/linux/hyperv.h b/include/linux/hyperv.h
index 3b42264333ef..4bb39a8f1af7 100644
--- a/include/linux/hyperv.h
+++ b/include/linux/hyperv.h@@ -1516,6 +1516,10 @@ void vmbus_free_mmio(resource_size_t start, resource_size_t size); .guid = GUID_INIT(0xc376c1c3, 0xd276, 0x48d2, 0x90, 0xa9, \ 0xc0, 0x47, 0x48, 0x07, 0x2c, 0x60) +/* Legacy Hyper-V PCI video device */ +#define PCI_VENDOR_ID_MICROSOFT 0x1414 +#define PCI_DEVICE_ID_HYPERV_VIDEO 0x5353 + /* * Common header for Hyper-V ICs */
--
2.37.1