diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-26 14:24:50 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-26 14:24:50 +0300 |
| commit | e9e4e44309f866b115d08ab4a54834008c50a8a4 (patch) | |
| tree | ae9f91e682a4d6592ef263f30a4a0b1a862b7987 /drivers/gpu/drm/nouveau/nouveau_connector.h | |
| parent | 8a26ce4e544659256349551283414df504889a59 (diff) | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
| download | linux-e9e4e44309f866b115d08ab4a54834008c50a8a4.tar.xz | |
Merge tag 'v4.0-rc1' into perf/core, to refresh the tree
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_connector.h')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_connector.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.h b/drivers/gpu/drm/nouveau/nouveau_connector.h index 629a380c7085..7446ee66ea04 100644 --- a/drivers/gpu/drm/nouveau/nouveau_connector.h +++ b/drivers/gpu/drm/nouveau/nouveau_connector.h @@ -33,7 +33,7 @@ #include <drm/drm_dp_helper.h> #include "nouveau_crtc.h" -struct nouveau_i2c_port; +struct nvkm_i2c_port; enum nouveau_underscan_type { UNDERSCAN_OFF, @@ -72,6 +72,7 @@ struct nouveau_connector { int dithering_mode; int dithering_depth; int scaling_mode; + bool scaling_full; enum nouveau_underscan_type underscan; u32 underscan_hborder; u32 underscan_vborder; |