Commit 02c06dc3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'topic/nouveau-ampere-modeset-2021-01-15' of git://anongit.freedesktop.org/drm/drm 

Pull drm nouveau ampere display support from Dave Airlie:
 "Ben has requested if we can include Ampere modesetting support under
  fixes, it's for new GPUs and shouldn't affect existing hardware.

  It's a bit bigger than just adding a PCI ID, but It has no effect on
  older GPUs"

* tag 'topic/nouveau-ampere-modeset-2021-01-15' of git://anongit.freedesktop.org/drm/drm:
  drm/nouveau/disp/ga10[24]: initial support
  drm/nouveau/dmaobj/ga10[24]: initial support
  drm/nouveau/i2c/ga10[024]: initial support
  drm/nouveau/gpio/ga10[024]: initial support
  drm/nouveau/bar/ga10[024]: initial support
  drm/nouveau/mmu/ga10[024]: initial support
  drm/nouveau/timer/ga10[024]: initial support
  drm/nouveau/fb/ga10[024]: initial support
  drm/nouveau/imem/ga10[024]: initial support
  drm/nouveau/privring/ga10[024]: initial support
  drm/nouveau/mc/ga10[024]: initial support
  drm/nouveau/devinit/ga10[024]: initial support
  drm/nouveau/bios/ga10[024]: initial support
  drm/nouveau/pci/ga10[024]: initial support
  drm/nouveau/core: recognise GA10[024]
parents 5ee88057 584265df

drivers/gpu/drm/nouveau/dispnv50/Kbuild

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ nouveau-y += dispnv50/wimmc37b.o 
nouveau-y += dispnv50/wndw.o

nouveau-y += dispnv50/wndwc37e.o

nouveau-y += dispnv50/wndwc57e.o

nouveau-y += dispnv50/wndwc67e.o



nouveau-y += dispnv50/base.o

nouveau-y += dispnv50/base507c.o

drivers/gpu/drm/nouveau/dispnv50/core.c

+1 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ nv50_core_new(struct nouveau_drm *drm, struct nv50_core **pcore) 
		int version;

		int (*new)(struct nouveau_drm *, s32, struct nv50_core **);

	} cores[] = {

		{ GA102_DISP_CORE_CHANNEL_DMA, 0, corec57d_new },

		{ TU102_DISP_CORE_CHANNEL_DMA, 0, corec57d_new },

		{ GV100_DISP_CORE_CHANNEL_DMA, 0, corec37d_new },

		{ GP102_DISP_CORE_CHANNEL_DMA, 0, core917d_new },

drivers/gpu/drm/nouveau/dispnv50/curs.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ nv50_curs_new(struct nouveau_drm *drm, int head, struct nv50_wndw **pwndw) 
		int version;

		int (*new)(struct nouveau_drm *, int, s32, struct nv50_wndw **);

	} curses[] = {

		{ GA102_DISP_CURSOR, 0, cursc37a_new },

		{ TU102_DISP_CURSOR, 0, cursc37a_new },

		{ GV100_DISP_CURSOR, 0, cursc37a_new },

		{ GK104_DISP_CURSOR, 0, curs907a_new },

drivers/gpu/drm/nouveau/dispnv50/wimm.c

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ nv50_wimm_init(struct nouveau_drm *drm, struct nv50_wndw *wndw) 
		int version;

		int (*init)(struct nouveau_drm *, s32, struct nv50_wndw *);

	} wimms[] = {

		{ GA102_DISP_WINDOW_IMM_CHANNEL_DMA, 0, wimmc37b_init },

		{ TU102_DISP_WINDOW_IMM_CHANNEL_DMA, 0, wimmc37b_init },

		{ GV100_DISP_WINDOW_IMM_CHANNEL_DMA, 0, wimmc37b_init },

		{}

drivers/gpu/drm/nouveau/dispnv50/wndw.c

+1 −0
Original line number Diff line number Diff line
@@ -784,6 +784,7 @@ nv50_wndw_new(struct nouveau_drm *drm, enum drm_plane_type type, int index, 
		int (*new)(struct nouveau_drm *, enum drm_plane_type,

			   int, s32, struct nv50_wndw **);

	} wndws[] = {

		{ GA102_DISP_WINDOW_CHANNEL_DMA, 0, wndwc67e_new },

		{ TU102_DISP_WINDOW_CHANNEL_DMA, 0, wndwc57e_new },

		{ GV100_DISP_WINDOW_CHANNEL_DMA, 0, wndwc37e_new },

		{}