git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
radeon
/
radeon_kms.c
diff --git
a/drivers/gpu/drm/radeon/radeon_kms.c
b/drivers/gpu/drm/radeon/radeon_kms.c
index
20ec276
..
c633319
100644
(file)
--- a/
drivers/gpu/drm/radeon/radeon_kms.c
+++ b/
drivers/gpu/drm/radeon/radeon_kms.c
@@
-31,6
+31,7
@@
#include "radeon_drm.h"
#include <linux/vga_switcheroo.h>
#include "radeon_drm.h"
#include <linux/vga_switcheroo.h>
+#include <linux/slab.h>
int radeon_driver_unload_kms(struct drm_device *dev)
{
int radeon_driver_unload_kms(struct drm_device *dev)
{
@@
-164,7
+165,7
@@
u32 radeon_get_vblank_counter_kms(struct drm_device *dev, int crtc)
{
struct radeon_device *rdev = dev->dev_private;
{
struct radeon_device *rdev = dev->dev_private;
- if (crtc < 0 || crtc >
1
) {
+ if (crtc < 0 || crtc >
= rdev->num_crtc
) {
DRM_ERROR("Invalid crtc %d\n", crtc);
return -EINVAL;
}
DRM_ERROR("Invalid crtc %d\n", crtc);
return -EINVAL;
}
@@
-176,7
+177,7
@@
int radeon_enable_vblank_kms(struct drm_device *dev, int crtc)
{
struct radeon_device *rdev = dev->dev_private;
{
struct radeon_device *rdev = dev->dev_private;
- if (crtc < 0 || crtc >
1
) {
+ if (crtc < 0 || crtc >
= rdev->num_crtc
) {
DRM_ERROR("Invalid crtc %d\n", crtc);
return -EINVAL;
}
DRM_ERROR("Invalid crtc %d\n", crtc);
return -EINVAL;
}
@@
-190,7
+191,7
@@
void radeon_disable_vblank_kms(struct drm_device *dev, int crtc)
{
struct radeon_device *rdev = dev->dev_private;
{
struct radeon_device *rdev = dev->dev_private;
- if (crtc < 0 || crtc >
1
) {
+ if (crtc < 0 || crtc >
= rdev->num_crtc
) {
DRM_ERROR("Invalid crtc %d\n", crtc);
return;
}
DRM_ERROR("Invalid crtc %d\n", crtc);
return;
}