[git pull] drm fixes

Dave Airlie
2015-11-13T00:10:24Z

[-- Attachment #1: Type: TEXT/PLAIN, Size: 1471 bytes --]

Hi Linus,

One urgent fix for an oops under console lock in some drivers, one uapi
fix, and one revert to fix rockchip regression.

I've got the sti driver pull request that I'll send out in a minute, don't
think it'll have any issues.

Dave.

The following changes since commit a18e2fa5e670a1b84e66522b221c42875b02028a:

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (2015-11-12 15:33:11 -0800)

are available in the git repository at:

git://people.freedesktop.org/~airlied/linux drm-fixes

for you to fetch changes up to 5bad7d29a7bcffb2dbc28ea2728eeb3af13784f2:

Revert "drm/rockchip: Convert the probe function to the generic drm_of_component_probe()" (2015-11-13 09:59:46 +1000)

----------------------------------------------------------------
Dave Airlie (1):
Merge tag 'topic/drm-fixes-2015-11-11' of git://anongit.freedesktop.org/drm-intel into drm-fixes

Mark Yao (1):
Revert "drm/rockchip: Convert the probe function to the generic drm_of_component_probe()"

Tvrtko Ursulin (1):
drm: Use userspace compatible type in fourcc_mod_code macro

Ville Syrjälä (1):
drm: Don't oops in drm_calc_timestamping_constants() if drm_vblank_init() wasn't called

drivers/gpu/drm/drm_irq.c | 10 +++-
drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 81 ++++++++++++++++++++++++++---
include/uapi/drm/drm_fourcc.h | 2 +-
3 files changed, 85 insertions(+), 8 deletions(-)