diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2012-07-13 20:48:12 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2012-10-02 23:12:52 -0400 |
commit | 092599da308bf56b96c849ecdd315b8a1a13ca52 (patch) | |
tree | f89cfe060187e5c2d982844bdc268f3d036a69af /drivers | |
parent | 73a60c0d218a292f8ef29d3467726ff26ed366fc (diff) |
drm/nv50/instmem: remove use of nouveau_gpuobj_new_fake()
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c | 19 |
1 files changed, 2 insertions, 17 deletions
diff --git a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c index be7344d1334..f88530b96ec 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c +++ b/drivers/gpu/drm/nouveau/core/subdev/instmem/nv50.c | |||
@@ -53,7 +53,6 @@ nv50_channel_del(struct nouveau_channel **pchan) | |||
53 | if (!chan) | 53 | if (!chan) |
54 | return; | 54 | return; |
55 | 55 | ||
56 | nouveau_gpuobj_ref(NULL, &chan->ramfc); | ||
57 | nouveau_vm_ref(NULL, &chan->vm, chan->vm_pd); | 56 | nouveau_vm_ref(NULL, &chan->vm, chan->vm_pd); |
58 | nouveau_gpuobj_ref(NULL, &chan->vm_pd); | 57 | nouveau_gpuobj_ref(NULL, &chan->vm_pd); |
59 | if (drm_mm_initialized(&chan->ramin_heap)) | 58 | if (drm_mm_initialized(&chan->ramin_heap)) |
@@ -68,7 +67,6 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm, | |||
68 | { | 67 | { |
69 | struct drm_nouveau_private *dev_priv = dev->dev_private; | 68 | struct drm_nouveau_private *dev_priv = dev->dev_private; |
70 | u32 pgd = (dev_priv->chipset == 0x50) ? 0x1400 : 0x0200; | 69 | u32 pgd = (dev_priv->chipset == 0x50) ? 0x1400 : 0x0200; |
71 | u32 fc = (dev_priv->chipset == 0x50) ? 0x0000 : 0x4200; | ||
72 | struct nouveau_channel *chan; | 70 | struct nouveau_channel *chan; |
73 | int ret, i; | 71 | int ret, i; |
74 | 72 | ||
@@ -83,17 +81,13 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm, | |||
83 | return ret; | 81 | return ret; |
84 | } | 82 | } |
85 | 83 | ||
86 | ret = drm_mm_init(&chan->ramin_heap, 0x6000, chan->ramin->size - 0x6000); | 84 | ret = drm_mm_init(&chan->ramin_heap, pgd, chan->ramin->size - pgd); |
87 | if (ret) { | 85 | if (ret) { |
88 | nv50_channel_del(&chan); | 86 | nv50_channel_del(&chan); |
89 | return ret; | 87 | return ret; |
90 | } | 88 | } |
91 | 89 | ||
92 | ret = nouveau_gpuobj_new_fake(dev, chan->ramin->pinst == ~0 ? ~0 : | 90 | ret = nouveau_gpuobj_new(dev, chan, 0x4000, 0, 0, &chan->vm_pd); |
93 | chan->ramin->pinst + pgd, | ||
94 | chan->ramin->vinst + pgd, | ||
95 | 0x4000, NVOBJ_FLAG_ZERO_ALLOC, | ||
96 | &chan->vm_pd); | ||
97 | if (ret) { | 91 | if (ret) { |
98 | nv50_channel_del(&chan); | 92 | nv50_channel_del(&chan); |
99 | return ret; | 93 | return ret; |
@@ -110,15 +104,6 @@ nv50_channel_new(struct drm_device *dev, u32 size, struct nouveau_vm *vm, | |||
110 | return ret; | 104 | return ret; |
111 | } | 105 | } |
112 | 106 | ||
113 | ret = nouveau_gpuobj_new_fake(dev, chan->ramin->pinst == ~0 ? ~0 : | ||
114 | chan->ramin->pinst + fc, | ||
115 | chan->ramin->vinst + fc, 0x100, | ||
116 | NVOBJ_FLAG_ZERO_ALLOC, &chan->ramfc); | ||
117 | if (ret) { | ||
118 | nv50_channel_del(&chan); | ||
119 | return ret; | ||
120 | } | ||
121 | |||
122 | *pchan = chan; | 107 | *pchan = chan; |
123 | return 0; | 108 | return 0; |
124 | } | 109 | } |