Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07b12669 authored by Ben Skeggs's avatar Ben Skeggs
Browse files

drm/nouveau: fix potential accuracy loss when parsing perf 0x1c tables 



Reported-by: default avatarRoy Spliet <r.spliet@student.tudelft.nl>
Signed-off-by: default avatarBen Skeggs <bskeggs@redhat.com>
parent e0228785

drivers/gpu/drm/nouveau/nouveau_perf.c

+14 −20
Original line number Original line Diff line number Diff line
@@ -90,50 +90,44 @@ nouveau_perf_init(struct drm_device *dev) 
		case 0x15:

		case 0x15:

			perflvl->fanspeed = entry[55];

			perflvl->fanspeed = entry[55];

			perflvl->voltage = entry[56];

			perflvl->voltage = entry[56];

			perflvl->core = ROM32(entry[1]) / 100;

			perflvl->core = ROM32(entry[1]) * 10;

			perflvl->memory = ROM32(entry[5]) / 100;

			perflvl->memory = ROM32(entry[5]) * 10;

			break;

			break;

		case 0x21:

		case 0x21:

		case 0x23:

		case 0x23:

		case 0x24:

		case 0x24:

			perflvl->fanspeed = entry[4];

			perflvl->fanspeed = entry[4];

			perflvl->voltage = entry[5];

			perflvl->voltage = entry[5];

			perflvl->core = ROM16(entry[6]);

			perflvl->core = ROM16(entry[6]) * 1000;

			perflvl->memory = ROM16(entry[11]);

			perflvl->memory = ROM16(entry[11]) * 1000;

			break;

			break;

		case 0x25:

		case 0x25:

			perflvl->fanspeed = entry[4];

			perflvl->fanspeed = entry[4];

			perflvl->voltage = entry[5];

			perflvl->voltage = entry[5];

			perflvl->core = ROM16(entry[6]);

			perflvl->core = ROM16(entry[6]) * 1000;

			perflvl->shader = ROM16(entry[10]);

			perflvl->shader = ROM16(entry[10]) * 1000;

			perflvl->memory = ROM16(entry[12]);

			perflvl->memory = ROM16(entry[12]) * 1000;

			break;

			break;

		case 0x30:

		case 0x30:

		case 0x35:

		case 0x35:

			perflvl->fanspeed = entry[6];

			perflvl->fanspeed = entry[6];

			perflvl->voltage = entry[7];

			perflvl->voltage = entry[7];

			perflvl->core = ROM16(entry[8]);

			perflvl->core = ROM16(entry[8]) * 1000;

			perflvl->shader = ROM16(entry[10]);

			perflvl->shader = ROM16(entry[10]) * 1000;

			perflvl->memory = ROM16(entry[12]);

			perflvl->memory = ROM16(entry[12]) * 1000;

			/*XXX: confirm on 0x35 */

			/*XXX: confirm on 0x35 */

			perflvl->unk05 = ROM16(entry[16]);

			perflvl->unk05 = ROM16(entry[16]) * 1000;

			break;

			break;

		case 0x40:

		case 0x40:

#define subent(n) entry[perf[2] + ((n) * perf[3])]

#define subent(n) entry[perf[2] + ((n) * perf[3])]

			perflvl->fanspeed = 0; /*XXX*/

			perflvl->fanspeed = 0; /*XXX*/

			perflvl->voltage = 0; /*XXX: entry[2] */;

			perflvl->voltage = 0; /*XXX: entry[2] */;

			perflvl->core = ROM16(subent(0)) & 0xfff;

			perflvl->core = (ROM16(subent(0)) & 0xfff) * 1000;

			perflvl->shader = ROM16(subent(1)) & 0xfff;

			perflvl->shader = (ROM16(subent(1)) & 0xfff) * 1000;

			perflvl->memory = ROM16(subent(2)) & 0xfff;

			perflvl->memory = (ROM16(subent(2)) & 0xfff) * 1000;

			break;

			break;

		}

		}





		/* convert MHz -> KHz, it's more convenient */

		perflvl->core *= 1000;

		perflvl->memory *= 1000;

		perflvl->shader *= 1000;

		perflvl->unk05 *= 1000;



		/* make sure vid is valid */

		/* make sure vid is valid */

		if (pm->voltage.supported && perflvl->voltage) {

		if (pm->voltage.supported && perflvl->voltage) {

			vid = nouveau_volt_vid_lookup(dev, perflvl->voltage);

			vid = nouveau_volt_vid_lookup(dev, perflvl->voltage);