From: Linus Torvalds Date: Mon, 25 Mar 2013 09:57:32 +0000 (-0700) Subject: Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux X-Git-Tag: Ubuntu-5.2.0-15.16~16033 X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=c4052ba9dad9cc86cb3a1f0f8cb032514fa414be;p=mirror_ubuntu-eoan-kernel.git Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux Pull drm fixes from Dave Airlie: "Exynos and Intel fixes. The intel fixes are fairly straightforward, mostly reverts due to bugs found. The exynos one is a big larger since they found some issues with the G2D engine and iommu interaction, and needed to verify the operations a lot better than they were previously, otherwise a user app can just crash the kernel with an iommu fault." * 'drm-fixes' of git://people.freedesktop.org/~airlied/linux: Revert "drm/i915: write backlight harder" drm/i915: don't disable the power well yet Revert "drm/i915: set TRANSCODER_EDP even earlier" drm/exynos: Check g2d cmd list for g2d restrictions drm/exynos: Add a new function to get gem buffer size drm/exynos: Deal with g2d buffer info more efficiently drm/exynos: Clean up some G2D codes for readability drm/exynos: Fix G2D core malfunctioning issue drm/exynos: clear node object type at gem unmap drm/exynos: Fix error routine to getting dma addr. drm/exynos: Replaced kzalloc & memcpy with kmemdup drm/exynos: fimd: calculate the correct address offset drm/exynos: Make mixer_check_timing static drm/exynos: modify the compatible string for exynos fimd --- c4052ba9dad9cc86cb3a1f0f8cb032514fa414be