Unverified Commit 12dd18f5 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!8110 drm/client: Fully protect modes[ 

Merge Pull Request from: @ci-robot 
 
PR sync from: Yi Yang <yiyang13@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/KP7UOFI3O25YVHBJ66RXTXDH2XGMPDVM/ 
 
https://gitee.com/src-openeuler/kernel/issues/I9QRRC 
 
Link:https://gitee.com/openeuler/kernel/pulls/8110

 

Reviewed-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
Signed-off-by: default avatarJialin Zhang <zhangjialin11@huawei.com>
parents 4f3b4e79 0835201c

drivers/gpu/drm/drm_client_modeset.c

+2 −1
Original line number Diff line number Diff line
@@ -774,6 +774,7 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, 
	unsigned int total_modes_count = 0;

	struct drm_client_offset *offsets;

	unsigned int connector_count = 0;

	/* points to modes protected by mode_config.mutex */

	struct drm_display_mode **modes;

	struct drm_crtc **crtcs;

	int i, ret = 0;
@@ -842,7 +843,6 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, 
		drm_client_pick_crtcs(client, connectors, connector_count,

				      crtcs, modes, 0, width, height);

	}

	mutex_unlock(&dev->mode_config.mutex);



	drm_client_modeset_release(client);
@@ -872,6 +872,7 @@ int drm_client_modeset_probe(struct drm_client_dev *client, unsigned int width, 
			modeset->y = offset->y;

		}

	}

	mutex_unlock(&dev->mode_config.mutex);



	mutex_unlock(&client->modeset_mutex);

out: