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

Commit 08859ede authored by Dave Airlie's avatar Dave Airlie
Browse files

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

- GP102/GP104 devinit (suspend/resume, optimus) hang fix
- GP102/GP104 hardware cursor fix
- Fix for a regression on some non-MST monitors that was caused by the
MST work
- Workaround for certain laptops where ACPI sends display hotkey presses
on a modeset, causing gnome-settings-daemon to go into a continuous loop

* 'linux-4.10' of git://github.com/skeggsb/linux:
  drm/nouveau/disp/gp102: rename from gp104
  drm/nouveau/ce/gp102: rename from gp104
  drm/nouveau/fb/gp102: rename from gp104
  drm/nouveau/disp/gp102: fix cursor/overlay immediate channel indices
  drm/nouveau/disp/nv50-: specify ctrl/user separately when constructing classes
  drm/nouveau/disp/nv50-: split chid into chid.ctrl and chid.user
  drm/nouveau: Intercept ACPI_VIDEO_NOTIFY_PROBE
  drm/nouveau/devinit/gm200: drop pmu reset sequence
  drm/nouveau/devinit/gm200: replace while loops with PTIMER-based timeout loops
  drm/nouveau/pmu/gp102: initial implementation
  drm/nouveau/pmu/gp100: initial implementation
  drm/nouveau/pmu: execute reset before running devinit
  drm/nouveau/pmu: move ucode handling into gt215 implementation
  drm/nouveau/core: initial support for GP102
  drm/nouveau/device/pci: fix oops if no mmu subdev present
  drm/nouveau/kms/nv50: avoid touching DP_MSTM_CTRL if !DP_MST_CAP
parents b7c0e47d ed828666

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

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
#define GM107_DISP                                    /* cl5070.h */ 0x00009470

#define GM200_DISP                                    /* cl5070.h */ 0x00009570

#define GP100_DISP                                    /* cl5070.h */ 0x00009770

#define GP104_DISP                                    /* cl5070.h */ 0x00009870

#define GP102_DISP                                    /* cl5070.h */ 0x00009870



#define NV31_MPEG                                                    0x00003174

#define G82_MPEG                                                     0x00008274
@@ -90,7 +90,7 @@ 
#define GM107_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000947d

#define GM200_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000957d

#define GP100_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000977d

#define GP104_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000987d

#define GP102_DISP_CORE_CHANNEL_DMA                   /* cl507d.h */ 0x0000987d



#define NV50_DISP_OVERLAY_CHANNEL_DMA                 /* cl507e.h */ 0x0000507e

#define G82_DISP_OVERLAY_CHANNEL_DMA                  /* cl507e.h */ 0x0000827e

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

+1 −1
Original line number Diff line number Diff line
@@ -8,5 +8,5 @@ int gk104_ce_new(struct nvkm_device *, int, struct nvkm_engine **); 
int gm107_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gm200_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gp100_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gp104_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

int gp102_ce_new(struct nvkm_device *, int, struct nvkm_engine **);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -33,5 +33,5 @@ int gk110_disp_new(struct nvkm_device *, int, struct nvkm_disp **); 
int gm107_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gm200_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gp100_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gp104_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

int gp102_disp_new(struct nvkm_device *, int, struct nvkm_disp **);

#endif

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

+1 −1
Original line number Diff line number Diff line
@@ -95,7 +95,7 @@ int gm107_fb_new(struct nvkm_device *, int, struct nvkm_fb **); 
int gm200_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 gp104_fb_new(struct nvkm_device *, int, struct nvkm_fb **);

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



#include <subdev/bios.h>

#include <subdev/bios/ramcfg.h>

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

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,8 @@ int gk110_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **); 
int gk208_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);

int gk20a_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);

int gm107_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);

int gp100_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);

int gp102_pmu_new(struct nvkm_device *, int, struct nvkm_pmu **);



/* interface to MEMX process running on PMU */

struct nvkm_memx;