Create a generic struct intel_panel for sharing a data structure and code
between eDP and LVDS panels. Add the new struct to intel_connector so that
later on we can have generic EDID and mode reading functions with EDID
caching that transparently fallback to fixed mode when EDID is not
available.
Add intel_panel as a dummy first, and move data (such as the mentioned
fixed mode) to it in later patches.
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>
[danvet: Fixup tiny conflict in intel_dp_destroy.]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
{
struct drm_device *dev = connector->dev;
struct intel_dp *intel_dp = intel_attached_dp(connector);
{
struct drm_device *dev = connector->dev;
struct intel_dp *intel_dp = intel_attached_dp(connector);
+ struct intel_connector *intel_connector = to_intel_connector(connector);
+ if (is_edp(intel_dp)) {
intel_panel_destroy_backlight(dev);
intel_panel_destroy_backlight(dev);
+ intel_panel_fini(&intel_connector->panel);
+ }
drm_sysfs_connector_remove(connector);
drm_connector_cleanup(connector);
drm_sysfs_connector_remove(connector);
drm_connector_cleanup(connector);
intel_encoder->hot_plug = intel_dp_hot_plug;
intel_encoder->hot_plug = intel_dp_hot_plug;
+ if (is_edp(intel_dp)) {
+ intel_panel_init(&intel_connector->panel);
intel_panel_setup_backlight(connector);
intel_panel_setup_backlight(connector);
intel_dp_add_properties(intel_dp, connector);
intel_dp_add_properties(intel_dp, connector);
+struct intel_panel {
+};
+
struct intel_connector {
struct drm_connector base;
/*
struct intel_connector {
struct drm_connector base;
/*
/* Reads out the current hw, returning true if the connector is enabled
* and active (i.e. dpms ON state). */
bool (*get_hw_state)(struct intel_connector *);
/* Reads out the current hw, returning true if the connector is enabled
* and active (i.e. dpms ON state). */
bool (*get_hw_state)(struct intel_connector *);
+
+ /* Panel info for eDP and LVDS */
+ struct intel_panel panel;
enum plane plane);
/* intel_panel.c */
enum plane plane);
/* intel_panel.c */
+extern int intel_panel_init(struct intel_panel *panel);
+extern void intel_panel_fini(struct intel_panel *panel);
+
extern void intel_fixed_panel_mode(struct drm_display_mode *fixed_mode,
struct drm_display_mode *adjusted_mode);
extern void intel_pch_panel_fitting(struct drm_device *dev,
extern void intel_fixed_panel_mode(struct drm_display_mode *fixed_mode,
struct drm_display_mode *adjusted_mode);
extern void intel_pch_panel_fitting(struct drm_device *dev,
acpi_lid_notifier_unregister(&lvds_connector->lid_notifier);
intel_panel_destroy_backlight(connector->dev);
acpi_lid_notifier_unregister(&lvds_connector->lid_notifier);
intel_panel_destroy_backlight(connector->dev);
+ intel_panel_fini(&lvds_connector->base.panel);
drm_sysfs_connector_remove(connector);
drm_connector_cleanup(connector);
drm_sysfs_connector_remove(connector);
drm_connector_cleanup(connector);
}
drm_sysfs_connector_add(connector);
}
drm_sysfs_connector_add(connector);
+ intel_panel_init(&intel_connector->panel);
intel_panel_setup_backlight(connector);
return true;
intel_panel_setup_backlight(connector);
return true;
+
+int intel_panel_init(struct intel_panel *panel)
+{
+ return 0;
+}
+
+void intel_panel_fini(struct intel_panel *panel)
+{
+}