• Dave Airlie's avatar
    Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-next · 08859ede
    Dave Airlie authored
    - 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
    08859ede
nouveau_display.c 27.2 KB