git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
drm/nv50: add dcb type 14 to enum to prevent compiler complaint
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
nouveau
/
nouveau_bios.h
diff --git
a/drivers/gpu/drm/nouveau/nouveau_bios.h
b/drivers/gpu/drm/nouveau/nouveau_bios.h
index
c0d7b0a
..
c1de2f3
100644
(file)
--- a/
drivers/gpu/drm/nouveau/nouveau_bios.h
+++ b/
drivers/gpu/drm/nouveau/nouveau_bios.h
@@
-35,6
+35,7
@@
#define DCB_LOC_ON_CHIP 0
struct dcb_i2c_entry {
#define DCB_LOC_ON_CHIP 0
struct dcb_i2c_entry {
+ uint32_t entry;
uint8_t port_type;
uint8_t read, write;
struct nouveau_i2c_chan *chan;
uint8_t port_type;
uint8_t read, write;
struct nouveau_i2c_chan *chan;
@@
-80,6
+81,7
@@
struct dcb_connector_table_entry {
enum dcb_connector_type type;
uint8_t index2;
uint8_t gpio_tag;
enum dcb_connector_type type;
uint8_t index2;
uint8_t gpio_tag;
+ void *drm;
};
struct dcb_connector_table {
};
struct dcb_connector_table {
@@
-93,6
+95,7
@@
enum dcb_type {
OUTPUT_TMDS = 2,
OUTPUT_LVDS = 3,
OUTPUT_DP = 6,
OUTPUT_TMDS = 2,
OUTPUT_LVDS = 3,
OUTPUT_DP = 6,
+ OUTPUT_EOL = 14, /* DCB 4.0+, appears to be end-of-list */
OUTPUT_ANY = -1
};
OUTPUT_ANY = -1
};
@@
-116,6
+119,7
@@
struct dcb_entry {
struct {
struct sor_conf sor;
bool use_straps_for_mode;
struct {
struct sor_conf sor;
bool use_straps_for_mode;
+ bool use_acpi_for_edid;
bool use_power_scripts;
} lvdsconf;
struct {
bool use_power_scripts;
} lvdsconf;
struct {
@@
-128,6
+132,7
@@
struct dcb_entry {
} dpconf;
struct {
struct sor_conf sor;
} dpconf;
struct {
struct sor_conf sor;
+ int slave_addr;
} tmdsconf;
};
bool i2c_upper_default;
} tmdsconf;
};
bool i2c_upper_default;
@@
-248,8
+253,6
@@
struct nvbios {
struct {
int crtchead;
struct {
int crtchead;
- /* these need remembering across suspend */
- uint32_t saved_nv_pfb_cfg0;
} state;
struct {
} state;
struct {