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

Commit 26e27499 authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge fdf36d71 on remote branch 

Change-Id: I8b65609bd5d4561943dce28d73f173378d39b744
parents 04a9cd74 fdf36d71

msm/sde/sde_color_processing.c

+5 −4
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.

 */
@@ -4476,7 +4477,7 @@ void sde_cp_crtc_enable(struct drm_crtc *drm_crtc) 
	if (!num_mixers)

		return;

	mutex_lock(&crtc->crtc_cp_lock);

	info = kzalloc(sizeof(struct sde_kms_info), GFP_KERNEL);

	info = vzalloc(sizeof(struct sde_kms_info));

	if (info) {

		for (i = 0; i < ARRAY_SIZE(dspp_cap_update_func); i++)

			dspp_cap_update_func[i](crtc, info);
@@ -4485,7 +4486,7 @@ void sde_cp_crtc_enable(struct drm_crtc *drm_crtc) 
			info->data, SDE_KMS_INFO_DATALEN(info),

			CRTC_PROP_DSPP_INFO);

	}

	kfree(info);

	vfree(info);

	mutex_unlock(&crtc->crtc_cp_lock);

}
@@ -4500,12 +4501,12 @@ void sde_cp_crtc_disable(struct drm_crtc *drm_crtc) 
	}

	crtc = to_sde_crtc(drm_crtc);

	mutex_lock(&crtc->crtc_cp_lock);

	info = kzalloc(sizeof(struct sde_kms_info), GFP_KERNEL);

	info = vzalloc(sizeof(struct sde_kms_info));

	if (info)

		msm_property_set_blob(&crtc->property_info,

				&crtc->dspp_blob_info,

			info->data, SDE_KMS_INFO_DATALEN(info),

			CRTC_PROP_DSPP_INFO);

	mutex_unlock(&crtc->crtc_cp_lock);

	kfree(info);

	vfree(info);

}

msm/sde/sde_connector.c

+3 −6
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

 * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.

 * Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.

 */
@@ -784,10 +785,6 @@ static int _sde_connector_update_dirty_properties( 
			_sde_connector_update_power_locked(c_conn);

			mutex_unlock(&c_conn->lock);

			break;

		case CONNECTOR_PROP_BL_SCALE:

		case CONNECTOR_PROP_SV_BL_SCALE:

			_sde_connector_update_bl_scale(c_conn);

			break;

		case CONNECTOR_PROP_HDR_METADATA:

			_sde_connector_update_hdr_metadata(c_conn, c_state);

			break;
@@ -2637,7 +2634,7 @@ int sde_connector_set_blob_data(struct drm_connector *conn, 
		return -EINVAL;

	}



	info = kzalloc(sizeof(*info), GFP_KERNEL);

	info = vzalloc(sizeof(*info));

	if (!info)

		return -ENOMEM;
@@ -2695,7 +2692,7 @@ int sde_connector_set_blob_data(struct drm_connector *conn, 
			SDE_KMS_INFO_DATALEN(info),

			prop_id);

exit:

	kfree(info);

	vfree(info);



	return rc;

}

msm/sde/sde_crtc.c

+2 −2
Original line number Diff line number Diff line
@@ -5415,7 +5415,7 @@ static void sde_crtc_install_properties(struct drm_crtc *crtc, 
		return;

	}



	info = kzalloc(sizeof(struct sde_kms_info), GFP_KERNEL);

	info = vzalloc(sizeof(struct sde_kms_info));

	if (!info) {

		SDE_ERROR("failed to allocate info memory\n");

		return;
@@ -5499,7 +5499,7 @@ static void sde_crtc_install_properties(struct drm_crtc *crtc, 
			info->data, SDE_KMS_INFO_DATALEN(info),

			CRTC_PROP_INFO);



	kfree(info);

	vfree(info);

}



static int _sde_crtc_get_output_fence(struct drm_crtc *crtc,

msm/sde/sde_hw_intf.c

+4 −3
Original line number Diff line number Diff line
@@ -258,10 +258,11 @@ static void sde_hw_intf_setup_timing_engine(struct sde_hw_intf *ctx, 
	data_width = p->width;



	if (p->compression_en) {

		if (p->wide_bus_en)

			data_width = DIV_ROUND_UP(p->dce_bytes_per_line, 6);

		else

			data_width = DIV_ROUND_UP(p->dce_bytes_per_line, 3);



		if (p->wide_bus_en)

			data_width >>= 1;

	} else if (!dp_intf && p->wide_bus_en) {

		data_width = p->width >> 1;

	} else {

msm/sde/sde_plane.c

+3 −3
Original line number Diff line number Diff line
@@ -3665,7 +3665,7 @@ static void _sde_plane_setup_capabilities_blob(struct sde_plane *psde, 
	sde_kms_info_add_keyint(info, "pipe_idx", pipe_id);



	index = (master_plane_id == 0) ? 0 : 1;

	if (catalog->has_demura &&

	if (catalog->has_demura && psde->pipe < SSPP_MAX &&

	    catalog->demura_supported[psde->pipe][index] != ~0x0)

		sde_kms_info_add_keyint(info, "demura_block", index);
@@ -3755,7 +3755,7 @@ static void _sde_plane_install_properties(struct drm_plane *plane, 
	psde->catalog = catalog;

	is_master = !psde->is_virtual;



	info = kzalloc(sizeof(struct sde_kms_info), GFP_KERNEL);

	info = vzalloc(sizeof(struct sde_kms_info));

	if (!info) {

		SDE_ERROR("failed to allocate info memory\n");

		return;
@@ -3834,7 +3834,7 @@ static void _sde_plane_install_properties(struct drm_plane *plane, 
			ARRAY_SIZE(e_fb_translation_mode), 0,

			PLANE_PROP_FB_TRANSLATION_MODE);



	kfree(info);

	vfree(info);

}



static inline void _sde_plane_set_csc_v1(struct sde_plane *psde,