diff options
| author | Dave Airlie <airlied@redhat.com> | 2018-01-19 05:12:31 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2018-01-19 05:12:31 +0300 |
| commit | ee62249d85a3cc2e5507f6b8b64669ac0acbdb88 (patch) | |
| tree | a7ef1889d7690c65dde1eb8e3761a6c5e2dbf9ac /drivers/gpu/drm/i915/intel_display.c | |
| parent | 75f195f46f27a2524b249b95e6f241cd13c7e549 (diff) | |
| parent | 2ffa64eba94fc8cc23d431cbec7365f3f07ff0ae (diff) | |
| download | linux-ee62249d85a3cc2e5507f6b8b64669ac0acbdb88.tar.xz | |
Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
Thought I'd try my luck getting one more in:
- Two fixes for Tegra (one is to common code, but our userspace doesn't hit it).
- One for NV5x-class MCPs
* 'linux-4.15' of git://github.com/skeggsb/linux:
drm/nouveau/mmu/mcp77: fix regressions in stolen memory handling
drm/nouveau/bar/gk20a: Avoid bar teardown during init
drm/nouveau/drm/nouveau: Pass the proper arguments to nvif_object_map_handle()
Diffstat (limited to 'drivers/gpu/drm/i915/intel_display.c')
0 files changed, 0 insertions, 0 deletions