lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

drm/nouveau: inform userspace of new kernel subchannel requirements

Browse Source 
All available subchannels are now available for userspace to do with as it
pleases on NVC0+.

On all earlier chipsets, the kernel still uses a software object on subc 0
to implement the page flip completion method.  I hope to find some decent
way of addressing this too, but it's a tad tricker prior to fermi.

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2012-03-21 13:57:40 +10:00
parent 48aca13f01
commit 664695ae6f
2 changed files with 6 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
drivers/gpu/drm/nouveau/nouveau_channel.c
View File

@@ -436,18 +436,11 @@ nouveau_ioctl_fifo_alloc(struct drm_device *dev, void *data,
} }
if (dev_priv->card_type < NV_C0) { if (dev_priv->card_type < NV_C0) {
init->subchan[0].handle = NvM2MF; init->subchan[0].handle = NvSw;
if (dev_priv->card_type < NV_50) init->subchan[0].grclass = NV_SW;
init->subchan[0].grclass = 0x0039;
else
init->subchan[0].grclass = 0x5039;
init->subchan[1].handle = NvSw;
init->subchan[1].grclass = NV_SW;
init->nr_subchan = 2;
} else {
init->subchan[0].handle = 0x9039;
init->subchan[0].grclass = 0x9039;
init->nr_subchan = 1; init->nr_subchan = 1;
} else {
init->nr_subchan = 0;
} }
/* Named memory object area */ /* Named memory object area */

4
drivers/gpu/drm/nouveau/nouveau_dma.h
View File

@@ -48,8 +48,8 @@ void nv50_dma_push(struct nouveau_channel *, struct nouveau_bo *,
/* Hardcoded object assignments to subchannels (subchannel id). */ /* Hardcoded object assignments to subchannels (subchannel id). */
enum { enum {
NvSubM2MF = 0, NvSubSw = 0,
NvSubSw = 1, NvSubM2MF = 1,
NvSub2D = 2, NvSub2D = 2,
NvSubCtxSurf2D = 2, NvSubCtxSurf2D = 2,
NvSubGdiRect = 3, NvSubGdiRect = 3,