diff options
| author | Dave Airlie <airlied@redhat.com> | 2016-03-09 14:19:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2016-03-09 14:19:14 +1000 |
| commit | 913830147ace0a31ac0128726b29153d570c9985 (patch) | |
| tree | b066c70b512b8dc007c279812b3663dc45f15aaa /drivers/gpu/drm/i915/intel_mocs.h | |
| parent | dad82ea3ef4b9dc97ca5ec718abc6b0986f1aaaf (diff) | |
| parent | d74e766e1916d0e09b86e4b5b9d0f819628fd546 (diff) | |
Merge branch 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux into drm-fixes
radeon and amdgpu fixes for 4.5. Three regression fixes and
some fixups for the error handling in the vblank regression fixes
from earlier.
* 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux:
Revert "drm/radeon/pm: adjust display configuration after powerstate"
drm/amdgpu/dp: add back special handling for NUTMEG
drm/radeon/dp: add back special handling for NUTMEG
drm/radeon: Fix error handling in radeon_flip_work_func.
drm/amdgpu: Fix error handling in amdgpu_flip_work_func.
Diffstat (limited to 'drivers/gpu/drm/i915/intel_mocs.h')
0 files changed, 0 insertions, 0 deletions