Merge tag 'amd-drm-fixes-5.8-2020-07-30' of... (887c909d) · Commits · 戴 / test

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -692,9 +692,10 @@ static int amdgpu_info_ioctl(struct drm_device dev, void data, struct drm_file
		return n ? -EFAULT : 0;
		}
		case AMDGPU_INFO_DEV_INFO: {
		struct drm_amdgpu_info_device dev_info = {};
		struct drm_amdgpu_info_device dev_info;
		uint64_t vm_size;

		memset(&dev_info, 0, sizeof(dev_info));
		dev_info.device_id = dev->pdev->device;
		dev_info.chip_rev = adev->rev_id;
		dev_info.external_rev = adev->external_rev_id;

+6 −3

Original line number	Diff line number	Diff line
		@@ -778,7 +778,8 @@ static ssize_t amdgpu_set_pp_od_clk_voltage(struct device *dev,
		tmp_str++;
		while (isspace(*++tmp_str));

		while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {
		while (tmp_str[0]) {
		sub_str = strsep(&tmp_str, delimiter);
		ret = kstrtol(sub_str, 0, &parameter[parameter_size]);
		if (ret)
		return -EINVAL;
		@@ -1038,7 +1039,8 @@ static ssize_t amdgpu_read_mask(const char buf, size_t count, uint32_t mask)
		memcpy(buf_cpy, buf, bytes);
		buf_cpy[bytes] = '\0';
		tmp = buf_cpy;
		while ((sub_str = strsep(&tmp, delimiter)) != NULL) {
		while (tmp[0]) {
		sub_str = strsep(&tmp, delimiter);
		if (strlen(sub_str)) {
		ret = kstrtol(sub_str, 0, &level);
		if (ret)
		@@ -1635,7 +1637,8 @@ static ssize_t amdgpu_set_pp_power_profile_mode(struct device *dev,
		i++;
		memcpy(buf_cpy, buf, count-i);
		tmp_str = buf_cpy;
		while ((sub_str = strsep(&tmp_str, delimiter)) != NULL) {
		while (tmp_str[0]) {
		sub_str = strsep(&tmp_str, delimiter);
		ret = kstrtol(sub_str, 0, &parameter[parameter_size]);
		if (ret)
		return -EINVAL;

+27 −9

Original line number	Diff line number	Diff line
		@@ -8717,20 +8717,38 @@ static int amdgpu_dm_atomic_check(struct drm_device *dev,
		* the same resource. If we have a new DC context as part of
		* the DM atomic state from validation we need to free it and
		* retain the existing one instead.
		*
		* Furthermore, since the DM atomic state only contains the DC
		* context and can safely be annulled, we can free the state
		* and clear the associated private object now to free
		* some memory and avoid a possible use-after-free later.
		*/
		struct dm_atomic_state new_dm_state, old_dm_state;

		new_dm_state = dm_atomic_get_new_state(state);
		old_dm_state = dm_atomic_get_old_state(state);
		for (i = 0; i < state->num_private_objs; i++) {
		struct drm_private_obj *obj = state->private_objs[i].ptr;

		if (new_dm_state && old_dm_state) {
		if (new_dm_state->context)
		dc_release_state(new_dm_state->context);
		if (obj->funcs == adev->dm.atomic_obj.funcs) {
		int j = state->num_private_objs-1;

		new_dm_state->context = old_dm_state->context;
		dm_atomic_destroy_state(obj,
		state->private_objs[i].state);

		/* If i is not at the end of the array then the
		* last element needs to be moved to where i was
		* before the array can safely be truncated.
		*/
		if (i != j)
		state->private_objs[i] =
		state->private_objs[j];

		if (old_dm_state->context)
		dc_retain_state(old_dm_state->context);
		state->private_objs[j].ptr = NULL;
		state->private_objs[j].state = NULL;
		state->private_objs[j].old_state = NULL;
		state->private_objs[j].new_state = NULL;

		state->num_private_objs = j;
		break;
		}
		}
		}