[git,pull] drm nouveau ampere modesetting support

Pull-request

git://anongit.freedesktop.org/drm/drm tags/topic/nouveau-ampere-modeset-2021-01-15

Message

Dave Airlie Jan. 15, 2021, 4:56 a.m. UTC

Hi Linus,

As mentioned in the previous pull, 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, and I'm fine if you think we should hold it off until later.

Dave.

topic/nouveau-ampere-modeset-2021-01-15:
drm nouveau ampere display support.

This is a pull request to add display support for new Ampere hardware.

It has no effect on older GPUs.
The following changes since commit c8f6364f35f32786dd40336cfa35b9166d91b8ab:

  Merge branch '04.00-ampere-lite-fixes' of
git://github.com/skeggsb/linux into drm-fixes (2021-01-15 13:26:44
+1000)

are available in the Git repository at:

  git://anongit.freedesktop.org/drm/drm
tags/topic/nouveau-ampere-modeset-2021-01-15

for you to fetch changes up to 584265dfec70e78ce2085b82ed389f27e06fbca0:

  Merge branch '04.01-ampere-lite' of git://github.com/skeggsb/linux
into topic/nouveau-ampere-modeset (2021-01-15 14:48:18 +1000)

----------------------------------------------------------------
drm nouveau ampere display support.

This is a pull request to add display support for new Ampere hardware.

It has no effect on older GPUs.

----------------------------------------------------------------
Ben Skeggs (15):
      drm/nouveau/core: recognise GA10[024]
      drm/nouveau/pci/ga10[024]: initial support
      drm/nouveau/bios/ga10[024]: initial support
      drm/nouveau/devinit/ga10[024]: initial support
      drm/nouveau/mc/ga10[024]: initial support
      drm/nouveau/privring/ga10[024]: initial support
      drm/nouveau/imem/ga10[024]: initial support
      drm/nouveau/fb/ga10[024]: initial support
      drm/nouveau/timer/ga10[024]: initial support
      drm/nouveau/mmu/ga10[024]: initial support
      drm/nouveau/bar/ga10[024]: initial support
      drm/nouveau/gpio/ga10[024]: initial support
      drm/nouveau/i2c/ga10[024]: initial support
      drm/nouveau/dmaobj/ga10[24]: initial support
      drm/nouveau/disp/ga10[24]: initial support

Dave Airlie (1):
      Merge branch '04.01-ampere-lite' of
git://github.com/skeggsb/linux into topic/nouveau-ampere-modeset

 drivers/gpu/drm/nouveau/dispnv50/Kbuild            |   1 +
 drivers/gpu/drm/nouveau/dispnv50/core.c            |   1 +
 drivers/gpu/drm/nouveau/dispnv50/curs.c            |   1 +
 drivers/gpu/drm/nouveau/dispnv50/wimm.c            |   1 +
 drivers/gpu/drm/nouveau/dispnv50/wndw.c            |   1 +
 drivers/gpu/drm/nouveau/dispnv50/wndw.h            |   8 ++
 drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c        |  10 +-
 drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c        | 106 ++++++++++++++++
 drivers/gpu/drm/nouveau/include/nvif/cl0080.h      |   1 +
 drivers/gpu/drm/nouveau/include/nvif/class.h       |   5 +
 drivers/gpu/drm/nouveau/include/nvkm/core/device.h |   1 +
 drivers/gpu/drm/nouveau/include/nvkm/engine/disp.h |   1 +
 .../gpu/drm/nouveau/include/nvkm/subdev/devinit.h  |   1 +
 drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h   |   2 +
 drivers/gpu/drm/nouveau/include/nvkm/subdev/gpio.h |   1 +
 drivers/gpu/drm/nouveau/include/nvkm/subdev/mc.h   |   1 +
 drivers/gpu/drm/nouveau/nouveau_backlight.c        |   1 +
 drivers/gpu/drm/nouveau/nvif/disp.c                |   1 +
 drivers/gpu/drm/nouveau/nvkm/engine/device/base.c  |  75 ++++++++++-
 drivers/gpu/drm/nouveau/nvkm/engine/device/user.c  |   1 +
 drivers/gpu/drm/nouveau/nvkm/engine/disp/Kbuild    |   3 +
 drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c      |  33 ++++-
 drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c   |  46 +++++++
 drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h     |   4 +
 drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.h    |   2 +
 .../gpu/drm/nouveau/nvkm/engine/disp/rootga102.c   |  52 ++++++++
 .../gpu/drm/nouveau/nvkm/engine/disp/rootnv50.h    |   1 +
 .../gpu/drm/nouveau/nvkm/engine/disp/sorga102.c    | 140 +++++++++++++++++++++
 .../gpu/drm/nouveau/nvkm/engine/disp/sortu102.c    |   2 +-
 drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c   |   2 +-
 .../gpu/drm/nouveau/nvkm/subdev/bios/shadowramin.c |   3 +
 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/Kbuild |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/devinit/ga100.c    |  76 +++++++++++
 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h |   1 +
 .../gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c    |   2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/Kbuild      |   3 +
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c     |  40 ++++++
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c     |  40 ++++++
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c     |   2 +-
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h      |   2 +
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ram.h       |   1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramga102.c  |  40 ++++++
 drivers/gpu/drm/nouveau/nvkm/subdev/gpio/Kbuild    |   1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/gpio/ga102.c   | 118 +++++++++++++++++
 drivers/gpu/drm/nouveau/nvkm/subdev/mc/Kbuild      |   1 +
 drivers/gpu/drm/nouveau/nvkm/subdev/mc/ga100.c     |  74 +++++++++++
 46 files changed, 892 insertions(+), 18 deletions(-)
 create mode 100644 drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/rootga102.c
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/disp/sorga102.c
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/devinit/ga100.c
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/fb/ramga102.c
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/gpio/ga102.c
 create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/mc/ga100.c

Comments

[e-mail] Jan. 15, 2021, 6:58 p.m. UTC | #1

The pull request you sent on Fri, 15 Jan 2021 14:56:04 +1000:

> git://anongit.freedesktop.org/drm/drm tags/topic/nouveau-ampere-modeset-2021-01-15

has been merged into torvalds/linux.git:
https://git.kernel.org/torvalds/c/02c06dc3750be486e143cd553c13f02978e39b14

Thank you!