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

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

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

- initial kepler clock gating support
- atomic gamma handling fixes
- support for gp108 "secure boot" (enables acceleration, finally)

* 'linux-4.16' of git://github.com/skeggsb/linux:
  drm/nouveau/clk: fix gcc-7 -Wint-in-bool-context warning
  drm/nouveau/mmu: Fix trailing semicolon
  drm/nouveau: Introduce NvPmEnableGating option
  drm/nouveau: Add support for SLCG for Kepler2
  drm/nouveau: Add support for BLCG on Kepler2
  drm/nouveau: Add support for BLCG on Kepler1
  drm/nouveau: Add support for basic clockgating on Kepler1
  drm/nouveau/kms/nv50: fix handling of gamma since atomic conversion
  drm/nouveau/kms/nv50: use INTERPOLATE_257_UNITY_RANGE LUT on newer chipsets
  drm/nouveau/kms/nv50: use "low res" lut for indexed mode
  drm/nouveau/kms/nv50: prepare for double-buffered LUTs
  drm/nouveau/bo: add helper functions for handling pinned+mapped buffers
  drm/nouveau/fbcon: add module parameter to select bits-per-pixel
  drm/nouveau/secboot/gp108: implement on top of acr_r370
  drm/nouveau/secboot/r370: implement support for booting LS SEC2 ucode
  drm/nouveau/secboot/r370: move a bunch of r375 stuff to a new implementation
  drm/nouveau: nouveau: use correct string length
  drm/nouveau/drm/nouveau/mmu: fix odd_ptr_err.cocci warnings
  drm/nouveau/pmu/fuc: don't use movw directly anymore
parents d6a841a4 b515483e

drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -75,6 +75,7 @@ int mcp89_fb_new(struct nvkm_device *, int, struct nvkm_fb **); 
int gf100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gf100_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gf108_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gf108_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gk104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gk110_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gk20a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gk20a_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

drivers/gpu/drm/nouveau/include/nvkm/subdev/secboot.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -60,6 +60,7 @@ int nvkm_secboot_reset(struct nvkm_secboot *, unsigned long); 
int gm200_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gm200_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gm20b_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gm20b_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gp102_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gp102_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gp108_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gp10b_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);

int gp10b_secboot_new(struct nvkm_device *, int, struct nvkm_secboot **);





#endif
 
#endif

drivers/gpu/drm/nouveau/include/nvkm/subdev/therm.h

+17 −0
Original line number Original line Diff line number Diff line
@@ -46,6 +46,16 @@ enum nvkm_therm_attr_type { 
	NVKM_THERM_ATTR_THRS_SHUTDOWN_HYST = 17,

	NVKM_THERM_ATTR_THRS_SHUTDOWN_HYST = 17,

};

};





struct nvkm_therm_clkgate_init {

	u32 addr;

	u8  count;

	u32 data;

};



struct nvkm_therm_clkgate_pack {

	const struct nvkm_therm_clkgate_init *init;

};



struct nvkm_therm {

struct nvkm_therm {

	const struct nvkm_therm_func *func;

	const struct nvkm_therm_func *func;

	struct nvkm_subdev subdev;

	struct nvkm_subdev subdev;
@@ -85,17 +95,24 @@ struct nvkm_therm { 




	int (*attr_get)(struct nvkm_therm *, enum nvkm_therm_attr_type);

	int (*attr_get)(struct nvkm_therm *, enum nvkm_therm_attr_type);

	int (*attr_set)(struct nvkm_therm *, enum nvkm_therm_attr_type, int);

	int (*attr_set)(struct nvkm_therm *, enum nvkm_therm_attr_type, int);



	bool clkgating_enabled;

};

};





int nvkm_therm_temp_get(struct nvkm_therm *);

int nvkm_therm_temp_get(struct nvkm_therm *);

int nvkm_therm_fan_sense(struct nvkm_therm *);

int nvkm_therm_fan_sense(struct nvkm_therm *);

int nvkm_therm_cstate(struct nvkm_therm *, int, int);

int nvkm_therm_cstate(struct nvkm_therm *, int, int);

void nvkm_therm_clkgate_init(struct nvkm_therm *,

			     const struct nvkm_therm_clkgate_pack *);

void nvkm_therm_clkgate_enable(struct nvkm_therm *);

void nvkm_therm_clkgate_fini(struct nvkm_therm *, bool);





int nv40_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int nv40_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int nv50_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int nv50_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int g84_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int g84_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gt215_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gt215_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gf119_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gf119_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gk104_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gm107_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gm107_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gm200_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gm200_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gp100_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

int gp100_therm_new(struct nvkm_device *, int, struct nvkm_therm **);

drivers/gpu/drm/nouveau/nouveau_bo.h

+28 −0
Original line number Original line Diff line number Diff line
@@ -105,4 +105,32 @@ nvbo_kmap_obj_iovirtual(struct nouveau_bo *nvbo) 
	return ioptr;

	return ioptr;

}

}





static inline void

nouveau_bo_unmap_unpin_unref(struct nouveau_bo **pnvbo)

{

	if (*pnvbo) {

		nouveau_bo_unmap(*pnvbo);

		nouveau_bo_unpin(*pnvbo);

		nouveau_bo_ref(NULL, pnvbo);

	}

}



static inline int

nouveau_bo_new_pin_map(struct nouveau_cli *cli, u64 size, int align, u32 flags,

		       struct nouveau_bo **pnvbo)

{

	int ret = nouveau_bo_new(cli, size, align, flags,

				 0, 0, NULL, NULL, pnvbo);

	if (ret == 0) {

		ret = nouveau_bo_pin(*pnvbo, flags, true);

		if (ret == 0) {

			ret = nouveau_bo_map(*pnvbo);

			if (ret == 0)

				return ret;

			nouveau_bo_unpin(*pnvbo);

		}

		nouveau_bo_ref(NULL, pnvbo);

	}

	return ret;

}

#endif
 
#endif

drivers/gpu/drm/nouveau/nouveau_crtc.h

+0 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,6 @@ struct nouveau_crtc { 
	} cursor;

	} cursor;





	struct {

	struct {

		struct nouveau_bo *nvbo;

		int depth;

		int depth;

	} lut;

	} lut;