projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-for-v4.9' of git://people.freedesktop.org/~airlied/linux
[cascardo/linux.git]
/
drivers
/
gpu
/
drm
/
drm_pci.c
diff --git
a/drivers/gpu/drm/drm_pci.c
b/drivers/gpu/drm/drm_pci.c
index
b2f8f10
..
3ceea9c
100644
(file)
--- a/
drivers/gpu/drm/drm_pci.c
+++ b/
drivers/gpu/drm/drm_pci.c
@@
-175,7
+175,7
@@
int drm_irq_by_busid(struct drm_device *dev, void *data,
{
struct drm_irq_busid *p = data;
{
struct drm_irq_busid *p = data;
- if (
drm_core_check_feature(dev, DRIVER_MODESET
))
+ if (
!drm_core_check_feature(dev, DRIVER_LEGACY
))
return -EINVAL;
/* UMS was only ever support on PCI devices. */
return -EINVAL;
/* UMS was only ever support on PCI devices. */
@@
-236,8
+236,8
@@
int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
DRM_DEBUG("\n");
dev = drm_dev_alloc(driver, &pdev->dev);
DRM_DEBUG("\n");
dev = drm_dev_alloc(driver, &pdev->dev);
- if (
!dev
)
- return
-ENOMEM
;
+ if (
IS_ERR(dev)
)
+ return
PTR_ERR(dev)
;
ret = pci_enable_device(pdev);
if (ret)
ret = pci_enable_device(pdev);
if (ret)
@@
-263,7
+263,7
@@
int drm_get_pci_dev(struct pci_dev *pdev, const struct pci_device_id *ent,
/* No locking needed since shadow-attach is single-threaded since it may
* only be called from the per-driver module init hook. */
/* No locking needed since shadow-attach is single-threaded since it may
* only be called from the per-driver module init hook. */
- if (
!drm_core_check_feature(dev, DRIVER_MODESET
))
+ if (
drm_core_check_feature(dev, DRIVER_LEGACY
))
list_add_tail(&dev->legacy_dev_list, &driver->legacy_dev_list);
return 0;
list_add_tail(&dev->legacy_dev_list, &driver->legacy_dev_list);
return 0;
@@
-299,7
+299,7
@@
int drm_pci_init(struct drm_driver *driver, struct pci_driver *pdriver)
DRM_DEBUG("\n");
DRM_DEBUG("\n");
- if (
driver->driver_features & DRIVER_MODESET
)
+ if (
!(driver->driver_features & DRIVER_LEGACY)
)
return pci_register_driver(pdriver);
/* If not using KMS, fall back to stealth mode manual scanning. */
return pci_register_driver(pdriver);
/* If not using KMS, fall back to stealth mode manual scanning. */
@@
-421,7
+421,7
@@
void drm_pci_exit(struct drm_driver *driver, struct pci_driver *pdriver)
struct drm_device *dev, *tmp;
DRM_DEBUG("\n");
struct drm_device *dev, *tmp;
DRM_DEBUG("\n");
- if (
driver->driver_features & DRIVER_MODESET
) {
+ if (
!(driver->driver_features & DRIVER_LEGACY)
) {
pci_unregister_driver(pdriver);
} else {
list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list,
pci_unregister_driver(pdriver);
} else {
list_for_each_entry_safe(dev, tmp, &driver->legacy_dev_list,