mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
drm/nouveau/acpi: move definitions out of nouveau_drv.h
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
parent
d38ac5217a
commit
c0077061e7
7 changed files with 40 additions and 36 deletions
|
@ -167,6 +167,9 @@ nouveau-y += nv50_fbcon.o nvc0_fbcon.o
|
|||
|
||||
# drm/kms/nvd9-
|
||||
|
||||
# other random bits
|
||||
nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
|
||||
|
||||
##
|
||||
## unported bits below
|
||||
##
|
||||
|
@ -200,7 +203,6 @@ nouveau-y += nouveau_mem.o
|
|||
# optional stuff
|
||||
nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o
|
||||
nouveau-$(CONFIG_DRM_NOUVEAU_BACKLIGHT) += nouveau_backlight.o
|
||||
nouveau-$(CONFIG_ACPI) += nouveau_acpi.o
|
||||
|
||||
|
||||
obj-$(CONFIG_DRM_NOUVEAU)+= nouveau.o
|
||||
|
|
|
@ -7,16 +7,13 @@
|
|||
#include <acpi/acpi.h>
|
||||
#include <linux/mxm-wmi.h>
|
||||
|
||||
#include "drmP.h"
|
||||
#include "drm.h"
|
||||
#include "drm_sarea.h"
|
||||
#include "drm_crtc_helper.h"
|
||||
#include "nouveau_drv.h"
|
||||
#include <nouveau_drm.h>
|
||||
#include "nouveau_connector.h"
|
||||
|
||||
#include <linux/vga_switcheroo.h>
|
||||
|
||||
#include "drm_edid.h"
|
||||
|
||||
#include "nouveau_drm.h"
|
||||
#include "nouveau_acpi.h"
|
||||
|
||||
#define NOUVEAU_DSM_LED 0x02
|
||||
#define NOUVEAU_DSM_LED_STATE 0x00
|
||||
#define NOUVEAU_DSM_LED_OFF 0x10
|
||||
|
@ -389,10 +386,9 @@ int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len)
|
|||
return nouveau_rom_call(nouveau_dsm_priv.rom_handle, bios, offset, len);
|
||||
}
|
||||
|
||||
int
|
||||
void *
|
||||
nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
|
||||
{
|
||||
struct nouveau_connector *nv_connector = nouveau_connector(connector);
|
||||
struct acpi_device *acpidev;
|
||||
acpi_handle handle;
|
||||
int type, ret;
|
||||
|
@ -404,21 +400,20 @@ nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector)
|
|||
type = ACPI_VIDEO_DISPLAY_LCD;
|
||||
break;
|
||||
default:
|
||||
return -EINVAL;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
handle = DEVICE_ACPI_HANDLE(&dev->pdev->dev);
|
||||
if (!handle)
|
||||
return -ENODEV;
|
||||
return NULL;
|
||||
|
||||
ret = acpi_bus_get_device(handle, &acpidev);
|
||||
if (ret)
|
||||
return -ENODEV;
|
||||
return NULL;
|
||||
|
||||
ret = acpi_video_get_edid(acpidev, type, -1, &edid);
|
||||
if (ret < 0)
|
||||
return ret;
|
||||
return NULL;
|
||||
|
||||
nv_connector->edid = kmemdup(edid, EDID_LENGTH, GFP_KERNEL);
|
||||
return 0;
|
||||
return kmemdup(edid, EDID_LENGTH, GFP_KERNEL);
|
||||
}
|
||||
|
|
22
drivers/gpu/drm/nouveau/nouveau_acpi.h
Normal file
22
drivers/gpu/drm/nouveau/nouveau_acpi.h
Normal file
|
@ -0,0 +1,22 @@
|
|||
#ifndef __NOUVEAU_ACPI_H__
|
||||
#define __NOUVEAU_ACPI_H__
|
||||
|
||||
#define ROM_BIOS_PAGE 4096
|
||||
|
||||
#if defined(CONFIG_ACPI)
|
||||
void nouveau_register_dsm_handler(void);
|
||||
void nouveau_unregister_dsm_handler(void);
|
||||
void nouveau_switcheroo_optimus_dsm(void);
|
||||
int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
|
||||
bool nouveau_acpi_rom_supported(struct pci_dev *pdev);
|
||||
void *nouveau_acpi_edid(struct drm_device *, struct drm_connector *);
|
||||
#else
|
||||
static inline void nouveau_register_dsm_handler(void) {}
|
||||
static inline void nouveau_unregister_dsm_handler(void) {}
|
||||
static inline void nouveau_switcheroo_optimus_dsm(void) {}
|
||||
static inline bool nouveau_acpi_rom_supported(struct pci_dev *pdev) { return false; }
|
||||
static inline int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) { return -EINVAL; }
|
||||
static inline void *nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) { return NULL; }
|
||||
#endif
|
||||
|
||||
#endif
|
|
@ -36,6 +36,7 @@
|
|||
#include "nouveau_crtc.h"
|
||||
#include "nouveau_connector.h"
|
||||
#include "nouveau_hw.h"
|
||||
#include "nouveau_acpi.h"
|
||||
|
||||
#include <subdev/bios/gpio.h>
|
||||
|
||||
|
@ -335,7 +336,7 @@ nouveau_connector_detect_lvds(struct drm_connector *connector, bool force)
|
|||
* valid - it's not (rh#613284)
|
||||
*/
|
||||
if (nv_encoder->dcb->lvdsconf.use_acpi_for_edid) {
|
||||
if (!nouveau_acpi_edid(dev, connector)) {
|
||||
if (!(nv_connector->edid = nouveau_acpi_edid(dev, connector))) {
|
||||
status = connector_status_connected;
|
||||
goto out;
|
||||
}
|
||||
|
|
|
@ -36,6 +36,7 @@
|
|||
#include "nouveau_fence.h"
|
||||
#include "nouveau_pm.h"
|
||||
#include "nv50_display.h"
|
||||
#include "nouveau_acpi.h"
|
||||
|
||||
#include "drm_pciids.h"
|
||||
|
||||
|
|
|
@ -366,24 +366,6 @@ extern void nouveau_irq_preinstall(struct drm_device *);
|
|||
extern int nouveau_irq_postinstall(struct drm_device *);
|
||||
extern void nouveau_irq_uninstall(struct drm_device *);
|
||||
|
||||
/* nouveau_acpi.c */
|
||||
#define ROM_BIOS_PAGE 4096
|
||||
#if defined(CONFIG_ACPI)
|
||||
void nouveau_register_dsm_handler(void);
|
||||
void nouveau_unregister_dsm_handler(void);
|
||||
void nouveau_switcheroo_optimus_dsm(void);
|
||||
int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len);
|
||||
bool nouveau_acpi_rom_supported(struct pci_dev *pdev);
|
||||
int nouveau_acpi_edid(struct drm_device *, struct drm_connector *);
|
||||
#else
|
||||
static inline void nouveau_register_dsm_handler(void) {}
|
||||
static inline void nouveau_unregister_dsm_handler(void) {}
|
||||
static inline void nouveau_switcheroo_optimus_dsm(void) {}
|
||||
static inline bool nouveau_acpi_rom_supported(struct pci_dev *pdev) { return false; }
|
||||
static inline int nouveau_acpi_get_bios_chunk(uint8_t *bios, int offset, int len) { return -EINVAL; }
|
||||
static inline int nouveau_acpi_edid(struct drm_device *dev, struct drm_connector *connector) { return -EINVAL; }
|
||||
#endif
|
||||
|
||||
/* nouveau_backlight.c */
|
||||
#ifdef CONFIG_DRM_NOUVEAU_BACKLIGHT
|
||||
extern int nouveau_backlight_init(struct drm_device *);
|
||||
|
|
|
@ -38,6 +38,7 @@
|
|||
#include "nouveau_pm.h"
|
||||
#include "nv04_display.h"
|
||||
#include "nv50_display.h"
|
||||
#include "nouveau_acpi.h"
|
||||
|
||||
static void nouveau_stub_takedown(struct drm_device *dev) {}
|
||||
static int nouveau_stub_init(struct drm_device *dev) { return 0; }
|
||||
|
|
Loading…
Reference in a new issue