From 47c0949719ee143426f9323a5f9ada3f9e1e729d Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Wed, 29 Dec 2010 10:41:20 +1000 Subject: [PATCH] --- yaml --- r: 228842 b: refs/heads/master c: 93d0cd7b9e4855c12b3bb5c9367872476c78fef9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nvc0_fbcon.c | 2 -- trunk/drivers/gpu/drm/nouveau/nvc0_graph.c | 1 - 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 9fdc485f209f..ceed908cf826 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b1cd916ab96e5fcd16e2009410af2e8edfae2962 +refs/heads/master: 93d0cd7b9e4855c12b3bb5c9367872476c78fef9 diff --git a/trunk/drivers/gpu/drm/nouveau/nvc0_fbcon.c b/trunk/drivers/gpu/drm/nouveau/nvc0_fbcon.c index cbb4a1ae20b1..fa5d4c234383 100644 --- a/trunk/drivers/gpu/drm/nouveau/nvc0_fbcon.c +++ b/trunk/drivers/gpu/drm/nouveau/nvc0_fbcon.c @@ -200,8 +200,6 @@ nvc0_fbcon_accel_init(struct fb_info *info) return ret; } - printk(KERN_ERR "fb vma 0x%010llx\n", nvbo->vma.offset); - BEGIN_NVC0(chan, 2, NvSub2D, 0x0000, 1); OUT_RING (chan, 0x0000902d); BEGIN_NVC0(chan, 2, NvSub2D, 0x0104, 2); diff --git a/trunk/drivers/gpu/drm/nouveau/nvc0_graph.c b/trunk/drivers/gpu/drm/nouveau/nvc0_graph.c index f03c17a10ab9..c28bc7b04d27 100644 --- a/trunk/drivers/gpu/drm/nouveau/nvc0_graph.c +++ b/trunk/drivers/gpu/drm/nouveau/nvc0_graph.c @@ -244,7 +244,6 @@ nvc0_graph_load_context(struct nouveau_channel *chan) if (!nv_wait(dev, 0x409800, 0x00000010, 0x00000010)) NV_ERROR(dev, "PGRAPH: load_ctx timeout\n"); - printk(KERN_ERR "load_ctx 0x%08x\n", nv_rd32(dev, 0x409b00)); return 0; }