A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-09 05:39:54 -04:00
Code Issues Projects Releases Packages Wiki Activity

msm: kgsl: Make the a6xx mbox client static

Browse source 
There isn't any need to allocate dynamic memory for the mailbox client.

Change-Id: Ic0dedbad5ecd1b0e5702d2731b1b834418e3399c
Signed-off-by: Jordan Crouse <jcrouse@codeaurora.org>
This commit is contained in:
Jordan Crouse 2019-10-14 10:41:05 -06:00
commit 6dfe8d811c
2 changed files with 16 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

48
drivers/gpu/msm/kgsl_gmu.c
View file

@ -8,7 +8,6 @@
#include <linux/firmware.h>
#include <linux/io.h>
#include <linux/iommu.h>
#include <linux/mailbox_client.h>
#include <linux/msm-bus.h>
#include <linux/of_platform.h>
#include <linux/regulator/consumer.h>
@ -1053,7 +1052,7 @@ static void gmu_aop_send_acd_state(struct kgsl_device *device, bool flag)
char msg_buf[33];
int ret;
if (!gmu->mailbox.client)
if (IS_ERR_OR_NULL(gmu->mailbox.channel))
return;
msg.len = scnprintf(msg_buf, sizeof(msg_buf),
@ -1066,45 +1065,20 @@ static void gmu_aop_send_acd_state(struct kgsl_device *device, bool flag)
"AOP mbox send message failed: %d\n", ret);
}
static void gmu_aop_mailbox_destroy(struct kgsl_device *device)
{
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
struct gmu_device *gmu = KGSL_GMU_DEVICE(device);
struct kgsl_mailbox *mailbox = &gmu->mailbox;
if (!mailbox->client)
return;
mbox_free_channel(mailbox->channel);
mailbox->channel = NULL;
kfree(mailbox->client);
mailbox->client = NULL;
clear_bit(ADRENO_ACD_CTRL, &adreno_dev->pwrctrl_flag);
}
static int gmu_aop_mailbox_init(struct kgsl_device *device,
struct gmu_device *gmu)
{
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
struct kgsl_mailbox *mailbox = &gmu->mailbox;
mailbox->client = kzalloc(sizeof(*mailbox->client), GFP_KERNEL);
if (!mailbox->client)
return -ENOMEM;
mailbox->client.dev = &gmu->pdev->dev;
mailbox->client.tx_block = true;
mailbox->client.tx_tout = 1000;
mailbox->client.knows_txdone = false;
mailbox->client->dev = &gmu->pdev->dev;
mailbox->client->tx_block = true;
mailbox->client->tx_tout = 1000;
mailbox->client->knows_txdone = false;
mailbox->channel = mbox_request_channel(mailbox->client, 0);
if (IS_ERR(mailbox->channel)) {
kfree(mailbox->client);
mailbox->client = NULL;
mailbox->channel = mbox_request_channel(&mailbox->client, 0);
if (IS_ERR(mailbox->channel))
return PTR_ERR(mailbox->channel);
}
set_bit(ADRENO_ACD_CTRL, &adreno_dev->pwrctrl_flag);
return 0;
@ -1115,7 +1089,7 @@ static int gmu_acd_set(struct kgsl_device *device, unsigned int val)
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
struct gmu_device *gmu = KGSL_GMU_DEVICE(device);
if (!gmu->mailbox.client)
if (IS_ERR_OR_NULL(gmu->mailbox.channel))
return -EINVAL;
/* Don't do any unneeded work if ACD is already in the correct state */
@ -1641,6 +1615,7 @@ error:
static void gmu_remove(struct kgsl_device *device)
{
struct adreno_device *adreno_dev = ADRENO_DEVICE(device);
struct gmu_device *gmu = KGSL_GMU_DEVICE(device);
struct kgsl_hfi *hfi;
int i = 0;
@ -1654,7 +1629,10 @@ static void gmu_remove(struct kgsl_device *device)
gmu_stop(device);
gmu_aop_mailbox_destroy(device);
if (!IS_ERR_OR_NULL(gmu->mailbox.channel))
mbox_free_channel(gmu->mailbox.channel);
clear_bit(ADRENO_ACD_CTRL, &adreno_dev->pwrctrl_flag);
while ((i < MAX_GMU_CLKS) && gmu->clks[i]) {
gmu->clks[i] = NULL;

4
drivers/gpu/msm/kgsl_gmu.h
View file

@ -5,6 +5,8 @@
#ifndef __KGSL_GMU_H
#define __KGSL_GMU_H
#include <linux/mailbox_client.h>
#include "kgsl_gmu_core.h"
#include "kgsl_hfi.h"
@ -139,7 +141,7 @@ enum gmu_load_mode {
};
struct kgsl_mailbox {
struct mbox_client *client;
struct mbox_client client;
struct mbox_chan *channel;
};