Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-12-29 06:12:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

drm: linux-next: build failure after merge of the drm-misc tree

Browse Source 
Hi all,

After merging the drm-misc tree, today's linux-next build (x86_64
allmodconfig) failed like this:

drivers/staging/vboxvideo/vbox_drv.c:235:2: error: unknown field 'set_busid' specified in initializer
  .set_busid = drm_pci_set_busid,
  ^
drivers/staging/vboxvideo/vbox_drv.c:235:15: error: 'drm_pci_set_busid' undeclared here (not in a function)
  .set_busid = drm_pci_set_busid,
               ^
drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_init':
drivers/staging/vboxvideo/vbox_drv.c:273:9: error: implicit declaration of function 'drm_pci_init' [-Werror=implicit-function-declaration]
  return drm_pci_init(&driver, &vbox_pci_driver);
         ^
drivers/staging/vboxvideo/vbox_drv.c: In function 'vbox_exit':
drivers/staging/vboxvideo/vbox_drv.c:278:2: error: implicit declaration of function 'drm_pci_exit' [-Werror=implicit-function-declaration]
  drm_pci_exit(&driver, &vbox_pci_driver);
  ^

Caused by commits

  5c484cee7e ("drm: Remove drm_driver->set_busid hook")
  10631d724d ("drm/pci: Deprecate drm_pci_init/exit completely")

interacting with commit

  dd55d44f40 ("staging: vboxvideo: Add vboxvideo to drivers/staging")

from the staging.current tree.

I have applied the following merge fix patch - please check that it
is correct.

From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 19 Jul 2017 11:41:01 +1000
Subject: [PATCH] drm: fixes for staging due to API changes in the drm core

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Stephen Rothwell 2017-07-19 11:46:57 +10:00 committed by Dave Airlie
parent 0eb2c0ae57
commit e6742e1021
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/staging/vboxvideo/vbox_drv.c
View File

@ -232,7 +232,6 @@ static struct drm_driver driver = {
.lastclose = vbox_driver_lastclose, .lastclose = vbox_driver_lastclose,
.master_set = vbox_master_set, .master_set = vbox_master_set,
.master_drop = vbox_master_drop, .master_drop = vbox_master_drop,
.set_busid = drm_pci_set_busid,
.fops = &vbox_fops, .fops = &vbox_fops,
.irq_handler = vbox_irq_handler, .irq_handler = vbox_irq_handler,
@ -270,12 +269,12 @@ static int __init vbox_init(void)
if (vbox_modeset == 0) if (vbox_modeset == 0)
return -EINVAL; return -EINVAL;
return drm_pci_init(&driver, &vbox_pci_driver); return pci_register_driver(&vbox_pci_driver);
} }
static void __exit vbox_exit(void) static void __exit vbox_exit(void)
{ {
drm_pci_exit(&driver, &vbox_pci_driver); pci_unregister_driver(&vbox_pci_driver);
} }
module_init(vbox_init); module_init(vbox_init);