summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/nouveau/include
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2017-05-19 23:59:34 +1000
committerBen Skeggs <bskeggs@redhat.com>2017-06-16 14:04:43 +1000
commit2195a22f6dd9f413c952b81dd228db606e32c67c (patch)
tree4053b7116a4fe8a970accffc34f6641558677362 /drivers/gpu/drm/nouveau/include
parent5b0e787ad599a8e6803daf743dfc4642018ba469 (diff)
drm/nouveau/bios/init: rename 'crtc' to 'head'
Compatibility temporarily in place until all callers have been updated. 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.h6
1 files changed, 5 insertions, 1 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 98aa9ece0dc5..53b3b4cd77d7 100644
--- a/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
+++ b/drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/init.h
@@ -5,8 +5,12 @@ struct nvbios_init {
struct nvkm_subdev *subdev;
struct nvkm_bios *bios;
u16 offset;
+
struct dcb_output *outp;
- int crtc;
+ union {
+ int head;
+ int crtc;
+ };
/* internal state used during parsing */
u8 execute;