drm/nouveau: add support for gm20x fifo channels

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>

diff --git a/drivers/gpu/drm/nouveau/nouveau_chan.c b/drivers/gpu/drm/nouveau/nouveau_chan.c
index e581f63cbf25eefabc64c32c6c2f7826d89aede1..0589babc506eb3ca186b31e8058dc7e86fc04f9f 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_chan.c
+++ b/drivers/gpu/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/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c
index 8763deb5188bb75ad041755e75add0b85726e106..89049335b7383a12749e3d0e2f55f00be81598d4 100644 (file)
--- 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)
                        break;
                case FERMI_CHANNEL_GPFIFO:
                case KEPLER_CHANNEL_GPFIFO_A:
+               case MAXWELL_CHANNEL_GPFIFO_A:
                        ret = nvc0_fence_create(drm);
                        break;
                default: