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

Commit 8822f154 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm/sde: add support for DisplayPort" into msm-4.9

parents 2996efb7 63758614

drivers/gpu/drm/msm/Makefile

+11 −1
Original line number Diff line number Diff line 
ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm -Idrivers/gpu/drm/msm/dsi-staging

ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm -Idrivers/gpu/drm/msm/dsi-staging -Idrivers/gpu/drm/msm/dp

ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi

ccflags-$(CONFIG_DRM_MSM_DSI_PLL) += -Idrivers/gpu/drm/msm/dsi

ccflags-y += -Idrivers/gpu/drm/msm/sde

ccflags-y += -Idrivers/media/platform/msm/sde/rotator



msm_drm-y := \

	dp/dp_usbpd.o \

	dp/dp_parser.o \

	dp/dp_power.o \

	dp/dp_catalog.o \

	dp/dp_aux.o \

	dp/dp_panel.o \

	dp/dp_link.o \

	dp/dp_ctrl.o \

	dp/dp_display.o \

	dp/dp_drm.o \

	hdmi/hdmi.o \

	hdmi/hdmi_audio.o \

	hdmi/hdmi_bridge.o \

drivers/gpu/drm/msm/dp/dp_display.c

+18 −2
Original line number Diff line number Diff line
@@ -618,9 +618,25 @@ static int dp_display_probe(struct platform_device *pdev) 
	return rc;

}



struct dp_display *dp_display_get(void)

int dp_display_get_displays(void **displays, int count)

{

	return g_dp_display;

	if (!displays) {

		pr_err("invalid data\n");

		return -EINVAL;

	}



	if (count != 1) {

		pr_err("invalid number of displays\n");

		return -EINVAL;

	}



	displays[0] = g_dp_display;

	return count;

}



int dp_display_get_num_of_displays(void)

{

	return 1;

}



static void dp_display_deinit_sub_modules(struct dp_display_private *dp)

drivers/gpu/drm/msm/dp/dp_display.h

+2 −1
Original line number Diff line number Diff line
@@ -47,5 +47,6 @@ struct dp_display { 
	int (*unprepare)(struct dp_display *dp_display);

};



struct dp_display *dp_display_get(void);

int dp_display_get_num_of_displays(void);

int dp_display_get_displays(void **displays, int count);

#endif /* _DP_DISPLAY_H_ */

drivers/gpu/drm/msm/sde/sde_encoder.c

+3 −0
Original line number Diff line number Diff line
@@ -2579,6 +2579,9 @@ static int sde_encoder_setup_display(struct sde_encoder_virt *sde_enc, 
	} else if (disp_info->intf_type == DRM_MODE_CONNECTOR_HDMIA) {

		*drm_enc_mode = DRM_MODE_ENCODER_TMDS;

		intf_type = INTF_HDMI;

	} else if (disp_info->intf_type == DRM_MODE_CONNECTOR_DisplayPort) {

		*drm_enc_mode = DRM_MODE_ENCODER_TMDS;

		intf_type = INTF_DP;

	} else if (disp_info->intf_type == DRM_MODE_CONNECTOR_VIRTUAL) {

		*drm_enc_mode = DRM_MODE_ENCODER_VIRTUAL;

		intf_type = INTF_WB;

drivers/gpu/drm/msm/sde/sde_hw_intf.c

+1 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static void sde_hw_intf_setup_timing_engine(struct sde_hw_intf *ctx, 
	display_v_end = ((vsync_period - p->v_front_porch) * hsync_period) +

	p->hsync_skew - 1;



	if (ctx->cap->type == INTF_EDP) {

	if (ctx->cap->type == INTF_EDP || ctx->cap->type == INTF_DP) {

		display_v_start += p->hsync_pulse_width + p->h_back_porch;

		display_v_end -= p->h_front_porch;

	}