diff options
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drv.h')
-rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drv.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drv.h b/drivers/gpu/drm/nouveau/nouveau_drv.h index 38134a9c7578..b82709828931 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drv.h +++ b/drivers/gpu/drm/nouveau/nouveau_drv.h | |||
@@ -1055,12 +1055,14 @@ extern int nouveau_dma_wait(struct nouveau_channel *, int slots, int size); | |||
1055 | #if defined(CONFIG_ACPI) | 1055 | #if defined(CONFIG_ACPI) |
1056 | void nouveau_register_dsm_handler(void); | 1056 | void nouveau_register_dsm_handler(void); |
1057 | void nouveau_unregister_dsm_handler(void); | 1057 | void nouveau_unregister_dsm_handler(void); |
1058 | void nouveau_switcheroo_optimus_dsm(void); | ||
1058 | int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len); | 1059 | int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len); |
1059 | bool nouveau_acpi_rom_supported(struct pci_dev *pdev); | 1060 | bool nouveau_acpi_rom_supported(struct pci_dev *pdev); |
1060 | int nouveau_acpi_edid(struct drm_device *, struct drm_connector *); | 1061 | int nouveau_acpi_edid(struct drm_device *, struct drm_connector *); |
1061 | #else | 1062 | #else |
1062 | static inline void nouveau_register_dsm_handler(void) {} | 1063 | static inline void nouveau_register_dsm_handler(void) {} |
1063 | static inline void nouveau_unregister_dsm_handler(void) {} | 1064 | static inline void nouveau_unregister_dsm_handler(void) {} |
1065 | static inline void nouveau_switcheroo_optimus_dsm(void) {} | ||
1064 | static inline bool nouveau_acpi_rom_supported(struct pci_dev *pdev) { return false; } | 1066 | static inline bool nouveau_acpi_rom_supported(struct pci_dev *pdev) { return false; } |
1065 | static inline int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) { return -EINVAL; } | 1067 | static inline int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) { return -EINVAL; } |
1066 | static inline int nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) { return -EINVAL; } | 1068 | static inline int nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) { return -EINVAL; } |