]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 1 May 2017 18:46:01 +0000 (04:46 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 1 May 2017 18:46:01 +0000 (04:46 +1000)
commit41e11c63777b6bc259e89b6b6ed563e95a977e52
tree901e917a8183f84c039011ffec4bbcd06ac5cad0
parentc91662fa04806dfcd89639ce2ae3be384ab8a3fb
parent299f9c349d40ecd7d2b37f1c2c4af177a404eb0c
Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-next

Some nouveau regression fixes.

* 'linux-4.12' of git://github.com/skeggsb/linux:
  drm/nouveau/fb/gf100-: Fix 32 bit wraparound in new ram detection
  drm/nouveau/secboot/gm20b: fix the error return code in gm20b_secboot_tegra_read_wpr()
  drm/nouveau/kms: Increase max retries in scanout position queries.
  drm/nouveau/bios/bitP: check that table is long enough for optional pointers
  drm/nouveau/fifo/nv40: no ctxsw for pre-nv44 mpeg engine