Merge android-msm-pixel-4.19-tm into android-msm-pixel-4.19-tm-qpr1
SBMerger: 442815275
Change-Id: I0f20512b785bd9800aba7b843fc0536a9fa6ff40
Signed-off-by: SecurityBot <android-nexus-securitybot@system.gserviceaccount.com>
diff --git a/msm/sde/sde_color_processing.c b/msm/sde/sde_color_processing.c
index 799dfdd..4da816b 100644
--- a/msm/sde/sde_color_processing.c
+++ b/msm/sde/sde_color_processing.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
*/
@@ -3968,7 +3969,7 @@
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 @@
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 @@
}
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);
}
diff --git a/msm/sde/sde_connector.c b/msm/sde/sde_connector.c
index efb72e4..2f56caa 100644
--- a/msm/sde/sde_connector.c
+++ b/msm/sde/sde_connector.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2016-2020, The Linux Foundation. All rights reserved.
*/
@@ -2241,7 +2242,7 @@
return -EINVAL;
}
- info = kzalloc(sizeof(*info), GFP_KERNEL);
+ info = vzalloc(sizeof(*info));
if (!info)
return -ENOMEM;
@@ -2299,7 +2300,7 @@
SDE_KMS_INFO_DATALEN(info),
prop_id);
exit:
- kfree(info);
+ vfree(info);
return rc;
}
diff --git a/msm/sde/sde_crtc.c b/msm/sde/sde_crtc.c
index 6af8ce3..cdee208 100644
--- a/msm/sde/sde_crtc.c
+++ b/msm/sde/sde_crtc.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2014-2021 The Linux Foundation. All rights reserved.
* Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (C) 2013 Red Hat
@@ -5117,7 +5118,7 @@
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;
@@ -5369,7 +5370,7 @@
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,
diff --git a/msm/sde/sde_plane.c b/msm/sde/sde_plane.c
index e991cbe..8b68078 100644
--- a/msm/sde/sde_plane.c
+++ b/msm/sde/sde_plane.c
@@ -1,4 +1,5 @@
/*
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (C) 2014-2020 The Linux Foundation. All rights reserved.
* Copyright (C) 2013 Red Hat
* Author: Rob Clark <robdclark@gmail.com>
@@ -3609,7 +3610,7 @@
"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 @@
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",
diff --git a/msm/sde_dbg.c b/msm/sde_dbg.c
index 2723d01..3fad107 100644
--- a/msm/sde_dbg.c
+++ b/msm/sde_dbg.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2009-2020, The Linux Foundation. All rights reserved.
*/
@@ -3251,7 +3252,6 @@
u32 *dump_addr = NULL;
u32 status = 0;
struct sde_debug_bus_entry *head;
- phys_addr_t phys = 0;
int list_size;
int i;
u32 offset;
@@ -3289,8 +3289,7 @@
if (in_mem) {
if (!(*dump_mem))
- *dump_mem = dma_alloc_coherent(sde_dbg_base.dev,
- list_size, &phys, GFP_KERNEL);
+ *dump_mem = vzalloc(list_size);
if (*dump_mem) {
dump_addr = *dump_mem;
@@ -3400,7 +3399,6 @@
u32 value, d0, d1;
unsigned long reg, reg1, reg2;
struct vbif_debug_bus_entry *head;
- phys_addr_t phys = 0;
int i, list_size = 0;
void __iomem *mem_base = NULL;
struct vbif_debug_bus_entry *dbg_bus;
@@ -3450,8 +3448,7 @@
if (in_mem) {
if (!(*dump_mem))
- *dump_mem = dma_alloc_coherent(sde_dbg_base.dev,
- list_size, &phys, GFP_KERNEL);
+ *dump_mem = vzalloc(list_size);
if (*dump_mem) {
dump_addr = *dump_mem;
@@ -3542,13 +3539,11 @@
int i;
u32 reg_dump_size;
struct sde_dbg_base *dbg_base = &sde_dbg_base;
- phys_addr_t phys = 0;
mutex_lock(&sde_dbg_base.mutex);
reg_dump_size = _sde_dbg_get_reg_dump_size();
- dbg_base->reg_dump_addr = dma_alloc_coherent(sde_dbg_base.dev,
- reg_dump_size, &phys, GFP_KERNEL);
+ dbg_base->reg_dump_addr = vzalloc(reg_dump_size);
if (dump_all)
sde_evtlog_dump_all(sde_dbg_base.evtlog);
@@ -4051,7 +4046,7 @@
mutex_lock(&sde_dbg_base.mutex);
if (!rbuf->dump_done && !rbuf->cur_blk) {
if (!rbuf->buf)
- rbuf->buf = kzalloc(DUMP_BUF_SIZE, GFP_KERNEL);
+ rbuf->buf = vzalloc(DUMP_BUF_SIZE);
if (!rbuf->buf) {
len = -ENOMEM;
goto err;
@@ -4781,6 +4776,7 @@
list_del(&blk_base->reg_base_head);
kfree(blk_base);
}
+ vfree(dbg_base->reg_dump_addr);
}
/**
* sde_dbg_destroy - destroy sde debug facilities
diff --git a/msm/sde_dbg_evtlog.c b/msm/sde_dbg_evtlog.c
index 5724d4c..35fe335 100644
--- a/msm/sde_dbg_evtlog.c
+++ b/msm/sde_dbg_evtlog.c
@@ -1,5 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-only
/*
+ * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
* Copyright (c) 2016-2021, The Linux Foundation. All rights reserved.
*/
@@ -219,7 +220,7 @@
{
struct sde_dbg_evtlog *evtlog;
- evtlog = kzalloc(sizeof(*evtlog), GFP_KERNEL);
+ evtlog = vzalloc(sizeof(*evtlog));
if (!evtlog)
return ERR_PTR(-ENOMEM);
@@ -235,7 +236,7 @@
{
struct sde_dbg_reglog *reglog;
- reglog = kzalloc(sizeof(*reglog), GFP_KERNEL);
+ reglog = vzalloc(sizeof(*reglog));
if (!reglog)
return ERR_PTR(-ENOMEM);
@@ -343,7 +344,7 @@
list_del(&filter_node->list);
kfree(filter_node);
}
- kfree(evtlog);
+ vfree(evtlog);
}
void sde_reglog_destroy(struct sde_dbg_reglog *reglog)
@@ -351,5 +352,5 @@
if (!reglog)
return;
- kfree(reglog);
+ vfree(reglog);
}
