drm/nouveau/bios: add support for parsing xpio table data (112a12aa) · Commits · 戴 / test

drivers/gpu/drm/nouveau/Makefile

+1 −0

Original line number	Diff line number	Diff line
		@@ -40,6 +40,7 @@ nouveau-y += core/subdev/bios/mxm.o
		nouveau-y += core/subdev/bios/perf.o
		nouveau-y += core/subdev/bios/pll.o
		nouveau-y += core/subdev/bios/therm.o
		nouveau-y += core/subdev/bios/xpio.o
		nouveau-y += core/subdev/bus/nv04.o
		nouveau-y += core/subdev/bus/nv31.o
		nouveau-y += core/subdev/bus/nv50.o

drivers/gpu/drm/nouveau/core/include/subdev/bios/gpio.h

+0 −2

Original line number	Diff line number	Diff line
		#ifndef __NVBIOS_GPIO_H__
		#define __NVBIOS_GPIO_H__

		struct nouveau_bios;

		enum dcb_gpio_func_name {
		DCB_GPIO_PANEL_POWER = 0x01,
		DCB_GPIO_TVDAC0 = 0x0c,

drivers/gpu/drm/nouveau/core/include/subdev/bios/xpio.h

0 → 100644

+19 −0

Original line number	Diff line number	Diff line
		#ifndef __NVBIOS_XPIO_H__
		#define __NVBIOS_XPIO_H__

		#define NVBIOS_XPIO_FLAG_AUX 0x10
		#define NVBIOS_XPIO_FLAG_AUX0 0x00
		#define NVBIOS_XPIO_FLAG_AUX1 0x10

		struct nvbios_xpio {
		u8 type;
		u8 addr;
		u8 flags;
		};

		u16 dcb_xpio_table(struct nouveau_bios *, u8 idx,
		u8 ver, u8 hdr, u8 cnt, u8 len);
		u16 dcb_xpio_parse(struct nouveau_bios *, u8 idx,
		u8 ver, u8 hdr, u8 cnt, u8 len, struct nvbios_xpio *);

		#endif

drivers/gpu/drm/nouveau/core/subdev/bios/gpio.c

+9 −2

Original line number	Diff line number	Diff line
		@@ -25,6 +25,7 @@
		#include <subdev/bios.h>
		#include <subdev/bios/dcb.h>
		#include <subdev/bios/gpio.h>
		#include <subdev/bios/xpio.h>

		u16
		dcb_gpio_table(struct nouveau_bios bios, u8 ver, u8 hdr, u8 cnt, u8 *len)
		@@ -60,8 +61,14 @@ dcb_gpio_table(struct nouveau_bios bios, u8 ver, u8 hdr, u8 cnt, u8 *len)
		u16
		dcb_gpio_entry(struct nouveau_bios bios, int idx, int ent, u8 ver, u8 *len)
		{
		u8 hdr, cnt;
		u16 gpio = !idx ? dcb_gpio_table(bios, ver, &hdr, &cnt, len) : 0x0000;
		u8 hdr, cnt, xver; /* use gpio version for xpio entry parsing */
		u16 gpio;

		if (!idx--)
		gpio = dcb_gpio_table(bios, ver, &hdr, &cnt, len);
		else
		gpio = dcb_xpio_table(bios, idx, &xver, &hdr, &cnt, len);

		if (gpio && ent < cnt)
		return gpio + hdr + (ent * *len);
		return 0x0000;

drivers/gpu/drm/nouveau/core/subdev/bios/xpio.c

0 → 100644

+76 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright 2012 Red Hat Inc.
		*
		* Permission is hereby granted, free of charge, to any person obtaining a
		* copy of this software and associated documentation files (the "Software"),
		* to deal in the Software without restriction, including without limitation
		* the rights to use, copy, modify, merge, publish, distribute, sublicense,
		* and/or sell copies of the Software, and to permit persons to whom the
		* Software is furnished to do so, subject to the following conditions:
		*
		* The above copyright notice and this permission notice shall be included in
		* all copies or substantial portions of the Software.
		*
		* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
		* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
		* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
		* THE COPYRIGHT HOLDER(S) OR AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
		* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
		* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
		* OTHER DEALINGS IN THE SOFTWARE.
		*
		* Authors: Ben Skeggs
		*/

		#include <subdev/bios.h>
		#include <subdev/bios/gpio.h>
		#include <subdev/bios/xpio.h>

		static u16
		dcb_xpiod_table(struct nouveau_bios bios, u8 ver, u8 hdr, u8 cnt, u8 *len)
		{
		u16 data = dcb_gpio_table(bios, ver, hdr, cnt, len);
		if (data && ver >= 0x40 && hdr >= 0x06) {
		u16 xpio = nv_ro16(bios, data + 0x04);
		if (xpio) {
		*ver = nv_ro08(bios, data + 0x00);
		*hdr = nv_ro08(bios, data + 0x01);
		*cnt = nv_ro08(bios, data + 0x02);
		*len = nv_ro08(bios, data + 0x03);
		return xpio;
		}
		}
		return 0x0000;
		}

		u16
		dcb_xpio_table(struct nouveau_bios *bios, u8 idx,
		u8 ver, u8 hdr, u8 cnt, u8 len)
		{
		u16 data = dcb_xpiod_table(bios, ver, hdr, cnt, len);
		if (data && idx < *cnt) {
		u16 xpio = nv_ro16(bios, data + hdr + (idx *len));
		if (xpio) {
		*ver = nv_ro08(bios, data + 0x00);
		*hdr = nv_ro08(bios, data + 0x01);
		*cnt = nv_ro08(bios, data + 0x02);
		*len = nv_ro08(bios, data + 0x03);
		return xpio;
		}
		}
		return 0x0000;
		}

		u16
		dcb_xpio_parse(struct nouveau_bios *bios, u8 idx,
		u8 ver, u8 hdr, u8 cnt, u8 len,
		struct nvbios_xpio *info)
		{
		u16 data = dcb_xpio_table(bios, idx, ver, hdr, cnt, len);
		if (data && *len >= 6) {
		info->type = nv_ro08(bios, data + 0x04);
		info->addr = nv_ro08(bios, data + 0x05);
		info->flags = nv_ro08(bios, data + 0x06);
		}
		return 0x0000;
		}

Admin message