From: Dave Airlie Date: Fri, 12 Sep 2014 21:01:49 +0000 (+1000) Subject: Merge tag 'topic/drm-header-rework-2014-09-12' of git://anongit.freedesktop.org/drm... X-Git-Tag: v4.14-rc1~6653^2~38 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=98faa78ce7f1f986e11e7805d31b409782a6d2d4;p=platform%2Fkernel%2Flinux-rpi.git Merge tag 'topic/drm-header-rework-2014-09-12' of git://anongit.freedesktop.org/drm-intel into drm-next So here's the header cleanup, rebased on top of drm-next. Two new header files are created here: - drivers/gpu/drm/drm_internal.h for non-legacy drm.ko private declarations. - include/drm/drm_legacy.h for legacy interfaces used by non-kms drivers. And of course lots fo stuff gets shuffled into the already existing drivers/gpu/drm/drm_legacy.h for drm.ko internal stuff. topic branch smoke-tested in drm-intel-nightly for a bit. And the 0day tester also worked through it (and found a few places I didn't add a static to functions). * tag 'topic/drm-header-rework-2014-09-12' of git://anongit.freedesktop.org/drm-intel: drm: Move DRM_MAGIC_HASH_ORDER into drm_drv.c drm: Move drm_class to drm_internal.h drm: Move LOCK_TEST_WITH_RETURN to drm: Move legacy buffer structures to drm: Move drm_memory.c map support declarations to drm: Purge ioctl forward declarations from drmP.h drm: unexport drm_global_mutex drm: Move piles of functions from drmP.h to drm_internal.h drm: Move vblank related module options into drm_irq.c drm: Drop drm_sysfs_class from drmP.h drm: Move __drm_pci_free to drm_legacy.h drm: Create drm legacy driver header drm: Move drm_legacy_vma_flush into drm_legacy.h drm: Move sg functions into drm_legacy.h drm: Move dma functions into drm_legacy.h --- 98faa78ce7f1f986e11e7805d31b409782a6d2d4