diff options
author | Ben Skeggs <bskeggs@redhat.com> | 2015-04-13 21:47:24 -0400 |
---|---|---|
committer | Ben Skeggs <bskeggs@redhat.com> | 2015-04-14 03:00:56 -0400 |
commit | a1020afe88146ece4c1ae77c59b201e030116142 (patch) | |
tree | e87800c4f799ad555cdc27e8b21c7ab1c5abf484 | |
parent | 89025bd458a572f15e30f59d1ac5acb599cb53bc (diff) |
drm/nouveau: add support for gm20x fifo channels
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_chan.c | 3 | ||||
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c index e581f63cbf25..0589babc506e 100644 --- a/drivers/gpu/drm/nouveau/nouveau_chan.c +++ b/drivers/gpu/drm/nouveau/nouveau_chan.c | |||
@@ -184,7 +184,8 @@ static int | |||
184 | nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device, | 184 | nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device, |
185 | u32 handle, u32 engine, struct nouveau_channel **pchan) | 185 | u32 handle, u32 engine, struct nouveau_channel **pchan) |
186 | { | 186 | { |
187 | static const u16 oclasses[] = { KEPLER_CHANNEL_GPFIFO_A, | 187 | static const u16 oclasses[] = { MAXWELL_CHANNEL_GPFIFO_A, |
188 | KEPLER_CHANNEL_GPFIFO_A, | ||
188 | FERMI_CHANNEL_GPFIFO, | 189 | FERMI_CHANNEL_GPFIFO, |
189 | G82_CHANNEL_GPFIFO, | 190 | G82_CHANNEL_GPFIFO, |
190 | NV50_CHANNEL_GPFIFO, | 191 | NV50_CHANNEL_GPFIFO, |
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 8763deb5188b..89049335b738 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c | |||
@@ -181,6 +181,7 @@ nouveau_accel_init(struct nouveau_drm *drm) | |||
181 | break; | 181 | break; |
182 | case FERMI_CHANNEL_GPFIFO: | 182 | case FERMI_CHANNEL_GPFIFO: |
183 | case KEPLER_CHANNEL_GPFIFO_A: | 183 | case KEPLER_CHANNEL_GPFIFO_A: |
184 | case MAXWELL_CHANNEL_GPFIFO_A: | ||
184 | ret = nvc0_fence_create(drm); | 185 | ret = nvc0_fence_create(drm); |
185 | break; | 186 | break; |
186 | default: | 187 | default: |