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

Commit 54d63ca6 authored by Shobhit Kumar's avatar Shobhit Kumar Committed by Daniel Vetter
Browse files

drm/i915: Move DP structs to shared location 



Move the DP structure to shared location so that it can be used from
within the ddi module.

Changes from Paulo:
- Move less code to intel_drv.h
- Remove #include statement
- Replace a tab with a space in train_set

Signed-off-by: default avatarShobhit Kumar <shobhit.kumar@intel.com>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent e8aeaee7

drivers/gpu/drm/i915/intel_dp.c

+0 −32
Original line number Diff line number Diff line
@@ -36,42 +36,10 @@ 
#include "intel_drv.h"

#include "i915_drm.h"

#include "i915_drv.h"

#include "drm_dp_helper.h"



#define DP_RECEIVER_CAP_SIZE	0xf

#define DP_LINK_STATUS_SIZE	6

#define DP_LINK_CHECK_TIMEOUT	(10 * 1000)



#define DP_LINK_CONFIGURATION_SIZE	9



struct intel_dp {

	struct intel_encoder base;

	uint32_t output_reg;

	uint32_t DP;

	uint8_t  link_configuration[DP_LINK_CONFIGURATION_SIZE];

	bool has_audio;

	enum hdmi_force_audio force_audio;

	uint32_t color_range;

	int dpms_mode;

	uint8_t link_bw;

	uint8_t lane_count;

	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];

	struct i2c_adapter adapter;

	struct i2c_algo_dp_aux_data algo;

	bool is_pch_edp;

	uint8_t	train_set[4];

	int panel_power_up_delay;

	int panel_power_down_delay;

	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;

};



/**

 * is_edp - is the given port attached to an eDP panel (either CPU or PCH)

 * @intel_dp: DP struct

drivers/gpu/drm/i915/intel_drv.h

+32 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include "drm_crtc.h"

#include "drm_crtc_helper.h"

#include "drm_fb_helper.h"

#include "drm_dp_helper.h"



#define _wait_for(COND, MS, W) ({ \

	unsigned long timeout__ = jiffies + msecs_to_jiffies(MS);	\
@@ -310,6 +311,37 @@ struct intel_hdmi { 
			       struct drm_display_mode *adjusted_mode);

};



#define DP_RECEIVER_CAP_SIZE		0xf

#define DP_LINK_CONFIGURATION_SIZE	9



struct intel_dp {

	struct intel_encoder base;

	uint32_t output_reg;

	uint32_t DP;

	uint8_t  link_configuration[DP_LINK_CONFIGURATION_SIZE];

	bool has_audio;

	enum hdmi_force_audio force_audio;

	uint32_t color_range;

	int dpms_mode;

	uint8_t link_bw;

	uint8_t lane_count;

	uint8_t dpcd[DP_RECEIVER_CAP_SIZE];

	struct i2c_adapter adapter;

	struct i2c_algo_dp_aux_data algo;

	bool is_pch_edp;

	uint8_t train_set[4];

	int panel_power_up_delay;

	int panel_power_down_delay;

	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;

};



static inline struct drm_crtc *

intel_get_crtc_for_pipe(struct drm_device *dev, int pipe)

{