From ebd53577036eb568e6976e14dea6449e373702b8 Mon Sep 17 00:00:00 2001 From: Ben Skeggs Date: Tue, 14 Apr 2015 11:47:24 +1000 Subject: drm: add support for gm20x fifo channels Signed-off-by: Ben Skeggs --- drm/nouveau/nouveau_chan.c | 3 ++- drm/nouveau/nouveau_drm.c | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/drm/nouveau/nouveau_chan.c b/drm/nouveau/nouveau_chan.c index e581f63cb..0589babc5 100644 --- a/drm/nouveau/nouveau_chan.c +++ b/drm/nouveau/nouveau_chan.c @@ -184,7 +184,8 @@ static int nouveau_channel_ind(struct nouveau_drm *drm, struct nvif_device *device, u32 handle, u32 engine, struct nouveau_channel **pchan) { - static const u16 oclasses[] = { KEPLER_CHANNEL_GPFIFO_A, + static const u16 oclasses[] = { MAXWELL_CHANNEL_GPFIFO_A, + KEPLER_CHANNEL_GPFIFO_A, FERMI_CHANNEL_GPFIFO, G82_CHANNEL_GPFIFO, NV50_CHANNEL_GPFIFO, diff --git a/drm/nouveau/nouveau_drm.c b/drm/nouveau/nouveau_drm.c index 8763deb51..89049335b 100644 --- a/drm/nouveau/nouveau_drm.c +++ b/drm/nouveau/nouveau_drm.c @@ -181,6 +181,7 @@ nouveau_accel_init(struct nouveau_drm *drm) break; case FERMI_CHANNEL_GPFIFO: case KEPLER_CHANNEL_GPFIFO_A: + case MAXWELL_CHANNEL_GPFIFO_A: ret = nvc0_fence_create(drm); break; default: -- cgit v1.2.1