diff options
| author | Dave Airlie <airlied@redhat.com> | 2015-11-28 06:50:34 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2015-11-28 06:50:34 +1000 |
| commit | 8c14f72b57570d71afda03c5c51b06f0b4af4367 (patch) | |
| tree | 09a6098c9539a29d2bba40387aaef53acf8fb20b /drivers/block | |
| parent | 2f1371614a5d49428846b90673a89036518dffad (diff) | |
| parent | ef0e9f551899d10834da3d262f20f84db61d64b3 (diff) | |
Merge branch 'linux-4.4' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-fixes
Ben Skeggs wrote:
A couple of regression fixes, some more boards whitelisted for a hw bug
workaround, gr/ucode fixes for hangs a user is seeing.
The changes look larger than they actually are due to the ucode binaries
(*.fucN.h) being regenerated.
* 'linux-4.4' of git://anongit.freedesktop.org/git/nouveau/linux-2.6:
drm/nouveau/volt/pwm/gk104: fix an off-by-one resulting in the voltage not being set
drm/nouveau/nvif: allow userspace access to its own client object
drm/nouveau/gr/gf100-: fix oops when calling zbc methods
drm/nouveau/gr/gf117-: assume no PPC if NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK is zero
drm/nouveau/gr/gf117-: read NV_PGRAPH_GPC_GPM_PD_PES_TPC_ID_MASK from correct GPC
drm/nouveau/gr/gf100-: split out per-gpc address calculation macro
drm/nouveau/bios: return actual size of the buffer retrieved via _ROM
drm/nouveau/instmem: protect instobj list with a spinlock
drm/nouveau/pci: enable c800 magic for some unknown Samsung laptop
drm/nouveau/pci: enable c800 magic for Clevo P157SM
Diffstat (limited to 'drivers/block')
0 files changed, 0 insertions, 0 deletions