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

Commit cc660548 authored by Abhijith Desai's avatar Abhijith Desai
Browse files

Merge remote-tracking branch 'quic/dev/msm-4.14-display' into msm-4.14 



* quic/dev/msm-4.14-display:
  ARM: dts: msm: add hdisplay and vdisplay for max resolution on sm6150
  drm/msm/dp: assert phy reset before phy mode switch on trinket
  drm/msm/dp: fix error handling conditions in lphw hpd
  disp: msm: sde: add SSPP CP features to dirty list during IPC
  drm/msm/sde: avoid connector state mode update in commit thread
  drm: msm: Do not check for 0 mixer count
  drm/msm/dp: fix for mvid/nvid zero on sm6150 dp mst
  drm: squash changes for drm lease from upstream

Change-Id: I5dfff1fded16c40e6a283e509971a37cc5e06dc2
Signed-off-by: default avatarAbhijith Desai <desaia@codeaurora.org>
parents 34ec587b d033f644

arch/arm64/boot/dts/qcom/sm6150-sde.dtsi

+3 −0
Original line number Diff line number Diff line
@@ -529,6 +529,9 @@ 
		qcom,max-lclk-frequency-khz = <540000>;

		qcom,max-pclk-frequency-khz = <195000>;



		qcom,max-hdisplay = <1920>;

		qcom,max-vdisplay = <1200>;



		qcom,ext-disp = <&ext_disp>;

		qcom,dp-aux-switch = <&fsa4480>;

drivers/gpu/drm/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \ 
		drm_encoder.o drm_mode_object.o drm_property.o \

		drm_plane.o drm_color_mgmt.o drm_print.o \

		drm_dumb_buffers.o drm_mode_config.o drm_vblank.o \

		drm_syncobj.o

		drm_syncobj.o drm_lease.o



drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o

drm-$(CONFIG_DRM_VM) += drm_vm.o

drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c

+8 −8
Original line number Diff line number Diff line
@@ -224,7 +224,7 @@ amdgpu_connector_update_scratch_regs(struct drm_connector *connector, 
		if (connector->encoder_ids[i] == 0)

			break;



		encoder = drm_encoder_find(connector->dev,

		encoder = drm_encoder_find(connector->dev, NULL,

					connector->encoder_ids[i]);

		if (!encoder)

			continue;
@@ -249,7 +249,7 @@ amdgpu_connector_find_encoder(struct drm_connector *connector, 
	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

		if (connector->encoder_ids[i] == 0)

			break;

		encoder = drm_encoder_find(connector->dev,

		encoder = drm_encoder_find(connector->dev, NULL,

					connector->encoder_ids[i]);

		if (!encoder)

			continue;
@@ -367,7 +367,7 @@ amdgpu_connector_best_single_encoder(struct drm_connector *connector) 


	/* pick the encoder ids */

	if (enc_id)

		return drm_encoder_find(connector->dev, enc_id);

		return drm_encoder_find(connector->dev, NULL, enc_id);

	return NULL;

}
@@ -1084,7 +1084,7 @@ amdgpu_connector_dvi_detect(struct drm_connector *connector, bool force) 
			if (connector->encoder_ids[i] == 0)

				break;



			encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);

			encoder = drm_encoder_find(connector->dev, NULL, connector->encoder_ids[i]);

			if (!encoder)

				continue;
@@ -1143,7 +1143,7 @@ amdgpu_connector_dvi_encoder(struct drm_connector *connector) 
		if (connector->encoder_ids[i] == 0)

			break;



		encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);

		encoder = drm_encoder_find(connector->dev, NULL, connector->encoder_ids[i]);

		if (!encoder)

			continue;
@@ -1162,7 +1162,7 @@ amdgpu_connector_dvi_encoder(struct drm_connector *connector) 
	/* then check use digitial */

	/* pick the first one */

	if (enc_id)

		return drm_encoder_find(connector->dev, enc_id);

		return drm_encoder_find(connector->dev, NULL, enc_id);

	return NULL;

}
@@ -1303,7 +1303,7 @@ u16 amdgpu_connector_encoder_get_dp_bridge_encoder_id(struct drm_connector *conn 
		if (connector->encoder_ids[i] == 0)

			break;



		encoder = drm_encoder_find(connector->dev,

		encoder = drm_encoder_find(connector->dev, NULL,

					connector->encoder_ids[i]);

		if (!encoder)

			continue;
@@ -1332,7 +1332,7 @@ static bool amdgpu_connector_encoder_is_hbr2(struct drm_connector *connector) 
	for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {

		if (connector->encoder_ids[i] == 0)

			break;

		encoder = drm_encoder_find(connector->dev,

		encoder = drm_encoder_find(connector->dev, NULL,

					connector->encoder_ids[i]);

		if (!encoder)

			continue;

drivers/gpu/drm/amd/amdgpu/dce_virtual.c

+2 −2
Original line number Diff line number Diff line
@@ -288,7 +288,7 @@ dce_virtual_encoder(struct drm_connector *connector) 
		if (connector->encoder_ids[i] == 0)

			break;



		encoder = drm_encoder_find(connector->dev, connector->encoder_ids[i]);

		encoder = drm_encoder_find(connector->dev, NULL, connector->encoder_ids[i]);

		if (!encoder)

			continue;
@@ -298,7 +298,7 @@ dce_virtual_encoder(struct drm_connector *connector) 


	/* pick the first one */

	if (enc_id)

		return drm_encoder_find(connector->dev, enc_id);

		return drm_encoder_find(connector->dev, NULL, enc_id);

	return NULL;

}

drivers/gpu/drm/ast/ast_mode.c

+1 −1
Original line number Diff line number Diff line
@@ -715,7 +715,7 @@ static struct drm_encoder *ast_best_single_encoder(struct drm_connector *connect 
	int enc_id = connector->encoder_ids[0];

	/* pick the encoder ids */

	if (enc_id)

		return drm_encoder_find(connector->dev, enc_id);

		return drm_encoder_find(connector->dev, NULL, enc_id);

	return NULL;

}