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

Commit fb422950 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.9' of git://github.com/skeggsb/linux into drm-next 

Karol's work which greatly improves volt/clock changes on a
heap of boards, nothing too exciting beyond a random collection of fixes.

* 'linux-4.9' of git://github.com/skeggsb/linux: (33 commits)
  drm/nouveau/fb/nv50: defer DMA mapping of scratch page to oneinit() hook
  drm/nouveau/fb/gf100: defer DMA mapping of scratch page to oneinit() hook
  drm/nouveau/pci: set streaming DMA mask early
  drm/nouveau/kms: add Maxwell to backlight initialization
  drm/nouveau/bar/nv50: fix bar2 vm size
  drm/nouveau/disp: remove unused function in sorg94.c
  drm/nouveau/volt: use kernel's 64-bit signed division function
  drm/nouveau/core: add missing header dependencies
  drm/nouveau/gr/nv3x: add 0x0597 kelvin 3d class support
  drm/nouveau/drm/nouveau: add a LED driver for the NVIDIA logo
  drm/nouveau/fb/ram: Use Kepler implementation on Maxwell
  drm/nouveau/volt: Make use of cvb coefficients
  drm/nouveau/volt/gf100-: Add speedo
  drm/nouveau/volt: Add implementation for gf100
  drm/nouveau/bios/vmap: unk0 field is the mode
  drm/nouveau/volt: Don't require perfect fit
  drm/nouveau/clk: Allow boosting only when NvBoost is set
  drm/nouveau/bios: Add parsing of VPSTATE table
  drm/nouveau/clk: Respect voltage limits in nvkm_cstate_prog
  drm/nouveau/clk: Fixup cstate selection
  ...
parents 220196b3 2ecf7c43

drivers/gpu/drm/nouveau/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ nouveau-$(CONFIG_DEBUG_FS) += nouveau_debugfs.o 
nouveau-y += nouveau_drm.o

nouveau-y += nouveau_hwmon.o

nouveau-$(CONFIG_COMPAT) += nouveau_ioc32.o

nouveau-$(CONFIG_LEDS_CLASS) += nouveau_led.o

nouveau-y += nouveau_nvif.o

nouveau-$(CONFIG_NOUVEAU_PLATFORM_DRIVER) += nouveau_platform.o

nouveau-y += nouveau_usif.o # userspace <-> nvif

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

+1 −0
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ enum dcb_gpio_func_name { 
	DCB_GPIO_TVDAC1 = 0x2d,

	DCB_GPIO_FAN = 0x09,

	DCB_GPIO_FAN_SENSE = 0x3d,

	DCB_GPIO_LOGO_LED_PWM = 0x84,

	DCB_GPIO_UNUSED = 0xff,

	DCB_GPIO_VID0 = 0x04,

	DCB_GPIO_VID1 = 0x05,

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

+8 −2
Original line number Diff line number Diff line 
#ifndef __NVBIOS_ICCSENSE_H__

#define __NVBIOS_ICCSENSE_H__

struct pwr_rail_resistor_t {

	u8 mohm;

	bool enabled;

};



struct pwr_rail_t {

	u8 mode;

	u8 extdev_id;

	u8 resistor_mohm;

	u8 rail;

	u8 resistor_count;

	struct pwr_rail_resistor_t resistors[3];

	u16 config;

};



struct nvbios_iccsense {

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

+4 −1
Original line number Diff line number Diff line 
#ifndef __NVBIOS_VMAP_H__

#define __NVBIOS_VMAP_H__

struct nvbios_vmap {

	u8  max0;

	u8  max1;

	u8  max2;

};



u16 nvbios_vmap_table(struct nvkm_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len);
@@ -8,7 +11,7 @@ u16 nvbios_vmap_parse(struct nvkm_bios *, u8 *ver, u8 *hdr, u8 *cnt, u8 *len, 
		      struct nvbios_vmap *);



struct nvbios_vmap_entry {

	u8  unk0;

	u8  mode;

	u8  link;

	u32 min;

	u32 max;

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

+3 −2
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ struct nvbios_volt { 
	u32 base;



	/* GPIO mode */

	bool ranged;

	u8   vidmask;

	s16  step;