summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/display
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gpu/drm/display')
-rw-r--r--drivers/gpu/drm/display/drm_dp_aux_bus.c2
-rw-r--r--drivers/gpu/drm/display/drm_dp_aux_dev.c2
-rw-r--r--drivers/gpu/drm/display/drm_dp_mst_topology.c37
-rw-r--r--drivers/gpu/drm/display/drm_dp_tunnel.c14
-rw-r--r--drivers/gpu/drm/display/drm_hdmi_cec_helper.c2
5 files changed, 29 insertions, 28 deletions
diff --git a/drivers/gpu/drm/display/drm_dp_aux_bus.c b/drivers/gpu/drm/display/drm_dp_aux_bus.c
index 2d279e82922f..a36feef1cd6a 100644
--- a/drivers/gpu/drm/display/drm_dp_aux_bus.c
+++ b/drivers/gpu/drm/display/drm_dp_aux_bus.c
@@ -280,7 +280,7 @@ int of_dp_aux_populate_bus(struct drm_dp_aux *aux,
goto err_did_get_np;
}
- aux_ep_with_data = kzalloc(sizeof(*aux_ep_with_data), GFP_KERNEL);
+ aux_ep_with_data = kzalloc_obj(*aux_ep_with_data, GFP_KERNEL);
if (!aux_ep_with_data) {
ret = -ENOMEM;
goto err_did_set_populated;
diff --git a/drivers/gpu/drm/display/drm_dp_aux_dev.c b/drivers/gpu/drm/display/drm_dp_aux_dev.c
index 29555b9f03c8..df02dbca7338 100644
--- a/drivers/gpu/drm/display/drm_dp_aux_dev.c
+++ b/drivers/gpu/drm/display/drm_dp_aux_dev.c
@@ -75,7 +75,7 @@ static struct drm_dp_aux_dev *alloc_drm_dp_aux_dev(struct drm_dp_aux *aux)
struct drm_dp_aux_dev *aux_dev;
int index;
- aux_dev = kzalloc(sizeof(*aux_dev), GFP_KERNEL);
+ aux_dev = kzalloc_obj(*aux_dev, GFP_KERNEL);
if (!aux_dev)
return ERR_PTR(-ENOMEM);
aux_dev->aux = aux;
diff --git a/drivers/gpu/drm/display/drm_dp_mst_topology.c b/drivers/gpu/drm/display/drm_dp_mst_topology.c
index be749dcad3b5..954ecaa6fd6b 100644
--- a/drivers/gpu/drm/display/drm_dp_mst_topology.c
+++ b/drivers/gpu/drm/display/drm_dp_mst_topology.c
@@ -1333,7 +1333,7 @@ static struct drm_dp_mst_branch *drm_dp_add_mst_branch_device(u8 lct, u8 *rad)
{
struct drm_dp_mst_branch *mstb;
- mstb = kzalloc(sizeof(*mstb), GFP_KERNEL);
+ mstb = kzalloc_obj(*mstb, GFP_KERNEL);
if (!mstb)
return NULL;
@@ -2317,7 +2317,7 @@ drm_dp_mst_add_port(struct drm_device *dev,
struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_mst_branch *mstb, u8 port_number)
{
- struct drm_dp_mst_port *port = kzalloc(sizeof(*port), GFP_KERNEL);
+ struct drm_dp_mst_port *port = kzalloc_obj(*port, GFP_KERNEL);
if (!port)
return NULL;
@@ -2923,7 +2923,7 @@ static int drm_dp_send_link_address(struct drm_dp_mst_topology_mgr *mgr,
int i, ret, port_mask = 0;
bool changed = false;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg)
return -ENOMEM;
@@ -3000,7 +3000,7 @@ drm_dp_send_clear_payload_id_table(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_sideband_msg_tx *txmsg;
int ret;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg)
return;
@@ -3025,7 +3025,7 @@ drm_dp_send_enum_path_resources(struct drm_dp_mst_topology_mgr *mgr,
struct drm_dp_sideband_msg_tx *txmsg;
int ret;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg)
return -ENOMEM;
@@ -3138,7 +3138,7 @@ static int drm_dp_payload_send_msg(struct drm_dp_mst_topology_mgr *mgr,
return -EINVAL;
}
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg) {
ret = -ENOMEM;
goto fail_put;
@@ -3185,7 +3185,7 @@ int drm_dp_send_power_updown_phy(struct drm_dp_mst_topology_mgr *mgr,
if (!port)
return -EINVAL;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg) {
drm_dp_mst_topology_put_port(port);
return -ENOMEM;
@@ -3219,7 +3219,7 @@ int drm_dp_send_query_stream_enc_status(struct drm_dp_mst_topology_mgr *mgr,
u8 nonce[7];
int ret;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg)
return -ENOMEM;
@@ -3470,7 +3470,7 @@ static int drm_dp_send_dpcd_read(struct drm_dp_mst_topology_mgr *mgr,
if (!mstb)
return -EINVAL;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg) {
ret = -ENOMEM;
goto fail_put;
@@ -3521,7 +3521,7 @@ static int drm_dp_send_dpcd_write(struct drm_dp_mst_topology_mgr *mgr,
if (!mstb)
return -EINVAL;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg) {
ret = -ENOMEM;
goto fail_put;
@@ -3562,7 +3562,7 @@ static int drm_dp_send_up_ack_reply(struct drm_dp_mst_topology_mgr *mgr,
{
struct drm_dp_sideband_msg_tx *txmsg;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg)
return -ENOMEM;
@@ -4135,7 +4135,7 @@ static int drm_dp_mst_handle_up_req(struct drm_dp_mst_topology_mgr *mgr)
if (!mgr->up_req_recv.have_eomt)
return 0;
- up_req = kzalloc(sizeof(*up_req), GFP_KERNEL);
+ up_req = kzalloc_obj(*up_req, GFP_KERNEL);
if (!up_req) {
ret = -ENOMEM;
goto out_clear_reply;
@@ -4479,7 +4479,7 @@ int drm_dp_atomic_find_time_slots(struct drm_atomic_state *state,
/* Add the new allocation to the state, note the VCPI isn't assigned until the end */
if (!payload) {
- payload = kzalloc(sizeof(*payload), GFP_KERNEL);
+ payload = kzalloc_obj(*payload, GFP_KERNEL);
if (!payload)
return -ENOMEM;
@@ -4604,8 +4604,9 @@ int drm_dp_mst_atomic_setup_commit(struct drm_atomic_state *state)
continue;
num_commit_deps = hweight32(mst_state->pending_crtc_mask);
- mst_state->commit_deps = kmalloc_array(num_commit_deps,
- sizeof(*mst_state->commit_deps), GFP_KERNEL);
+ mst_state->commit_deps = kmalloc_objs(*mst_state->commit_deps,
+ num_commit_deps,
+ GFP_KERNEL);
if (!mst_state->commit_deps)
return -ENOMEM;
mst_state->num_commit_deps = num_commit_deps;
@@ -5743,7 +5744,7 @@ int drm_dp_mst_topology_mgr_init(struct drm_dp_mst_topology_mgr *mgr,
mgr->max_payloads = max_payloads;
mgr->conn_base_id = conn_base_id;
- mst_state = kzalloc(sizeof(*mst_state), GFP_KERNEL);
+ mst_state = kzalloc_obj(*mst_state, GFP_KERNEL);
if (mst_state == NULL)
return -ENOMEM;
@@ -5843,7 +5844,7 @@ static int drm_dp_mst_i2c_read(struct drm_dp_mst_branch *mstb,
msg.u.i2c_read.read_i2c_device_id = msgs[num - 1].addr;
msg.u.i2c_read.num_bytes_read = msgs[num - 1].len;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg) {
ret = -ENOMEM;
goto out;
@@ -5883,7 +5884,7 @@ static int drm_dp_mst_i2c_write(struct drm_dp_mst_branch *mstb,
struct drm_dp_sideband_msg_tx *txmsg = NULL;
int ret;
- txmsg = kzalloc(sizeof(*txmsg), GFP_KERNEL);
+ txmsg = kzalloc_obj(*txmsg, GFP_KERNEL);
if (!txmsg) {
ret = -ENOMEM;
goto out;
diff --git a/drivers/gpu/drm/display/drm_dp_tunnel.c b/drivers/gpu/drm/display/drm_dp_tunnel.c
index 43f13a7c79b9..005ee68e6cd4 100644
--- a/drivers/gpu/drm/display/drm_dp_tunnel.c
+++ b/drivers/gpu/drm/display/drm_dp_tunnel.c
@@ -476,7 +476,7 @@ create_tunnel(struct drm_dp_tunnel_mgr *mgr,
u8 drv_group_id = tunnel_reg_drv_group_id(regs);
struct drm_dp_tunnel *tunnel;
- tunnel = kzalloc(sizeof(*tunnel), GFP_KERNEL);
+ tunnel = kzalloc_obj(*tunnel, GFP_KERNEL);
if (!tunnel)
return NULL;
@@ -1387,7 +1387,7 @@ add_tunnel_state(struct drm_dp_tunnel_group_state *group_state,
"Adding state for tunnel %p to group state %p\n",
tunnel, group_state);
- tunnel_state = kzalloc(sizeof(*tunnel_state), GFP_KERNEL);
+ tunnel_state = kzalloc_obj(*tunnel_state, GFP_KERNEL);
if (!tunnel_state)
return NULL;
@@ -1458,7 +1458,7 @@ tunnel_group_duplicate_state(struct drm_private_obj *obj)
struct drm_dp_tunnel_group_state *group_state;
struct drm_dp_tunnel_state *tunnel_state;
- group_state = kzalloc(sizeof(*group_state), GFP_KERNEL);
+ group_state = kzalloc_obj(*group_state, GFP_KERNEL);
if (!group_state)
return NULL;
@@ -1583,7 +1583,7 @@ static bool init_group(struct drm_dp_tunnel_mgr *mgr, struct drm_dp_tunnel_group
{
struct drm_dp_tunnel_group_state *group_state;
- group_state = kzalloc(sizeof(*group_state), GFP_KERNEL);
+ group_state = kzalloc_obj(*group_state, GFP_KERNEL);
if (!group_state)
return false;
@@ -1644,7 +1644,7 @@ static int resize_bw_array(struct drm_dp_tunnel_state *tunnel_state,
if (old_mask == new_mask)
return 0;
- new_bws = kcalloc(hweight32(new_mask), sizeof(*new_bws), GFP_KERNEL);
+ new_bws = kzalloc_objs(*new_bws, hweight32(new_mask), GFP_KERNEL);
if (!new_bws)
return -ENOMEM;
@@ -1906,14 +1906,14 @@ drm_dp_tunnel_mgr_create(struct drm_device *dev, int max_group_count)
struct drm_dp_tunnel_mgr *mgr;
int i;
- mgr = kzalloc(sizeof(*mgr), GFP_KERNEL);
+ mgr = kzalloc_obj(*mgr, GFP_KERNEL);
if (!mgr)
return ERR_PTR(-ENOMEM);
mgr->dev = dev;
init_waitqueue_head(&mgr->bw_req_queue);
- mgr->groups = kcalloc(max_group_count, sizeof(*mgr->groups), GFP_KERNEL);
+ mgr->groups = kzalloc_objs(*mgr->groups, max_group_count, GFP_KERNEL);
if (!mgr->groups) {
kfree(mgr);
diff --git a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c b/drivers/gpu/drm/display/drm_hdmi_cec_helper.c
index 3651ad0f76e0..7308ed792089 100644
--- a/drivers/gpu/drm/display/drm_hdmi_cec_helper.c
+++ b/drivers/gpu/drm/display/drm_hdmi_cec_helper.c
@@ -97,7 +97,7 @@ int drmm_connector_hdmi_cec_register(struct drm_connector *connector,
if (!funcs->init || !funcs->enable || !funcs->log_addr || !funcs->transmit)
return -EINVAL;
- data = kzalloc(sizeof(*data), GFP_KERNEL);
+ data = kzalloc_obj(*data, GFP_KERNEL);
if (!data)
return -ENOMEM;