drm/nouveau/bios/boost: pointers are 32-bit (58786017) · Commits · e / devices / android_kernel_fairphone_FP4

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

+6 −6

Original line number	Diff line number	Diff line
		#ifndef __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 {
		u8 pstate;
		@@ -8,10 +8,10 @@ struct nvbios_boostE {
		u32 max;
		};

		u16 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_boostEe(struct nvkm_bios , int idx, u8 , u8 , u8 , u8 *);
		u32 nvbios_boostEp(struct nvkm_bios , int idx, u8 , u8 , u8 , u8 *,
		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_boostS {
		@@ -21,7 +21,7 @@ struct nvbios_boostS {
		u32 max;
		};

		u16 nvbios_boostSe(struct nvkm_bios , int, u16, u8 , u8 *, u8, u8);
		u16 nvbios_boostSp(struct nvkm_bios , int, u16, u8 , u8 *, u8, u8,
		u32 nvbios_boostSe(struct nvkm_bios , int, u32, u8 , u8 *, u8, u8);
		u32 nvbios_boostSp(struct nvkm_bios , int, u32, u8 , u8 *, u8, u8,
		struct nvbios_boostS *);
		#endif

drivers/gpu/drm/nouveau/nvkm/subdev/bios/boost.c

+15 −15

Original line number	Diff line number	Diff line
		@@ -25,16 +25,16 @@
		#include <subdev/bios/bit.h>
		#include <subdev/bios/boost.h>

		u16
		u32
		nvbios_boostTe(struct nvkm_bios *bios,
		u8 ver, u8 hdr, u8 cnt, u8 len, u8 snr, u8 ssz)
		{
		struct bit_entry bit_P;
		u16 boost = 0x0000;
		u32 boost = 0;

		if (!bit_entry(bios, 'P', &bit_P)) {
		if (bit_P.version == 2)
		boost = nvbios_rd16(bios, bit_P.offset + 0x30);
		boost = nvbios_rd32(bios, bit_P.offset + 0x30);

		if (boost) {
		*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,
		u8 ver, u8 hdr, u8 cnt, u8 len)
		{
		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) {
		data = data + hdr + (idx (len + (snr ssz)));
		hdr = len;
		@@ -68,14 +68,14 @@ nvbios_boostEe(struct nvkm_bios *bios, int idx,
		*len = ssz;
		return data;
		}
		return 0x0000;
		return 0;
		}

		u16
		u32
		nvbios_boostEp(struct nvkm_bios *bios, int idx,
		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));
		if (data) {
		info->pstate = (nvbios_rd16(bios, data + 0x00) & 0x01e0) >> 5;
		@@ -85,7 +85,7 @@ nvbios_boostEp(struct nvkm_bios *bios, int idx,
		return data;
		}

		u16
		u32
		nvbios_boostEm(struct nvkm_bios *bios, u8 pstate,
		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;
		}

		u16
		u32
		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) {
		data = data + hdr + (idx len);
		*hdr = len;
		return data;
		}
		return 0x0000;
		return 0;
		}

		u16
		u32
		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)
		{
		data = nvbios_boostSe(bios, idx, data, ver, hdr, cnt, len);

drivers/gpu/drm/nouveau/nvkm/subdev/clk/base.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -44,13 +44,13 @@ nvkm_clk_adjust(struct nvkm_clk *clk, bool adjust,
		struct nvkm_bios *bios = clk->subdev.device->bios;
		struct nvbios_boostE boostE;
		u8 ver, hdr, cnt, len;
		u16 data;
		u32 data;

		data = nvbios_boostEm(bios, pstate, &ver, &hdr, &cnt, &len, &boostE);
		if (data) {
		struct nvbios_boostS boostS;
		u8 idx = 0, sver, shdr;
		u16 subd;
		u32 subd;

		input = max(boostE.min, input);
		input = min(boostE.max, input);