xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/nouveau/bios/boost: pointers are 32-bit

Browse Source 
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
This commit is contained in:
Ben Skeggs
2016-11-18 11:24:35 +10:00
parent ed828666a7
commit 5878601767
3 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/gpu/drm/nouveau/include/nvkm/subdev/bios/boost.h
View File

@@ -1,6 +1,6 @@
#ifndef __NVBIOS_BOOST_H__ #ifndef __NVBIOS_BOOST_H__
#define __NVBIOS_BOOST_H__ #define __NVBIOS_BOOST_H__
u16 nvbios_boostTe(struct nvkm_bios *, u8 *, u8 *, u8 *, u8 *, u8 *, u8 *); u32 nvbios_boostTe(struct nvkm_bios *, u8 *, u8 *, u8 *, u8 *, u8 *, u8 *);
struct nvbios_boostE { struct nvbios_boostE {
u8 pstate; u8 pstate;
@@ -8,10 +8,10 @@ struct nvbios_boostE {
u32 max; u32 max;
}; };
u16 nvbios_boostEe(struct nvkm_bios *, int idx, u8 *, u8 *, u8 *, u8 *); u32 nvbios_boostEe(struct nvkm_bios *, int idx, u8 *, u8 *, u8 *, u8 *);
u16 nvbios_boostEp(struct nvkm_bios *, int idx, u8 *, u8 *, u8 *, u8 *, u32 nvbios_boostEp(struct nvkm_bios *, int idx, u8 *, u8 *, u8 *, u8 *,
struct nvbios_boostE *); struct nvbios_boostE *);
u16 nvbios_boostEm(struct nvkm_bios *, u8, u8 *, u8 *, u8 *, u8 *, u32 nvbios_boostEm(struct nvkm_bios *, u8, u8 *, u8 *, u8 *, u8 *,
struct nvbios_boostE *); struct nvbios_boostE *);
struct nvbios_boostS { struct nvbios_boostS {
@@ -21,7 +21,7 @@ struct nvbios_boostS {
u32 max; u32 max;
}; };
u16 nvbios_boostSe(struct nvkm_bios *, int, u16, u8 *, u8 *, u8, u8); u32 nvbios_boostSe(struct nvkm_bios *, int, u32, u8 *, u8 *, u8, u8);
u16 nvbios_boostSp(struct nvkm_bios *, int, u16, u8 *, u8 *, u8, u8, u32 nvbios_boostSp(struct nvkm_bios *, int, u32, u8 *, u8 *, u8, u8,
struct nvbios_boostS *); struct nvbios_boostS *);
#endif #endif

30
drivers/gpu/drm/nouveau/nvkm/subdev/bios/boost.c
View File

@@ -25,16 +25,16 @@
#include <subdev/bios/bit.h> #include <subdev/bios/bit.h>
#include <subdev/bios/boost.h> #include <subdev/bios/boost.h>
u16 u32
nvbios_boostTe(struct nvkm_bios *bios, nvbios_boostTe(struct nvkm_bios *bios,
u8 *ver, u8 *hdr, u8 *cnt, u8 *len, u8 *snr, u8 *ssz) u8 *ver, u8 *hdr, u8 *cnt, u8 *len, u8 *snr, u8 *ssz)
{ {
struct bit_entry bit_P; struct bit_entry bit_P;
u16 boost = 0x0000; u32 boost = 0;
if (!bit_entry(bios, 'P', &bit_P)) { if (!bit_entry(bios, 'P', &bit_P)) {
if (bit_P.version == 2) if (bit_P.version == 2)
boost = nvbios_rd16(bios, bit_P.offset + 0x30); boost = nvbios_rd32(bios, bit_P.offset + 0x30);
if (boost) { if (boost) {
*ver = nvbios_rd08(bios, boost + 0); *ver = nvbios_rd08(bios, boost + 0);
@@ -52,15 +52,15 @@ nvbios_boostTe(struct nvkm_bios *bios,
} }
} }
return 0x0000; return 0;
} }
u16 u32
nvbios_boostEe(struct nvkm_bios *bios, int idx, nvbios_boostEe(struct nvkm_bios *bios, int idx,
u8 *ver, u8 *hdr, u8 *cnt, u8 *len) u8 *ver, u8 *hdr, u8 *cnt, u8 *len)
{ {
u8 snr, ssz; u8 snr, ssz;
u16 data = nvbios_boostTe(bios, ver, hdr, cnt, len, &snr, &ssz); u32 data = nvbios_boostTe(bios, ver, hdr, cnt, len, &snr, &ssz);
if (data && idx < *cnt) { if (data && idx < *cnt) {
data = data + *hdr + (idx * (*len + (snr * ssz))); data = data + *hdr + (idx * (*len + (snr * ssz)));
*hdr = *len; *hdr = *len;
@@ -68,14 +68,14 @@ nvbios_boostEe(struct nvkm_bios *bios, int idx,
*len = ssz; *len = ssz;
return data; return data;
} }
return 0x0000; return 0;
} }
u16 u32
nvbios_boostEp(struct nvkm_bios *bios, int idx, nvbios_boostEp(struct nvkm_bios *bios, int idx,
u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_boostE *info) u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_boostE *info)
{ {
u16 data = nvbios_boostEe(bios, idx, ver, hdr, cnt, len); u32 data = nvbios_boostEe(bios, idx, ver, hdr, cnt, len);
memset(info, 0x00, sizeof(*info)); memset(info, 0x00, sizeof(*info));
if (data) { if (data) {
info->pstate = (nvbios_rd16(bios, data + 0x00) & 0x01e0) >> 5; info->pstate = (nvbios_rd16(bios, data + 0x00) & 0x01e0) >> 5;
@@ -85,7 +85,7 @@ nvbios_boostEp(struct nvkm_bios *bios, int idx,
return data; return data;
} }
u16 u32
nvbios_boostEm(struct nvkm_bios *bios, u8 pstate, nvbios_boostEm(struct nvkm_bios *bios, u8 pstate,
u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_boostE *info) u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_boostE *info)
{ {
@@ -97,21 +97,21 @@ nvbios_boostEm(struct nvkm_bios *bios, u8 pstate,
return data; return data;
} }
u16 u32
nvbios_boostSe(struct nvkm_bios *bios, int idx, nvbios_boostSe(struct nvkm_bios *bios, int idx,
u16 data, u8 *ver, u8 *hdr, u8 cnt, u8 len) u32 data, u8 *ver, u8 *hdr, u8 cnt, u8 len)
{ {
if (data && idx < cnt) { if (data && idx < cnt) {
data = data + *hdr + (idx * len); data = data + *hdr + (idx * len);
*hdr = len; *hdr = len;
return data; return data;
} }
return 0x0000; return 0;
} }
u16 u32
nvbios_boostSp(struct nvkm_bios *bios, int idx, nvbios_boostSp(struct nvkm_bios *bios, int idx,
u16 data, u8 *ver, u8 *hdr, u8 cnt, u8 len, u32 data, u8 *ver, u8 *hdr, u8 cnt, u8 len,
struct nvbios_boostS *info) struct nvbios_boostS *info)
{ {
data = nvbios_boostSe(bios, idx, data, ver, hdr, cnt, len); data = nvbios_boostSe(bios, idx, data, ver, hdr, cnt, len);

4
drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c
View File

@@ -44,13 +44,13 @@ nvkm_clk_adjust(struct nvkm_clk *clk, bool adjust,
struct nvkm_bios *bios = clk->subdev.device->bios; struct nvkm_bios *bios = clk->subdev.device->bios;
struct nvbios_boostE boostE; struct nvbios_boostE boostE;
u8 ver, hdr, cnt, len; u8 ver, hdr, cnt, len;
u16 data; u32 data;
data = nvbios_boostEm(bios, pstate, &ver, &hdr, &cnt, &len, &boostE); data = nvbios_boostEm(bios, pstate, &ver, &hdr, &cnt, &len, &boostE);
if (data) { if (data) {
struct nvbios_boostS boostS; struct nvbios_boostS boostS;
u8 idx = 0, sver, shdr; u8 idx = 0, sver, shdr;
u16 subd; u32 subd;
input = max(boostE.min, input); input = max(boostE.min, input);
input = min(boostE.max, input); input = min(boostE.max, input);