Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux

Browse source

Pull drm fixes from Dave Airlie:
 "Aome amdgpu, one i915, one ttm and one hlcdc, nothing too scary.

  All seems fine for about this time"

* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
  drm/ttm: recognize ARM64 arch in ioprot handler
  drm/amdgpu/cz/dpm: properly report UVD and VCE clock levels
  drm/amdgpu/cz: implement voltage validation properly
  drm/amdgpu: add VCE harvesting instance query
  drm/amdgpu: implement VCE 3.0 harvesting support (v4)
  drm/amdgpu/dce10: Re-set VBLANK interrupt state when enabling a CRTC
  drm/amdgpu/dce11: Re-set VBLANK interrupt state when enabling a CRTC
  drm: Stop resetting connector state to unknown
  drm/i915: Use two 32bit reads for select 64bit REG_READ ioctls
  drm: atmel-hlcdc: fix vblank initial state

...

This commit is contained in:

Linus Torvalds 2015-07-24 12:37:29 -07:00

parent b497500069 02bbc4dc68

commit 077b20537c

13 changed files with 154 additions and 34 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

4

drivers/gpu/drm/amd/amdgpu/amdgpu.h

View file

1

drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c

View file

68

drivers/gpu/drm/amd/amdgpu/cz_dpm.c

View file

4

drivers/gpu/drm/amd/amdgpu/dce_v10_0.c

View file

4

drivers/gpu/drm/amd/amdgpu/dce_v11_0.c

View file

48

drivers/gpu/drm/amd/amdgpu/vce_v3_0.c

View file

1

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

View file

12

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

View file

5

drivers/gpu/drm/drm_crtc.c

View file

26

drivers/gpu/drm/i915/intel_uncore.c

View file

3

drivers/gpu/drm/ttm/ttm_bo_util.c

View file

2

include/uapi/drm/amdgpu_drm.h

View file

8

include/uapi/drm/i915_drm.h

View file