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

Commit 3eda2f59 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

A bit more for 4.12:
- GP10B support
- GP107 acceleration support

* 'linux-4.12' of git://github.com/skeggsb/linux: (23 commits)
  drm/nouveau/gpio: enable interrupts on cards with 32 gpio lines
  drm/nouveau/gr/gp107: initial support
  drm/nouveau/core: recognise GP10B chipset
  drm/nouveau/platform: support for probing GP10B
  drm/nouveau/platform: make VDD regulator optional
  drm/nouveau/gr: support for GP10B
  drm/nouveau/ibus: add GP10B support
  drm/nouveau/mc: add GP10B support
  drm/nouveau/fb: add GP10B support
  drm/nouveau/fifo: add GP10B support
  drm/nouveau/msgqueue: support for GP10B PMU firmware
  drm/nouveau/secboot: add GP10B support
  drm/nouveau/secboot/gm20b: specify MC base address as argument
  drm/nouveau/secboot: start LS firmware in post-run hook
  drm/nouveau/secboot: let LS post_run hooks return error
  drm/nouveau/secboot: pass instance to LS firmware loaders
  drm/nouveau/secboot: allow to boot multiple falcons
  drm/nouveau/imem/gk20a: Turn instmem lock into mutex
  drm/nouveau: initial support (display-only) for GP107
  drm/nouveau/kms/nv50: fix double dma_fence_put() when destroying plane state
  ...
parents fabe2be1 99a97a8b

drivers/gpu/drm/nouveau/include/nvkm/core/msgqueue.h

+4 −8
Original line number Original line Diff line number Diff line
@@ -22,17 +22,14 @@ 




#ifndef __NVKM_CORE_MSGQUEUE_H

#ifndef __NVKM_CORE_MSGQUEUE_H

#define __NVKM_CORE_MSGQUEUE_H

#define __NVKM_CORE_MSGQUEUE_H



#include <subdev/secboot.h>

#include <core/os.h>



struct nvkm_falcon;

struct nvkm_msgqueue;

struct nvkm_msgqueue;

enum nvkm_secboot_falcon;





/* Hopefully we will never have firmware arguments larger than that... */

/* Hopefully we will never have firmware arguments larger than that... */

#define NVKM_MSGQUEUE_CMDLINE_SIZE 0x100

#define NVKM_MSGQUEUE_CMDLINE_SIZE 0x100





int nvkm_msgqueue_new(u32, struct nvkm_falcon *, struct nvkm_msgqueue **);

int nvkm_msgqueue_new(u32, struct nvkm_falcon *, const struct nvkm_secboot *,

		      struct nvkm_msgqueue **);

void nvkm_msgqueue_del(struct nvkm_msgqueue **);

void nvkm_msgqueue_del(struct nvkm_msgqueue **);

void nvkm_msgqueue_recv(struct nvkm_msgqueue *);

void nvkm_msgqueue_recv(struct nvkm_msgqueue *);

int nvkm_msgqueue_reinit(struct nvkm_msgqueue *);

int nvkm_msgqueue_reinit(struct nvkm_msgqueue *);
@@ -41,7 +38,6 @@ int nvkm_msgqueue_reinit(struct nvkm_msgqueue *); 
void nvkm_msgqueue_write_cmdline(struct nvkm_msgqueue *, void *);

void nvkm_msgqueue_write_cmdline(struct nvkm_msgqueue *, void *);





/* interface to ACR unit running on falcon (NVIDIA signed firmware) */

/* interface to ACR unit running on falcon (NVIDIA signed firmware) */

int nvkm_msgqueue_acr_boot_falcon(struct nvkm_msgqueue *,

int nvkm_msgqueue_acr_boot_falcons(struct nvkm_msgqueue *, unsigned long);

				  enum nvkm_secboot_falcon);





#endif
 
#endif

drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h

+4 −0
Original line number Original line Diff line number Diff line
@@ -42,6 +42,10 @@ struct nvkm_device_tegra_func { 
	 * Whether the chip requires a reference clock

	 * Whether the chip requires a reference clock

	 */

	 */

	bool require_ref_clk;

	bool require_ref_clk;

	/*

	 * Whether the chip requires the VDD regulator

	 */

	bool require_vdd;

};

};





int nvkm_device_tegra_new(const struct nvkm_device_tegra_func *,

int nvkm_device_tegra_new(const struct nvkm_device_tegra_func *,

drivers/gpu/drm/nouveau/include/nvkm/engine/fifo.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -68,4 +68,5 @@ int gm107_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **); 
int gm200_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm200_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm20b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gm20b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gp100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gp100_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

int gp10b_fifo_new(struct nvkm_device *, int, struct nvkm_fifo **);

#endif
 
#endif

drivers/gpu/drm/nouveau/include/nvkm/engine/gr.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -44,4 +44,6 @@ int gm200_gr_new(struct nvkm_device *, int, struct nvkm_gr **); 
int gm20b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gm20b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp100_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp100_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp102_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp102_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp107_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

int gp10b_gr_new(struct nvkm_device *, int, struct nvkm_gr **);

#endif
 
#endif

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

+1 −0
Original line number Original line Diff line number Diff line
@@ -97,6 +97,7 @@ int gm200_fb_new(struct nvkm_device *, int, struct nvkm_fb **); 
int gm20b_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

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

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

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

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

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

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





#include <subdev/bios.h>

#include <subdev/bios.h>

#include <subdev/bios/ramcfg.h>

#include <subdev/bios/ramcfg.h>