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

Commit 418da172 authored by Keith Packard's avatar Keith Packard Committed by Dave Airlie
Browse files

drm: Pass struct drm_file * to __drm_mode_object_find [v2] 



This will allow __drm_mode_object_file to be extended to perform
access control checks based on the file in use.

v2: Also fix up vboxvideo driver in staging

[airlied: merging early as this is an API change]

Suggested-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarKeith Packard <keithp@keithp.com>
Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parent bb7a9c8d

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

+8 −8
Original line number Diff line number Diff line
@@ -231,7 +231,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;
@@ -256,7 +256,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;
@@ -372,7 +372,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;

}
@@ -1077,7 +1077,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;
@@ -1134,7 +1134,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;
@@ -1153,7 +1153,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;

}
@@ -1294,7 +1294,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;
@@ -1323,7 +1323,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
@@ -713,7 +713,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;

}

drivers/gpu/drm/cirrus/cirrus_mode.c

+1 −1
Original line number Diff line number Diff line
@@ -457,7 +457,7 @@ static struct drm_encoder *cirrus_connector_best_encoder(struct drm_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;

}