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

Browse source

A few radeon and amdgpu fixes for 4.5.  A few further fixes for the vblank
regressions in 4.4 and a couple of other minor fixes.

* 'drm-fixes-4.5' of git://people.freedesktop.org/~agd5f/linux:
  drm/amdgpu: disable direct VM updates when vm_debug is set
  amdgpu: fix NULL pointer dereference at tonga_check_states_equal
  drm/radeon/pm: adjust display configuration after powerstate
  drm/amdgpu/pm: adjust display configuration after powerstate
  drm/amdgpu/pm: add some checks for PX
  drm/amdgpu: fix locking in force performance level
  drm/amdgpu/gfx8: fix priv reg interrupt enable
  drm/amdgpu: Don't hang in amdgpu_flip_work_func on disabled crtc.
  drm/radeon: Don't hang in radeon_flip_work_func on disabled crtc. (v2)

...

This commit is contained in:

Dave Airlie 2016-02-25 08:21:33 +10:00

parent 84e54c46b2 6378076bcf

commit ad00a57ad7

7 changed files with 62 additions and 16 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

18

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

View file

3

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

View file

29

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

View file

2

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

View file

4

drivers/gpu/drm/amd/powerplay/eventmgr/eventmgr.c

View file

17

drivers/gpu/drm/radeon/radeon_display.c

View file

5

drivers/gpu/drm/radeon/radeon_pm.c

View file