diff options
| author | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:38:59 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@linux.ie> | 2008-07-26 08:38:59 +1000 |
| commit | fb05c4d621084d7a3fb3dd52d7d9c888eac852d0 (patch) | |
| tree | bca43a3c777984e0eb962d55817541801377d3c4 /linux-core/nv50_connector.h | |
| parent | 2556341f8baf0e0b7b5f7843135e43e662751af0 (diff) | |
| parent | 53428453758621da70d9608c9baec58b4b9383ec (diff) | |
Merge remote branch 'origin/modesetting-101' into modesetting-gem
Diffstat (limited to 'linux-core/nv50_connector.h')
| -rw-r--r-- | linux-core/nv50_connector.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/linux-core/nv50_connector.h b/linux-core/nv50_connector.h index ebd6eac6..fa7316e2 100644 --- a/linux-core/nv50_connector.h +++ b/linux-core/nv50_connector.h @@ -47,9 +47,12 @@ struct nv50_connector { struct nv50_i2c_channel *i2c_chan; struct nv50_output *output; - int scaling_mode; + int requested_scaling_mode; - bool (*detect) (struct nv50_connector *connector); + bool use_dithering; + + int (*hpd_detect) (struct nv50_connector *connector); + int (*i2c_detect) (struct nv50_connector *connector); int (*destroy) (struct nv50_connector *connector); struct nv50_output *(*to_output) (struct nv50_connector *connector, bool digital); }; |