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

Commit 9ac63d99 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

- BIT_PERF_PTRS uses 32-bit pointers to its subtables, we were parsing
them as 16-bit, causing various issues on newer boards.
- Support for MXM on GM20x and up.
- More display-related fixes.

* 'linux-4.10' of git://github.com/skeggsb/linux:
  drm/nouveau/mxm: warn more loudly on unsupported DCB version
  drm/nouveau/mxm: handle DCB 4.1 modification
  drm/nouveau/bios/mxm: handle digital connector table 1.1
  drm/nouveau: Queue hpd_work on (runtime) resume
  drm/nouveau: Rename acpi_work to hpd_work
  drm/nouveau/kms/nv50: Fix atomic pageflip events.
  drm/nouveau/fb/ram/gp100-: fix memory detection where FBP_NUM != FBPA_NUM
  drm/nouveau/bios/volt: pointers are 32-bit
  drm/nouveau/bios/vmap: pointers are 32-bit
  drm/nouveau/bios/timing: pointers are 32-bit
  drm/nouveau/bios/therm: pointers are 32-bit
  drm/nouveau/bios/perf: pointers are 32-bit
  drm/nouveau/bios/iccsense: pointers are 32-bit
  drm/nouveau/bios/fan: pointers are 32-bit
  drm/nouveau/bios/cstep: pointers are 32-bit
  drm/nouveau/bios/boost: pointers are 32-bit
parents f03ee46b a8f6cb7b

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/include/nvkm/subdev/bios/cstep.h

+6 −6
Original line number Diff line number Diff line 
#ifndef __NVBIOS_CSTEP_H__

#define __NVBIOS_CSTEP_H__

u16 nvbios_cstepTe(struct nvkm_bios *,

u32 nvbios_cstepTe(struct nvkm_bios *,

		   u8 *ver, u8 *hdr, u8 *cnt, u8 *len, u8 *xnr, u8 *xsz);



struct nvbios_cstepE {
@@ -8,10 +8,10 @@ struct nvbios_cstepE { 
	u8  index;

};



u16 nvbios_cstepEe(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr);

u16 nvbios_cstepEp(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr,

u32 nvbios_cstepEe(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr);

u32 nvbios_cstepEp(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr,

		   struct nvbios_cstepE *);

u16 nvbios_cstepEm(struct nvkm_bios *, u8 pstate, u8 *ver, u8 *hdr,

u32 nvbios_cstepEm(struct nvkm_bios *, u8 pstate, u8 *ver, u8 *hdr,

		   struct nvbios_cstepE *);



struct nvbios_cstepX {
@@ -20,7 +20,7 @@ struct nvbios_cstepX { 
	u8  voltage;

};



u16 nvbios_cstepXe(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr);

u16 nvbios_cstepXp(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr,

u32 nvbios_cstepXe(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr);

u32 nvbios_cstepXp(struct nvkm_bios *, int idx, u8 *ver, u8 *hdr,

		   struct nvbios_cstepX *);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -2,5 +2,5 @@ 
#define __NVBIOS_FAN_H__

#include <subdev/bios/therm.h>



u16 nvbios_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan);

u32 nvbios_fan_parse(struct nvkm_bios *bios, struct nvbios_therm_fan *fan);

#endif

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

+3 −3
Original line number Diff line number Diff line 
#ifndef __NVBIOS_PERF_H__

#define __NVBIOS_PERF_H__

u16 nvbios_perf_table(struct nvkm_bios *, u8 *ver, u8 *hdr,

u32 nvbios_perf_table(struct nvkm_bios *, u8 *ver, u8 *hdr,

		      u8 *cnt, u8 *len, u8 *snr, u8 *ssz);



struct nvbios_perfE {
@@ -17,9 +17,9 @@ struct nvbios_perfE { 
	u8  pcie_width;

};



u16 nvbios_perf_entry(struct nvkm_bios *, int idx,

u32 nvbios_perf_entry(struct nvkm_bios *, int idx,

		      u8 *ver, u8 *hdr, u8 *cnt, u8 *len);

u16 nvbios_perfEp(struct nvkm_bios *, int idx,

u32 nvbios_perfEp(struct nvkm_bios *, int idx,

		  u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_perfE *);



struct nvbios_perfS {

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

+3 −3
Original line number Diff line number Diff line
@@ -2,10 +2,10 @@ 
#define __NVBIOS_TIMING_H__

#include <subdev/bios/ramcfg.h>



u16 nvbios_timingTe(struct nvkm_bios *,

u32 nvbios_timingTe(struct nvkm_bios *,

		    u8 *ver, u8 *hdr, u8 *cnt, u8 *len, u8 *snr, u8 *ssz);

u16 nvbios_timingEe(struct nvkm_bios *, int idx,

u32 nvbios_timingEe(struct nvkm_bios *, int idx,

		    u8 *ver, u8 *hdr, u8 *cnt, u8 *len);

u16 nvbios_timingEp(struct nvkm_bios *, int idx,

u32 nvbios_timingEp(struct nvkm_bios *, int idx,

		    u8 *ver, u8 *hdr, u8 *cnt, u8 *len, struct nvbios_ramcfg *);

#endif