aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 13:37:40 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-03-18 13:37:40 -0400
commite16b396ce314b2bcdfe6c173fe075bf8e3432368 (patch)
tree640f0f56f2ea676647af4eb42d32fa56be2ee549 /drivers/gpu
parent7fd23a24717a327a66f3c32d11a20a2f169c824f (diff)
parente6e8dd5055a974935af1398c8648d4a9359b0ecb (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (47 commits) doc: CONFIG_UNEVICTABLE_LRU doesn't exist anymore Update cpuset info & webiste for cgroups dcdbas: force SMI to happen when expected arch/arm/Kconfig: remove one to many l's in the word. asm-generic/user.h: Fix spelling in comment drm: fix printk typo 'sracth' Remove one to many n's in a word Documentation/filesystems/romfs.txt: fixing link to genromfs drivers:scsi Change printk typo initate -> initiate serial, pch uart: Remove duplicate inclusion of linux/pci.h header fs/eventpoll.c: fix spelling mm: Fix out-of-date comments which refers non-existent functions drm: Fix printk typo 'failled' coh901318.c: Change initate to initiate. mbox-db5500.c Change initate to initiate. edac: correct i82975x error-info reported edac: correct i82975x mci initialisation edac: correct commented info fs: update comments to point correct document target: remove duplicate include of target/target_core_device.h from drivers/target/target_core_hba.c ... Trivial conflict in fs/eventpoll.c (spelling vs addition)
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/drm_sman.c4
-rw-r--r--drivers/gpu/drm/radeon/evergreen.c2
-rw-r--r--drivers/gpu/drm/radeon/r100.c10
-rw-r--r--drivers/gpu/drm/radeon/r300.c4
-rw-r--r--drivers/gpu/drm/radeon/r420.c4
-rw-r--r--drivers/gpu/drm/radeon/r520.c4
-rw-r--r--drivers/gpu/drm/radeon/r600.c2
-rw-r--r--drivers/gpu/drm/radeon/radeon_ring.c2
-rw-r--r--drivers/gpu/drm/radeon/rs400.c4
-rw-r--r--drivers/gpu/drm/radeon/rs600.c4
-rw-r--r--drivers/gpu/drm/radeon/rs690.c4
-rw-r--r--drivers/gpu/drm/radeon/rv515.c4
-rw-r--r--drivers/gpu/drm/radeon/rv770.c2
13 files changed, 24 insertions, 26 deletions
diff --git a/drivers/gpu/drm/drm_sman.c b/drivers/gpu/drm/drm_sman.c
index 463aed9403db..34664587a74e 100644
--- a/drivers/gpu/drm/drm_sman.c
+++ b/drivers/gpu/drm/drm_sman.c
@@ -59,9 +59,7 @@ drm_sman_init(struct drm_sman * sman, unsigned int num_managers,
59{ 59{
60 int ret = 0; 60 int ret = 0;
61 61
62 sman->mm = (struct drm_sman_mm *) kcalloc(num_managers, 62 sman->mm = kcalloc(num_managers, sizeof(*sman->mm), GFP_KERNEL);
63 sizeof(*sman->mm),
64 GFP_KERNEL);
65 if (!sman->mm) { 63 if (!sman->mm) {
66 ret = -ENOMEM; 64 ret = -ENOMEM;
67 goto out; 65 goto out;
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c
index b9427e689cf3..941080a77940 100644
--- a/drivers/gpu/drm/radeon/evergreen.c
+++ b/drivers/gpu/drm/radeon/evergreen.c
@@ -2987,7 +2987,7 @@ int evergreen_resume(struct radeon_device *rdev)
2987 2987
2988 r = r600_ib_test(rdev); 2988 r = r600_ib_test(rdev);
2989 if (r) { 2989 if (r) {
2990 DRM_ERROR("radeon: failled testing IB (%d).\n", r); 2990 DRM_ERROR("radeon: failed testing IB (%d).\n", r);
2991 return r; 2991 return r;
2992 } 2992 }
2993 2993
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c
index fcc23e4e0b3c..f2204cb1ccdf 100644
--- a/drivers/gpu/drm/radeon/r100.c
+++ b/drivers/gpu/drm/radeon/r100.c
@@ -3617,7 +3617,7 @@ int r100_ib_test(struct radeon_device *rdev)
3617 if (i < rdev->usec_timeout) { 3617 if (i < rdev->usec_timeout) {
3618 DRM_INFO("ib test succeeded in %u usecs\n", i); 3618 DRM_INFO("ib test succeeded in %u usecs\n", i);
3619 } else { 3619 } else {
3620 DRM_ERROR("radeon: ib test failed (sracth(0x%04X)=0x%08X)\n", 3620 DRM_ERROR("radeon: ib test failed (scratch(0x%04X)=0x%08X)\n",
3621 scratch, tmp); 3621 scratch, tmp);
3622 r = -EINVAL; 3622 r = -EINVAL;
3623 } 3623 }
@@ -3637,13 +3637,13 @@ int r100_ib_init(struct radeon_device *rdev)
3637 3637
3638 r = radeon_ib_pool_init(rdev); 3638 r = radeon_ib_pool_init(rdev);
3639 if (r) { 3639 if (r) {
3640 dev_err(rdev->dev, "failled initializing IB pool (%d).\n", r); 3640 dev_err(rdev->dev, "failed initializing IB pool (%d).\n", r);
3641 r100_ib_fini(rdev); 3641 r100_ib_fini(rdev);
3642 return r; 3642 return r;
3643 } 3643 }
3644 r = r100_ib_test(rdev); 3644 r = r100_ib_test(rdev);
3645 if (r) { 3645 if (r) {
3646 dev_err(rdev->dev, "failled testing IB (%d).\n", r); 3646 dev_err(rdev->dev, "failed testing IB (%d).\n", r);
3647 r100_ib_fini(rdev); 3647 r100_ib_fini(rdev);
3648 return r; 3648 return r;
3649 } 3649 }
@@ -3799,12 +3799,12 @@ static int r100_startup(struct radeon_device *rdev)
3799 /* 1M ring buffer */ 3799 /* 1M ring buffer */
3800 r = r100_cp_init(rdev, 1024 * 1024); 3800 r = r100_cp_init(rdev, 1024 * 1024);
3801 if (r) { 3801 if (r) {
3802 dev_err(rdev->dev, "failled initializing CP (%d).\n", r); 3802 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
3803 return r; 3803 return r;
3804 } 3804 }
3805 r = r100_ib_init(rdev); 3805 r = r100_ib_init(rdev);
3806 if (r) { 3806 if (r) {
3807 dev_err(rdev->dev, "failled initializing IB (%d).\n", r); 3807 dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
3808 return r; 3808 return r;
3809 } 3809 }
3810 return 0; 3810 return 0;
diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c
index 069efa8c8ecf..8713731fa014 100644
--- a/drivers/gpu/drm/radeon/r300.c
+++ b/drivers/gpu/drm/radeon/r300.c
@@ -1401,12 +1401,12 @@ static int r300_startup(struct radeon_device *rdev)
1401 /* 1M ring buffer */ 1401 /* 1M ring buffer */
1402 r = r100_cp_init(rdev, 1024 * 1024); 1402 r = r100_cp_init(rdev, 1024 * 1024);
1403 if (r) { 1403 if (r) {
1404 dev_err(rdev->dev, "failled initializing CP (%d).\n", r); 1404 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
1405 return r; 1405 return r;
1406 } 1406 }
1407 r = r100_ib_init(rdev); 1407 r = r100_ib_init(rdev);
1408 if (r) { 1408 if (r) {
1409 dev_err(rdev->dev, "failled initializing IB (%d).\n", r); 1409 dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
1410 return r; 1410 return r;
1411 } 1411 }
1412 return 0; 1412 return 0;
diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c
index 0b59ed7c7d2c..417fab81812f 100644
--- a/drivers/gpu/drm/radeon/r420.c
+++ b/drivers/gpu/drm/radeon/r420.c
@@ -260,13 +260,13 @@ static int r420_startup(struct radeon_device *rdev)
260 /* 1M ring buffer */ 260 /* 1M ring buffer */
261 r = r100_cp_init(rdev, 1024 * 1024); 261 r = r100_cp_init(rdev, 1024 * 1024);
262 if (r) { 262 if (r) {
263 dev_err(rdev->dev, "failled initializing CP (%d).\n", r); 263 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
264 return r; 264 return r;
265 } 265 }
266 r420_cp_errata_init(rdev); 266 r420_cp_errata_init(rdev);
267 r = r100_ib_init(rdev); 267 r = r100_ib_init(rdev);
268 if (r) { 268 if (r) {
269 dev_err(rdev->dev, "failled initializing IB (%d).\n", r); 269 dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
270 return r; 270 return r;
271 } 271 }
272 return 0; 272 return 0;
diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c
index 2ce80d976568..3081d07f8de5 100644
--- a/drivers/gpu/drm/radeon/r520.c
+++ b/drivers/gpu/drm/radeon/r520.c
@@ -193,12 +193,12 @@ static int r520_startup(struct radeon_device *rdev)
193 /* 1M ring buffer */ 193 /* 1M ring buffer */
194 r = r100_cp_init(rdev, 1024 * 1024); 194 r = r100_cp_init(rdev, 1024 * 1024);
195 if (r) { 195 if (r) {
196 dev_err(rdev->dev, "failled initializing CP (%d).\n", r); 196 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
197 return r; 197 return r;
198 } 198 }
199 r = r100_ib_init(rdev); 199 r = r100_ib_init(rdev);
200 if (r) { 200 if (r) {
201 dev_err(rdev->dev, "failled initializing IB (%d).\n", r); 201 dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
202 return r; 202 return r;
203 } 203 }
204 return 0; 204 return 0;
diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c
index 12fdebf9aed8..be271c42de4d 100644
--- a/drivers/gpu/drm/radeon/r600.c
+++ b/drivers/gpu/drm/radeon/r600.c
@@ -2464,7 +2464,7 @@ int r600_resume(struct radeon_device *rdev)
2464 2464
2465 r = r600_ib_test(rdev); 2465 r = r600_ib_test(rdev);
2466 if (r) { 2466 if (r) {
2467 DRM_ERROR("radeon: failled testing IB (%d).\n", r); 2467 DRM_ERROR("radeon: failed testing IB (%d).\n", r);
2468 return r; 2468 return r;
2469 } 2469 }
2470 2470
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c
index 992d99d13fc5..bbc9cd823334 100644
--- a/drivers/gpu/drm/radeon/radeon_ring.c
+++ b/drivers/gpu/drm/radeon/radeon_ring.c
@@ -151,7 +151,7 @@ int radeon_ib_schedule(struct radeon_device *rdev, struct radeon_ib *ib)
151 /* 64 dwords should be enough for fence too */ 151 /* 64 dwords should be enough for fence too */
152 r = radeon_ring_lock(rdev, 64); 152 r = radeon_ring_lock(rdev, 64);
153 if (r) { 153 if (r) {
154 DRM_ERROR("radeon: scheduling IB failled (%d).\n", r); 154 DRM_ERROR("radeon: scheduling IB failed (%d).\n", r);
155 return r; 155 return r;
156 } 156 }
157 radeon_ring_ib_execute(rdev, ib); 157 radeon_ring_ib_execute(rdev, ib);
diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c
index c76283d9eb3d..aa6a66eeb4ec 100644
--- a/drivers/gpu/drm/radeon/rs400.c
+++ b/drivers/gpu/drm/radeon/rs400.c
@@ -412,12 +412,12 @@ static int rs400_startup(struct radeon_device *rdev)
412 /* 1M ring buffer */ 412 /* 1M ring buffer */
413 r = r100_cp_init(rdev, 1024 * 1024); 413 r = r100_cp_init(rdev, 1024 * 1024);
414 if (r) { 414 if (r) {
415 dev_err(rdev->dev, "failled initializing CP (%d).\n", r); 415 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
416 return r; 416 return r;
417 } 417 }
418 r = r100_ib_init(rdev); 418 r = r100_ib_init(rdev);
419 if (r) { 419 if (r) {
420 dev_err(rdev->dev, "failled initializing IB (%d).\n", r); 420 dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
421 return r; 421 return r;
422 } 422 }
423 return 0; 423 return 0;
diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c
index 8af4679db23e..19763f5df5e1 100644
--- a/drivers/gpu/drm/radeon/rs600.c
+++ b/drivers/gpu/drm/radeon/rs600.c
@@ -865,12 +865,12 @@ static int rs600_startup(struct radeon_device *rdev)
865 /* 1M ring buffer */ 865 /* 1M ring buffer */
866 r = r100_cp_init(rdev, 1024 * 1024); 866 r = r100_cp_init(rdev, 1024 * 1024);
867 if (r) { 867 if (r) {
868 dev_err(rdev->dev, "failled initializing CP (%d).\n", r); 868 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
869 return r; 869 return r;
870 } 870 }
871 r = r100_ib_init(rdev); 871 r = r100_ib_init(rdev);
872 if (r) { 872 if (r) {
873 dev_err(rdev->dev, "failled initializing IB (%d).\n", r); 873 dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
874 return r; 874 return r;
875 } 875 }
876 876
diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c
index 66c949b7c18c..a9049ed1a519 100644
--- a/drivers/gpu/drm/radeon/rs690.c
+++ b/drivers/gpu/drm/radeon/rs690.c
@@ -627,12 +627,12 @@ static int rs690_startup(struct radeon_device *rdev)
627 /* 1M ring buffer */ 627 /* 1M ring buffer */
628 r = r100_cp_init(rdev, 1024 * 1024); 628 r = r100_cp_init(rdev, 1024 * 1024);
629 if (r) { 629 if (r) {
630 dev_err(rdev->dev, "failled initializing CP (%d).\n", r); 630 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
631 return r; 631 return r;
632 } 632 }
633 r = r100_ib_init(rdev); 633 r = r100_ib_init(rdev);
634 if (r) { 634 if (r) {
635 dev_err(rdev->dev, "failled initializing IB (%d).\n", r); 635 dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
636 return r; 636 return r;
637 } 637 }
638 638
diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c
index 64b57af93714..6613ee9ecca3 100644
--- a/drivers/gpu/drm/radeon/rv515.c
+++ b/drivers/gpu/drm/radeon/rv515.c
@@ -398,12 +398,12 @@ static int rv515_startup(struct radeon_device *rdev)
398 /* 1M ring buffer */ 398 /* 1M ring buffer */
399 r = r100_cp_init(rdev, 1024 * 1024); 399 r = r100_cp_init(rdev, 1024 * 1024);
400 if (r) { 400 if (r) {
401 dev_err(rdev->dev, "failled initializing CP (%d).\n", r); 401 dev_err(rdev->dev, "failed initializing CP (%d).\n", r);
402 return r; 402 return r;
403 } 403 }
404 r = r100_ib_init(rdev); 404 r = r100_ib_init(rdev);
405 if (r) { 405 if (r) {
406 dev_err(rdev->dev, "failled initializing IB (%d).\n", r); 406 dev_err(rdev->dev, "failed initializing IB (%d).\n", r);
407 return r; 407 return r;
408 } 408 }
409 return 0; 409 return 0;
diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c
index 4cc7b717fedd..b974ac7df8df 100644
--- a/drivers/gpu/drm/radeon/rv770.c
+++ b/drivers/gpu/drm/radeon/rv770.c
@@ -1209,7 +1209,7 @@ int rv770_resume(struct radeon_device *rdev)
1209 1209
1210 r = r600_ib_test(rdev); 1210 r = r600_ib_test(rdev);
1211 if (r) { 1211 if (r) {
1212 DRM_ERROR("radeon: failled testing IB (%d).\n", r); 1212 DRM_ERROR("radeon: failed testing IB (%d).\n", r);
1213 return r; 1213 return r;
1214 } 1214 }
1215 1215
generated by cgit v1.2.2 (git 2.25.0) at 2025-01-18 00:00:54 -0500