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

Commit d2972ecf authored by Xiaowen Wu's avatar Xiaowen Wu
Browse files

drm: squash changes for drm lease from upstream 

Squash the drm lease changes to fix -Wunused-function compile error,
also fix compile errors in drm/msm/sde driver for interface changes.

commit e7646f84ad4f ("drm: Add new LEASE debug level")
commit 2ed077e467ee ("drm: Add drm_object lease infrastructure [v5]")
commit 418da17214ac ("drm: Pass struct drm_file * to __drm_mode_object_find [v2]")
commit 7de440db20d4 ("drm: Check mode object lease status in all master ioctl paths [v4]")
commit 62884cd386b8 ("drm: Add four ioctls for managing drm mode object leases [v7]")
commit bd36d3bab2e3 ("drm/drm_lease: Prevent deadlock in case drm_lease_create() fails")
commit d2a48e52541c ("drm: move lease init after validation in drm_lease_create")

Change-Id: I50aaf96f61614ea5a11be0f6389d386f2e565547
CRs-Fixed: 2446787
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git


Signed-off-by: default avatarXiaowen Wu <wxiaowen@codeaurora.org>
parent 7b2ef2bf

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;

}

drivers/gpu/drm/bochs/bochs_kms.c

+1 −1
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ bochs_connector_best_encoder(struct drm_connector *connector) 
	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;

}