diff options
author | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-01-29 05:42:46 -0500 |
---|---|---|
committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2019-01-29 09:45:06 -0500 |
commit | 5b38e7475e3dc54c1091ee169fd050b3f10461fc (patch) | |
tree | 06da0f21270f3d3342d0f26a8f2520199892de16 | |
parent | f12d0b91affc59d289e1bfdbbc787d27376494f2 (diff) |
drm/irq: Don't check for DRIVER_HAVE_IRQ in drm_irq_(un)install
If a non-legacy driver calls these it's valid to assume there is
interrupt support. The flag is really only needed for legacy drivers,
which control IRQ enabling/disabling through the DRM_IOCTL_CONTROL
legacy IOCTL.
Also remove all the flag usage from non-legacy drivers.
v2: Review from Emil:
- improve commit message
- I forgot hibmc, fix that
Cc: linux-arm-kernel@lists.infradead.org
Cc: intel-gfx@lists.freedesktop.org
Cc: linux-amlogic@lists.infradead.org
Cc: linux-arm-msm@vger.kernel.org
Cc: freedreno@lists.freedesktop.org
Cc: virtualization@lists.linux-foundation.org
Cc: spice-devel@lists.freedesktop.org
Cc: amd-gfx@lists.freedesktop.org
Cc: linux-renesas-soc@vger.kernel.org
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190129104248.26607-1-daniel.vetter@ffwll.ch
-rw-r--r-- | drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/arm/hdlcd_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/drm_irq.c | 6 | ||||
-rw-r--r-- | drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/gma500/psb_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/i915/i915_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/meson/meson_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/msm/msm_drv.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/mxsfb/mxsfb_drv.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/qxl/qxl_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/radeon/radeon_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/shmobile/shmob_drm_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_drv.c | 2 | ||||
-rw-r--r-- | drivers/gpu/drm/vc4/vc4_drv.c | 1 | ||||
-rw-r--r-- | drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 | ||||
-rw-r--r-- | drivers/staging/vboxvideo/vbox_drv.c | 2 |
18 files changed, 16 insertions, 26 deletions
diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c index 0c22bae0c736..22502417c18c 100644 --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | |||
@@ -1189,7 +1189,7 @@ amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, | |||
1189 | static struct drm_driver kms_driver = { | 1189 | static struct drm_driver kms_driver = { |
1190 | .driver_features = | 1190 | .driver_features = |
1191 | DRIVER_USE_AGP | DRIVER_ATOMIC | | 1191 | DRIVER_USE_AGP | DRIVER_ATOMIC | |
1192 | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | | 1192 | DRIVER_IRQ_SHARED | DRIVER_GEM | |
1193 | DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ, | 1193 | DRIVER_PRIME | DRIVER_RENDER | DRIVER_MODESET | DRIVER_SYNCOBJ, |
1194 | .load = amdgpu_driver_load_kms, | 1194 | .load = amdgpu_driver_load_kms, |
1195 | .open = amdgpu_driver_open_kms, | 1195 | .open = amdgpu_driver_open_kms, |
diff --git a/drivers/gpu/drm/arm/hdlcd_drv.c b/drivers/gpu/drm/arm/hdlcd_drv.c index e68935b80917..8fc0b884c428 100644 --- a/drivers/gpu/drm/arm/hdlcd_drv.c +++ b/drivers/gpu/drm/arm/hdlcd_drv.c | |||
@@ -229,7 +229,7 @@ static int hdlcd_debugfs_init(struct drm_minor *minor) | |||
229 | DEFINE_DRM_GEM_CMA_FOPS(fops); | 229 | DEFINE_DRM_GEM_CMA_FOPS(fops); |
230 | 230 | ||
231 | static struct drm_driver hdlcd_driver = { | 231 | static struct drm_driver hdlcd_driver = { |
232 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM | | 232 | .driver_features = DRIVER_GEM | |
233 | DRIVER_MODESET | DRIVER_PRIME | | 233 | DRIVER_MODESET | DRIVER_PRIME | |
234 | DRIVER_ATOMIC, | 234 | DRIVER_ATOMIC, |
235 | .irq_handler = hdlcd_irq, | 235 | .irq_handler = hdlcd_irq, |
diff --git a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c index 034a91112098..0be13eceedba 100644 --- a/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c +++ b/drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | |||
@@ -720,7 +720,7 @@ static void atmel_hlcdc_dc_irq_uninstall(struct drm_device *dev) | |||
720 | DEFINE_DRM_GEM_CMA_FOPS(fops); | 720 | DEFINE_DRM_GEM_CMA_FOPS(fops); |
721 | 721 | ||
722 | static struct drm_driver atmel_hlcdc_dc_driver = { | 722 | static struct drm_driver atmel_hlcdc_dc_driver = { |
723 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM | | 723 | .driver_features = DRIVER_GEM | |
724 | DRIVER_MODESET | DRIVER_PRIME | | 724 | DRIVER_MODESET | DRIVER_PRIME | |
725 | DRIVER_ATOMIC, | 725 | DRIVER_ATOMIC, |
726 | .irq_handler = atmel_hlcdc_dc_irq_handler, | 726 | .irq_handler = atmel_hlcdc_dc_irq_handler, |
diff --git a/drivers/gpu/drm/drm_irq.c b/drivers/gpu/drm/drm_irq.c index 45a07652fa00..c5babb3e4752 100644 --- a/drivers/gpu/drm/drm_irq.c +++ b/drivers/gpu/drm/drm_irq.c | |||
@@ -103,9 +103,6 @@ int drm_irq_install(struct drm_device *dev, int irq) | |||
103 | int ret; | 103 | int ret; |
104 | unsigned long sh_flags = 0; | 104 | unsigned long sh_flags = 0; |
105 | 105 | ||
106 | if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) | ||
107 | return -EOPNOTSUPP; | ||
108 | |||
109 | if (irq == 0) | 106 | if (irq == 0) |
110 | return -EINVAL; | 107 | return -EINVAL; |
111 | 108 | ||
@@ -174,9 +171,6 @@ int drm_irq_uninstall(struct drm_device *dev) | |||
174 | bool irq_enabled; | 171 | bool irq_enabled; |
175 | int i; | 172 | int i; |
176 | 173 | ||
177 | if (!drm_core_check_feature(dev, DRIVER_HAVE_IRQ)) | ||
178 | return -EOPNOTSUPP; | ||
179 | |||
180 | irq_enabled = dev->irq_enabled; | 174 | irq_enabled = dev->irq_enabled; |
181 | dev->irq_enabled = false; | 175 | dev->irq_enabled = false; |
182 | 176 | ||
diff --git a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c index 54ace3436605..dfc73aade325 100644 --- a/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c +++ b/drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | |||
@@ -137,7 +137,7 @@ static irqreturn_t fsl_dcu_drm_irq(int irq, void *arg) | |||
137 | DEFINE_DRM_GEM_CMA_FOPS(fsl_dcu_drm_fops); | 137 | DEFINE_DRM_GEM_CMA_FOPS(fsl_dcu_drm_fops); |
138 | 138 | ||
139 | static struct drm_driver fsl_dcu_drm_driver = { | 139 | static struct drm_driver fsl_dcu_drm_driver = { |
140 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM | DRIVER_MODESET | 140 | .driver_features = DRIVER_GEM | DRIVER_MODESET |
141 | | DRIVER_PRIME | DRIVER_ATOMIC, | 141 | | DRIVER_PRIME | DRIVER_ATOMIC, |
142 | .load = fsl_dcu_load, | 142 | .load = fsl_dcu_load, |
143 | .unload = fsl_dcu_unload, | 143 | .unload = fsl_dcu_unload, |
diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index ac32ab5aa002..7cf14aeb1c28 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c | |||
@@ -468,7 +468,7 @@ static const struct file_operations psb_gem_fops = { | |||
468 | }; | 468 | }; |
469 | 469 | ||
470 | static struct drm_driver driver = { | 470 | static struct drm_driver driver = { |
471 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | \ | 471 | .driver_features = DRIVER_IRQ_SHARED | \ |
472 | DRIVER_MODESET | DRIVER_GEM, | 472 | DRIVER_MODESET | DRIVER_GEM, |
473 | .load = psb_driver_load, | 473 | .load = psb_driver_load, |
474 | .unload = psb_driver_unload, | 474 | .unload = psb_driver_unload, |
diff --git a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c index 85a701af6530..8ed94fcd42a7 100644 --- a/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c +++ b/drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | |||
@@ -56,8 +56,7 @@ static irqreturn_t hibmc_drm_interrupt(int irq, void *arg) | |||
56 | } | 56 | } |
57 | 57 | ||
58 | static struct drm_driver hibmc_driver = { | 58 | static struct drm_driver hibmc_driver = { |
59 | .driver_features = DRIVER_GEM | DRIVER_MODESET | | 59 | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_ATOMIC, |
60 | DRIVER_ATOMIC | DRIVER_HAVE_IRQ, | ||
61 | .fops = &hibmc_fops, | 60 | .fops = &hibmc_fops, |
62 | .name = "hibmc", | 61 | .name = "hibmc", |
63 | .date = "20160828", | 62 | .date = "20160828", |
diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 9883921013b1..b7d71083e320 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c | |||
@@ -3209,7 +3209,7 @@ static struct drm_driver driver = { | |||
3209 | * deal with them for Intel hardware. | 3209 | * deal with them for Intel hardware. |
3210 | */ | 3210 | */ |
3211 | .driver_features = | 3211 | .driver_features = |
3212 | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME | | 3212 | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME | |
3213 | DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ, | 3213 | DRIVER_RENDER | DRIVER_MODESET | DRIVER_ATOMIC | DRIVER_SYNCOBJ, |
3214 | .release = i915_driver_release, | 3214 | .release = i915_driver_release, |
3215 | .open = i915_driver_open, | 3215 | .open = i915_driver_open, |
diff --git a/drivers/gpu/drm/meson/meson_drv.c b/drivers/gpu/drm/meson/meson_drv.c index a6af20884f03..27f38bdc8677 100644 --- a/drivers/gpu/drm/meson/meson_drv.c +++ b/drivers/gpu/drm/meson/meson_drv.c | |||
@@ -90,7 +90,7 @@ static irqreturn_t meson_irq(int irq, void *arg) | |||
90 | DEFINE_DRM_GEM_CMA_FOPS(fops); | 90 | DEFINE_DRM_GEM_CMA_FOPS(fops); |
91 | 91 | ||
92 | static struct drm_driver meson_driver = { | 92 | static struct drm_driver meson_driver = { |
93 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM | | 93 | .driver_features = DRIVER_GEM | |
94 | DRIVER_MODESET | DRIVER_PRIME | | 94 | DRIVER_MODESET | DRIVER_PRIME | |
95 | DRIVER_ATOMIC, | 95 | DRIVER_ATOMIC, |
96 | 96 | ||
diff --git a/drivers/gpu/drm/msm/msm_drv.c b/drivers/gpu/drm/msm/msm_drv.c index d2cdc7b553fe..8747fb32a106 100644 --- a/drivers/gpu/drm/msm/msm_drv.c +++ b/drivers/gpu/drm/msm/msm_drv.c | |||
@@ -1063,8 +1063,7 @@ static const struct file_operations fops = { | |||
1063 | }; | 1063 | }; |
1064 | 1064 | ||
1065 | static struct drm_driver msm_driver = { | 1065 | static struct drm_driver msm_driver = { |
1066 | .driver_features = DRIVER_HAVE_IRQ | | 1066 | .driver_features = DRIVER_GEM | |
1067 | DRIVER_GEM | | ||
1068 | DRIVER_PRIME | | 1067 | DRIVER_PRIME | |
1069 | DRIVER_RENDER | | 1068 | DRIVER_RENDER | |
1070 | DRIVER_ATOMIC | | 1069 | DRIVER_ATOMIC | |
diff --git a/drivers/gpu/drm/mxsfb/mxsfb_drv.c b/drivers/gpu/drm/mxsfb/mxsfb_drv.c index 54c8cdaeb576..967379f3f571 100644 --- a/drivers/gpu/drm/mxsfb/mxsfb_drv.c +++ b/drivers/gpu/drm/mxsfb/mxsfb_drv.c | |||
@@ -322,8 +322,7 @@ DEFINE_DRM_GEM_CMA_FOPS(fops); | |||
322 | 322 | ||
323 | static struct drm_driver mxsfb_driver = { | 323 | static struct drm_driver mxsfb_driver = { |
324 | .driver_features = DRIVER_GEM | DRIVER_MODESET | | 324 | .driver_features = DRIVER_GEM | DRIVER_MODESET | |
325 | DRIVER_PRIME | DRIVER_ATOMIC | | 325 | DRIVER_PRIME | DRIVER_ATOMIC, |
326 | DRIVER_HAVE_IRQ, | ||
327 | .irq_handler = mxsfb_irq_handler, | 326 | .irq_handler = mxsfb_irq_handler, |
328 | .irq_preinstall = mxsfb_irq_preinstall, | 327 | .irq_preinstall = mxsfb_irq_preinstall, |
329 | .irq_uninstall = mxsfb_irq_preinstall, | 328 | .irq_uninstall = mxsfb_irq_preinstall, |
diff --git a/drivers/gpu/drm/qxl/qxl_drv.c b/drivers/gpu/drm/qxl/qxl_drv.c index a1eccefab830..3b1487cfbb0e 100644 --- a/drivers/gpu/drm/qxl/qxl_drv.c +++ b/drivers/gpu/drm/qxl/qxl_drv.c | |||
@@ -245,7 +245,7 @@ static struct pci_driver qxl_pci_driver = { | |||
245 | 245 | ||
246 | static struct drm_driver qxl_driver = { | 246 | static struct drm_driver qxl_driver = { |
247 | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | | 247 | .driver_features = DRIVER_GEM | DRIVER_MODESET | DRIVER_PRIME | |
248 | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | | 248 | DRIVER_IRQ_SHARED | |
249 | DRIVER_ATOMIC, | 249 | DRIVER_ATOMIC, |
250 | 250 | ||
251 | .dumb_create = qxl_mode_dumb_create, | 251 | .dumb_create = qxl_mode_dumb_create, |
diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 8897c3d18fbb..450a9d473c30 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c | |||
@@ -535,7 +535,7 @@ radeon_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe, | |||
535 | static struct drm_driver kms_driver = { | 535 | static struct drm_driver kms_driver = { |
536 | .driver_features = | 536 | .driver_features = |
537 | DRIVER_USE_AGP | | 537 | DRIVER_USE_AGP | |
538 | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | | 538 | DRIVER_IRQ_SHARED | DRIVER_GEM | |
539 | DRIVER_PRIME | DRIVER_RENDER, | 539 | DRIVER_PRIME | DRIVER_RENDER, |
540 | .load = radeon_driver_load_kms, | 540 | .load = radeon_driver_load_kms, |
541 | .open = radeon_driver_open_kms, | 541 | .open = radeon_driver_open_kms, |
diff --git a/drivers/gpu/drm/shmobile/shmob_drm_drv.c b/drivers/gpu/drm/shmobile/shmob_drm_drv.c index 2002e7c55e80..cb821adfc321 100644 --- a/drivers/gpu/drm/shmobile/shmob_drm_drv.c +++ b/drivers/gpu/drm/shmobile/shmob_drm_drv.c | |||
@@ -127,7 +127,7 @@ static irqreturn_t shmob_drm_irq(int irq, void *arg) | |||
127 | DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops); | 127 | DEFINE_DRM_GEM_CMA_FOPS(shmob_drm_fops); |
128 | 128 | ||
129 | static struct drm_driver shmob_drm_driver = { | 129 | static struct drm_driver shmob_drm_driver = { |
130 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_GEM | DRIVER_MODESET | 130 | .driver_features = DRIVER_GEM | DRIVER_MODESET |
131 | | DRIVER_PRIME, | 131 | | DRIVER_PRIME, |
132 | .irq_handler = shmob_drm_irq, | 132 | .irq_handler = shmob_drm_irq, |
133 | .gem_free_object_unlocked = drm_gem_cma_free_object, | 133 | .gem_free_object_unlocked = drm_gem_cma_free_object, |
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index 13b11acd4a5e..3030af9e7b35 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c | |||
@@ -512,7 +512,7 @@ static int tilcdc_debugfs_init(struct drm_minor *minor) | |||
512 | DEFINE_DRM_GEM_CMA_FOPS(fops); | 512 | DEFINE_DRM_GEM_CMA_FOPS(fops); |
513 | 513 | ||
514 | static struct drm_driver tilcdc_driver = { | 514 | static struct drm_driver tilcdc_driver = { |
515 | .driver_features = (DRIVER_HAVE_IRQ | DRIVER_GEM | DRIVER_MODESET | | 515 | .driver_features = (DRIVER_GEM | DRIVER_MODESET | |
516 | DRIVER_PRIME | DRIVER_ATOMIC), | 516 | DRIVER_PRIME | DRIVER_ATOMIC), |
517 | .irq_handler = tilcdc_irq, | 517 | .irq_handler = tilcdc_irq, |
518 | .gem_free_object_unlocked = drm_gem_cma_free_object, | 518 | .gem_free_object_unlocked = drm_gem_cma_free_object, |
diff --git a/drivers/gpu/drm/vc4/vc4_drv.c b/drivers/gpu/drm/vc4/vc4_drv.c index f6f5cd80c04d..5fcd2f0da7f7 100644 --- a/drivers/gpu/drm/vc4/vc4_drv.c +++ b/drivers/gpu/drm/vc4/vc4_drv.c | |||
@@ -175,7 +175,6 @@ static struct drm_driver vc4_drm_driver = { | |||
175 | .driver_features = (DRIVER_MODESET | | 175 | .driver_features = (DRIVER_MODESET | |
176 | DRIVER_ATOMIC | | 176 | DRIVER_ATOMIC | |
177 | DRIVER_GEM | | 177 | DRIVER_GEM | |
178 | DRIVER_HAVE_IRQ | | ||
179 | DRIVER_RENDER | | 178 | DRIVER_RENDER | |
180 | DRIVER_PRIME | | 179 | DRIVER_PRIME | |
181 | DRIVER_SYNCOBJ), | 180 | DRIVER_SYNCOBJ), |
diff --git a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c index 25afb1d594e3..d159d0400013 100644 --- a/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +++ b/drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | |||
@@ -1582,7 +1582,7 @@ static const struct file_operations vmwgfx_driver_fops = { | |||
1582 | }; | 1582 | }; |
1583 | 1583 | ||
1584 | static struct drm_driver driver = { | 1584 | static struct drm_driver driver = { |
1585 | .driver_features = DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | | 1585 | .driver_features = DRIVER_IRQ_SHARED | |
1586 | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, | 1586 | DRIVER_MODESET | DRIVER_PRIME | DRIVER_RENDER | DRIVER_ATOMIC, |
1587 | .load = vmw_driver_load, | 1587 | .load = vmw_driver_load, |
1588 | .unload = vmw_driver_unload, | 1588 | .unload = vmw_driver_unload, |
diff --git a/drivers/staging/vboxvideo/vbox_drv.c b/drivers/staging/vboxvideo/vbox_drv.c index cc6532d8c2fa..78cbcd68d4f3 100644 --- a/drivers/staging/vboxvideo/vbox_drv.c +++ b/drivers/staging/vboxvideo/vbox_drv.c | |||
@@ -221,7 +221,7 @@ static void vbox_master_drop(struct drm_device *dev, struct drm_file *file_priv) | |||
221 | 221 | ||
222 | static struct drm_driver driver = { | 222 | static struct drm_driver driver = { |
223 | .driver_features = | 223 | .driver_features = |
224 | DRIVER_MODESET | DRIVER_GEM | DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | | 224 | DRIVER_MODESET | DRIVER_GEM | DRIVER_IRQ_SHARED | |
225 | DRIVER_PRIME | DRIVER_ATOMIC, | 225 | DRIVER_PRIME | DRIVER_ATOMIC, |
226 | .dev_priv_size = 0, | 226 | .dev_priv_size = 0, |
227 | 227 | ||