diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2017-05-19 23:59:35 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2017-06-16 14:05:00 +1000 |
| commit | 0d93cd92bd616474da0c842bc4e88f6921da18f1 (patch) | |
| tree | 730779e54ae04b5ce23168b5df583200aebce7ca /drivers/gpu/drm/nouveau/include | |
| parent | 8d7ef84d908877708001f3334dbf44e9d48fad57 (diff) | |
drm/nouveau/disp/nv50-: implement a common supervisor 3.0
This makes use of all the additional routing and state added in previous
commits, making it possible to deal with GM20x macro link routing, while
also sharing code between the NV50 and GF119 implementations.
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/nouveau/include')
| -rw-r--r-- | drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h index c7383e1f0966..06ab48052128 100644 --- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h +++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h @@ -3,16 +3,12 @@ struct nvbios_init { struct nvkm_subdev *subdev; - struct nvkm_bios *bios; u32 offset; struct dcb_output *outp; int or; int link; - union { - int head; - int crtc; - }; + int head; /* internal state used during parsing */ u8 execute; |