Commit 02c4fb02 authored by Dave Airlie's avatar Dave Airlie
Browse files

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



Mostly just initial support for Turing TU104/TU106 chipsets.  Support
for TU102 is missing as I don't yet have HW, but it should be trivial
to add in later in the merge window (in theory).

It's a bit of a rough first pass that'll get improved in future
releases as a finish figuring out some of the other HW changes, but
it's good enough as it stands for modesetting and suspend/resume etc.

Acceleration bring-up is incomplete due to NVIDIA not yet having
provided FW images for me to use, though command submission and copy
engines are functional already.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
From: Ben Skeggs <skeggsb@gmail.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv7KmfcQqZcx+wh_1UKjTovp4PH_5UVMfeyxUu-M9WLZfw@mail.gmail.com
parents 29a1da27 8ff01abc

drivers/gpu/drm/nouveau/dispnv04/disp.c

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ nv04_display_create(struct drm_device *dev) 
	for (i = 0; i < dcb->entries; i++) {

		struct dcb_output *dcbent = &dcb->entry[i];



		connector = nouveau_connector_create(dev, dcbent->connector);

		connector = nouveau_connector_create(dev, dcbent);

		if (IS_ERR(connector))

			continue;

drivers/gpu/drm/nouveau/dispnv50/Kbuild

+3 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ nouveau-y += dispnv50/core827d.o 
nouveau-y += dispnv50/core907d.o

nouveau-y += dispnv50/core917d.o

nouveau-y += dispnv50/corec37d.o

nouveau-y += dispnv50/corec57d.o



nouveau-y += dispnv50/dac507d.o

nouveau-y += dispnv50/dac907d.o
@@ -23,12 +24,14 @@ nouveau-y += dispnv50/head827d.o 
nouveau-y += dispnv50/head907d.o

nouveau-y += dispnv50/head917d.o

nouveau-y += dispnv50/headc37d.o

nouveau-y += dispnv50/headc57d.o



nouveau-y += dispnv50/wimm.o

nouveau-y += dispnv50/wimmc37b.o



nouveau-y += dispnv50/wndw.o

nouveau-y += dispnv50/wndwc37e.o

nouveau-y += dispnv50/wndwc57e.o



nouveau-y += dispnv50/base.o

nouveau-y += dispnv50/base507c.o

drivers/gpu/drm/nouveau/dispnv50/atom.h

+5 −2
Original line number Diff line number Diff line
@@ -54,9 +54,10 @@ struct nv50_head_atom { 
		u64 offset:40;

		u8 buffer:1;

		u8 mode:4;

		u8 size:2;

		u16 size:11;

		u8 range:2;

		u8 output_mode:2;

		void (*load)(struct drm_color_lut *, int size, void __iomem *);

	} olut;



	struct {
@@ -169,9 +170,11 @@ struct nv50_wndw_atom { 
			u8  buffer:1;

			u8  enable:2;

			u8  mode:4;

			u8  size:2;

			u16 size:11;

			u8  range:2;

			u8  output_mode:2;

			void (*load)(struct drm_color_lut *, int size,

				     void __iomem *);

		} i;

	} xlut;

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

+1 −0
Original line number Diff line number Diff line
@@ -80,6 +80,7 @@ base907c_ilut(struct nv50_wndw *wndw, struct nv50_wndw_atom *asyw) 
{

	asyw->xlut.i.mode = 7;

	asyw->xlut.i.enable = 2;

	asyw->xlut.i.load = head907d_olut_load;

}



const struct nv50_wndw_func

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[] = {

		{ TU104_DISP_CORE_CHANNEL_DMA, 0, corec57d_new },

		{ GV100_DISP_CORE_CHANNEL_DMA, 0, corec37d_new },

		{ GP102_DISP_CORE_CHANNEL_DMA, 0, core917d_new },

		{ GP100_DISP_CORE_CHANNEL_DMA, 0, core917d_new },

CRA Git | Maintained and supported by SUSTech CRA and CCSE