Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d508706 authored by Jani Nikula's avatar Jani Nikula Committed by Daniel Vetter
Browse files

drm/i915: Create generic intel_panel for LVDS and eDP 



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: default avatarJani Nikula <jani.nikula@intel.com>
Reviewed-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
[danvet: Fixup tiny conflict in intel_dp_destroy.]
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent f8779fda

drivers/gpu/drm/i915/intel_dp.c

+7 −2
Original line number Diff line number Diff line
@@ -2497,9 +2497,12 @@ intel_dp_destroy(struct drm_connector *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))

	if (is_edp(intel_dp)) {

		intel_panel_destroy_backlight(dev);

		intel_panel_fini(&intel_connector->panel);

	}



	drm_sysfs_connector_remove(connector);

	drm_connector_cleanup(connector);
@@ -2828,8 +2831,10 @@ intel_dp_init(struct drm_device *dev, int output_reg, enum port port) 


	intel_encoder->hot_plug = intel_dp_hot_plug;



	if (is_edp(intel_dp))

	if (is_edp(intel_dp)) {

		intel_panel_init(&intel_connector->panel);

		intel_panel_setup_backlight(connector);

	}



	intel_dp_add_properties(intel_dp, connector);

drivers/gpu/drm/i915/intel_drv.h

+9 −0
Original line number Diff line number Diff line
@@ -163,6 +163,9 @@ struct intel_encoder { 
	int crtc_mask;

};



struct intel_panel {

};



struct intel_connector {

	struct drm_connector base;

	/*
@@ -179,6 +182,9 @@ 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;

};



struct intel_crtc {
@@ -436,6 +442,9 @@ 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 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,

drivers/gpu/drm/i915/intel_lvds.c

+2 −0
Original line number Diff line number Diff line
@@ -554,6 +554,7 @@ static void intel_lvds_destroy(struct drm_connector *connector) 
		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);
@@ -1106,6 +1107,7 @@ bool intel_lvds_init(struct drm_device *dev) 
	}

	drm_sysfs_connector_add(connector);



	intel_panel_init(&intel_connector->panel);

	intel_panel_setup_backlight(connector);



	return true;

drivers/gpu/drm/i915/intel_panel.c

+9 −0
Original line number Diff line number Diff line
@@ -464,3 +464,12 @@ void intel_panel_destroy_backlight(struct drm_device *dev) 
	return;

}

#endif



int intel_panel_init(struct intel_panel *panel)

{

	return 0;

}



void intel_panel_fini(struct intel_panel *panel)

{

}