summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/intel_drv.h
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2012-10-19 14:51:50 +0300
committerDaniel Vetter <daniel.vetter@ffwll.ch>2012-10-22 19:01:49 +0200
commitdd06f90ee880c61a534ccbe07bd30a8a7d7f7567 (patch)
tree88390939b5c91a7f59878451a73621753c61a182 /drivers/gpu/drm/i915/intel_drv.h
parent1d508706ea848e32ff20bb311f4325896c6eb7b9 (diff)
downloadlinux-stable-dd06f90ee880c61a534ccbe07bd30a8a7d7f7567.tar.gz
linux-stable-dd06f90ee880c61a534ccbe07bd30a8a7d7f7567.tar.bz2
linux-stable-dd06f90ee880c61a534ccbe07bd30a8a7d7f7567.zip
drm/i915: Move the fixed mode to intel_panel
Pave the way for sharing some logic between eDP and LVDS. Based on earlier work by Chris Wilson <chris@chris-wilson.co.uk> CC: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org> Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/intel_drv.h')
-rw-r--r--drivers/gpu/drm/i915/intel_drv.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h
index b37bf28d830a..7fbb8ed447e4 100644
--- a/drivers/gpu/drm/i915/intel_drv.h
+++ b/drivers/gpu/drm/i915/intel_drv.h
@@ -164,6 +164,7 @@ struct intel_encoder {
};
struct intel_panel {
+ struct drm_display_mode *fixed_mode;
};
struct intel_connector {
@@ -364,11 +365,11 @@ struct intel_dp {
int panel_power_cycle_delay;
int backlight_on_delay;
int backlight_off_delay;
- struct drm_display_mode *panel_fixed_mode; /* for eDP */
struct delayed_work panel_vdd_work;
bool want_panel_vdd;
struct edid *edid; /* cached EDID for eDP */
int edid_mode_count;
+ struct intel_connector *attached_connector;
};
static inline struct drm_crtc *
@@ -442,7 +443,8 @@ extern void intel_flush_display_plane(struct drm_i915_private *dev_priv,
enum plane plane);
/* intel_panel.c */
-extern int intel_panel_init(struct intel_panel *panel);
+extern int intel_panel_init(struct intel_panel *panel,
+ struct drm_display_mode *fixed_mode);
extern void intel_panel_fini(struct intel_panel *panel);
extern void intel_fixed_panel_mode(struct drm_display_mode *fixed_mode,