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

Commit 665ae581 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next 

- gk20a iommu support
- gm107 graphics support without needing proprietary ucode
- various random fixes
- more gm20x bring-up, fifo/ce are ok, gr is mostly complete with the
exception of ctxsw ucode.. nvidia aren't playing nice yet so there's
not much more that can be done at this point...

I spent a lot of time trying to find a viable way of doing gr ctxsw
without signed firmware, but the "security" restrictions on the
fecs/gpccs falcons are excessive and go beyond what'd be necessary to
protect the host from malicious firmware.  This newer nvidia hw is
VERY open-source unfriendly.

I have some experimental host-based ctxsw work that could be a viable
(albeit unsatisfactory and slow) workaround in the meantime, but it
needs some more work and i'd like to get the 3d driver working
properly before i commit to pushing it.

* 'linux-4.1' of git://anongit.freedesktop.org/git/nouveau/linux-2.6: (40 commits)
  drm/nouveau/bios: fix fetching from acpi on certain systems
  drm/nouveau/gr/gm206: initial init+ctx code
  drm/nouveau/ce/gm206: enable support via gm204 code
  drm/nouveau/fifo/gm206: enable support via gm204 code
  drm/nouveau/gr/gm204: initial init+ctx code
  drm/nouveau: support for buffer moves via MaxwellDmaCopyA
  drm/nouveau/ce/gm204: initial support
  drm/nouveau: add support for gm20x fifo channels
  drm/nouveau/fifo/gm204: initial support
  drm/nouveau/gr/gk104-: prevent reading non-existent regs in intr handler
  drm/nouveau/gr/gm107: very slightly demagic part of attrib cb setup
  drm/nouveau/gr/gk104-: correct crop/zrop num_active_fbps setting
  drm/nouveau/gr/gf100-: add symbolic names for classes
  drm/nouveau/gr/gm107: support tpc "strand" ctxsw in gpccs ucode
  drm/nouveau/gr/gf100-: support mmio access with gpc offset from gpccs ucode
  drm/nouveau/gr: fix engine name, cosmetic search+replace mistake
  drm/nouveau/pmu/gk20a: add some missing statics
  drm/nouveau/platform: fix probe error path
  drm/nouveau/platform: release IOMMU's mm upon exit
  drm/nouveau/gr/gk104-gk20a: call pmu to disable any power-gating before ctor()
  ...
parents 1d2add28 4195f406

drivers/gpu/drm/nouveau/include/nvif/class.h

+10 −0
Original line number Diff line number Diff line
@@ -12,6 +12,13 @@ 
#define NV_DMA_TO_MEMORY                                             0x00000003

#define NV_DMA_IN_MEMORY                                             0x0000003d



#define FERMI_TWOD_A                                                 0x0000902d



#define FERMI_MEMORY_TO_MEMORY_FORMAT_A                              0x0000903d



#define KEPLER_INLINE_TO_MEMORY_A                                    0x0000a040

#define KEPLER_INLINE_TO_MEMORY_B                                    0x0000a140



#define NV04_DISP                                                    0x00000046



#define NV03_CHANNEL_DMA                                             0x0000006b
@@ -25,6 +32,7 @@ 
#define G82_CHANNEL_GPFIFO                                           0x0000826f

#define FERMI_CHANNEL_GPFIFO                                         0x0000906f

#define KEPLER_CHANNEL_GPFIFO_A                                      0x0000a06f

#define MAXWELL_CHANNEL_GPFIFO_A                                     0x0000b06f



#define NV50_DISP                                                    0x00005070

#define G82_DISP                                                     0x00008270
@@ -84,6 +92,7 @@ 
#define KEPLER_C                                                     0x0000a297



#define MAXWELL_A                                                    0x0000b097

#define MAXWELL_B                                                    0x0000b197



#define FERMI_COMPUTE_A                                              0x000090c0

#define FERMI_COMPUTE_B                                              0x000091c0
@@ -92,6 +101,7 @@ 
#define KEPLER_COMPUTE_B                                             0x0000a1c0



#define MAXWELL_COMPUTE_A                                            0x0000b0c0

#define MAXWELL_COMPUTE_B                                            0x0000b1c0





/*******************************************************************************

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

+3 −0
Original line number Diff line number Diff line
@@ -10,4 +10,7 @@ extern struct nvkm_oclass gf100_ce1_oclass; 
extern struct nvkm_oclass gk104_ce0_oclass;

extern struct nvkm_oclass gk104_ce1_oclass;

extern struct nvkm_oclass gk104_ce2_oclass;

extern struct nvkm_oclass gm204_ce0_oclass;

extern struct nvkm_oclass gm204_ce1_oclass;

extern struct nvkm_oclass gm204_ce2_oclass;

#endif

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

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ extern struct nvkm_oclass *gf100_fifo_oclass; 
extern struct nvkm_oclass *gk104_fifo_oclass;

extern struct nvkm_oclass *gk20a_fifo_oclass;

extern struct nvkm_oclass *gk208_fifo_oclass;

extern struct nvkm_oclass *gm204_fifo_oclass;



int  nvkm_fifo_uevent_ctor(struct nvkm_object *, void *, u32,

			   struct nvkm_notify *);

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

+3 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ nvkm_gr(void *obj) 
}



#define nvkm_gr_create(p,e,c,y,d)                                        \

	nvkm_engine_create((p), (e), (c), (y), "PGR", "graphics", (d))

	nvkm_engine_create((p), (e), (c), (y), "PGRAPH", "graphics", (d))

#define nvkm_gr_destroy(d)                                               \

	nvkm_engine_destroy(&(d)->base)

#define nvkm_gr_init(d)                                                  \
@@ -72,6 +72,8 @@ extern struct nvkm_oclass *gk110_gr_oclass; 
extern struct nvkm_oclass *gk110b_gr_oclass;

extern struct nvkm_oclass *gk208_gr_oclass;

extern struct nvkm_oclass *gm107_gr_oclass;

extern struct nvkm_oclass *gm204_gr_oclass;

extern struct nvkm_oclass *gm206_gr_oclass;



#include <core/enum.h>

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

+1 −0
Original line number Diff line number Diff line
@@ -45,4 +45,5 @@ nvkm_instmem(void *obj) 
extern struct nvkm_oclass *nv04_instmem_oclass;

extern struct nvkm_oclass *nv40_instmem_oclass;

extern struct nvkm_oclass *nv50_instmem_oclass;

extern struct nvkm_oclass *gk20a_instmem_oclass;

#endif