Core Changes:

Browse source

- sync_file: Fix race in SYNC_IOC_FILE_INFO (John)
 - atomic_helper: Give up reference taken in suspend helper (Jeffy)
 
 Cc: John Einar Reitan <john.reitan@arm.com>
 Cc: Jeffy Chen <jeffy.chen@rock-chips.com>
 -----BEGIN PGP SIGNATURE-----
 
 iQEzBAABCAAdFiEEHF6rntfJ3enn8gh8cywAJXLcr3kFAlnedhgACgkQcywAJXLc
 r3lDCgf+OZv+6L1iN436SjDuNZurYKOZSWOexAoJi6an1OIs9vBsVg43HpAZTnZt
 W0pvVpyorJTO/fP9QF82ntY07DwjEmGgq7XykCViL6+w0F080rXrvzGSYIf6cTuu
 DJ/e6k0LWgpta1EFGS+sh61Gq6KOBL+MDGwcX+2HGpnLU7IYethQjt7FlC6ww3s0
 SkN5Vx1e/b4tbtIVGjrf0VbHxxT3vCdsaJRoGKzct54HceTlnTZ4C4Ah7rQFd8vM
 UhUAy6lWY8LyYtp3rKDLky8cS+HUXuUEuATTqzmtzizVLZ68TQP6elJ/Ao5qD76K
 sKSM4kikFaRSjOnRB99fBFfjJU3jew==
 =J2G/
 -----END PGP SIGNATURE-----

Merge tag 'drm-misc-fixes-2017-10-11' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes

Core Changes:
- sync_file: Fix race in SYNC_IOC_FILE_INFO (John)
- atomic_helper: Give up reference taken in suspend helper (Jeffy)

Cc: John Einar Reitan <john.reitan@arm.com>
Cc: Jeffy Chen <jeffy.chen@rock-chips.com>

* tag 'drm-misc-fixes-2017-10-11' of git://anongit.freedesktop.org/drm/drm-misc:
  sync_file: Return consistent status in SYNC_IOC_FILE_INFO
  drm/atomic: Unref duplicated drm_atomic_state in drm_atomic_helper_resume()

...

This commit is contained in:

Dave Airlie 2017-10-12 10:38:09 +10:00

parent 8a5776a5f4 f7974880cf

commit 545036a994

2 changed files with 13 additions and 5 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

17

drivers/dma-buf/sync_file.c

View file

1

drivers/gpu/drm/drm_atomic_helper.c

View file