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

Commit 06878e0b authored by Linux Build Service Account's avatar Linux Build Service Account
Browse files

Merge 492bde87 on remote branch 

Change-Id: Ibc7181a3bd9a5e9d510a3fcfb2ae4b257881f3e4
parents 7c04b56c 492bde87

msm/dsi/dsi_panel.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */



#include <linux/delay.h>
@@ -49,7 +50,7 @@ static u32 dsi_dsc_rc_buf_thresh[] = {0x0e, 0x1c, 0x2a, 0x38, 0x46, 0x54, 
 * Rate control - Min QP values for each ratio type in dsi_dsc_ratio_type

 */

static char dsi_dsc_rc_range_min_qp_1_1[][15] = {

	{0, 0, 1, 1, 3, 3, 3, 3, 3, 3, 5, 5, 5, 7, 12},

	{0, 0, 1, 1, 3, 3, 3, 3, 3, 3, 5, 5, 5, 7, 13},

	{0, 4, 5, 5, 7, 7, 7, 7, 7, 7, 9, 9, 9, 11, 17},

	{0, 4, 9, 9, 11, 11, 11, 11, 11, 11, 13, 13, 13, 15, 21},

	{0, 4, 5, 6, 7, 7, 7, 7, 7, 7, 9, 9, 9, 11, 15},

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.

 */
@@ -3968,7 +3969,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);
@@ -3977,7 +3978,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);

}
@@ -3992,12 +3993,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 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0-only

/*

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

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

 */



#define pr_fmt(fmt)	"[drm:%s:%d] " fmt, __func__, __LINE__
@@ -2367,7 +2368,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;
@@ -2425,7 +2426,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

+3 −3
Original line number Diff line number Diff line
@@ -5066,7 +5066,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;
@@ -5318,7 +5318,7 @@ static void sde_crtc_install_properties(struct drm_crtc *crtc, 
	msm_property_set_blob(&sde_crtc->property_info, &sde_crtc->blob_info,

			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_plane.c

+3 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2014-2020 The Linux Foundation. All rights reserved.

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

 * Copyright (C) 2013 Red Hat

 * Author: Rob Clark <robdclark@gmail.com>

 *
@@ -3609,7 +3610,7 @@ static void _sde_plane_install_properties(struct drm_plane *plane, 
			"prefill_time", 0x0, 0, ~0, 0,

			PLANE_PROP_PREFILL_TIME);



	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;
@@ -3720,7 +3721,7 @@ static void _sde_plane_install_properties(struct drm_plane *plane, 
			info->data, SDE_KMS_INFO_DATALEN(info),

			PLANE_PROP_INFO);



	kfree(info);

	vfree(info);



	if (psde->features & BIT(SDE_SSPP_MEMCOLOR)) {

		snprintf(feature_name, sizeof(feature_name), "%s%d",