projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'for-linus-4.4-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
gpu
/
drm
/
drm_bufs.c
diff --git
a/drivers/gpu/drm/drm_bufs.c
b/drivers/gpu/drm/drm_bufs.c
index 569064a00693eb2932186d72eddfda8b2aa74d5c..f1a204d253cce0bfb2616cd4a9b0ebb400e5718c 100644
(file)
--- a/
drivers/gpu/drm/drm_bufs.c
+++ b/
drivers/gpu/drm/drm_bufs.c
@@
-582,7
+582,7
@@
static void drm_cleanup_buf_error(struct drm_device * dev,
}
}
}
}
-#if
__OS_HAS_AGP
+#if
IS_ENABLED(CONFIG_AGP)
/**
* Add AGP buffers for DMA transfers.
*
/**
* Add AGP buffers for DMA transfers.
*
@@
-756,7
+756,7
@@
int drm_legacy_addbufs_agp(struct drm_device *dev,
return 0;
}
EXPORT_SYMBOL(drm_legacy_addbufs_agp);
return 0;
}
EXPORT_SYMBOL(drm_legacy_addbufs_agp);
-#endif
/* __OS_HAS
_AGP */
+#endif
/* CONFIG
_AGP */
int drm_legacy_addbufs_pci(struct drm_device *dev,
struct drm_buf_desc *request)
int drm_legacy_addbufs_pci(struct drm_device *dev,
struct drm_buf_desc *request)
@@
-1145,7
+1145,7
@@
int drm_legacy_addbufs(struct drm_device *dev, void *data,
if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
return -EINVAL;
if (!drm_core_check_feature(dev, DRIVER_HAVE_DMA))
return -EINVAL;
-#if
__OS_HAS_AGP
+#if
IS_ENABLED(CONFIG_AGP)
if (request->flags & _DRM_AGP_BUFFER)
ret = drm_legacy_addbufs_agp(dev, request);
else
if (request->flags & _DRM_AGP_BUFFER)
ret = drm_legacy_addbufs_agp(dev, request);
else