Merge "msm: kgsl: Change data type for GPU ib vote"

This commit is contained in:
Linux Build Service Account 2019-06-29 15:41:45 -07:00 committed by Gerrit - the friendly Code Review server
commit fad4d2e837

View file

@ -1,4 +1,4 @@
/* Copyright (c) 2010-2018, The Linux Foundation. All rights reserved.
/* Copyright (c) 2010-2019, The Linux Foundation. All rights reserved.
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 and
@ -61,7 +61,7 @@ static const char * const clocks[] = {
"iref_clk"
};
static unsigned int ib_votes[KGSL_MAX_BUSLEVELS];
static unsigned long ib_votes[KGSL_MAX_BUSLEVELS];
static int last_vote_buslevel;
static int max_vote_buslevel;
@ -123,7 +123,7 @@ static void _record_pwrevent(struct kgsl_device *device,
/**
* kgsl_get_bw() - Return latest msm bus IB vote
*/
static unsigned int kgsl_get_bw(void)
static unsigned long kgsl_get_bw(void)
{
return ib_votes[last_vote_buslevel];
}
@ -137,8 +137,9 @@ static unsigned int kgsl_get_bw(void)
static void _ab_buslevel_update(struct kgsl_pwrctrl *pwr,
unsigned long *ab)
{
unsigned int ib = ib_votes[last_vote_buslevel];
unsigned int max_bw = ib_votes[max_vote_buslevel];
unsigned long ib = ib_votes[last_vote_buslevel];
unsigned long max_bw = ib_votes[max_vote_buslevel];
if (!ab)
return;
if (ib == 0)