Hi Dave, Looks like there's a trivial conflict with the latest drm-next and the pull request below. It can be solved by just deleting the dev_load and dev_unload functions. Tomi On 09/01/17 11:45, Tomi Valkeinen wrote: > Hi Dave, > > Please pull omapdrm changes for 4.11. > > Tomi > > The following changes since commit 2cf026ae85c42f253feb9f420d1b4bc99bd5503d: > > Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-next (2016-12-13 14:29:05 +1000) > > are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux.git tags/omapdrm-4.11 > > for you to fetch changes up to 42f7f3c4811b3149253ecf2e133832c969884466: > > drm/omap: panel-sony-acx565akm.c: Add MODULE_ALIAS (2017-01-04 14:08:14 +0200) > > ---------------------------------------------------------------- > omapdrm changes for 4.11 > > The main change here is the IRQ code cleanup, which gives us properly working > vblank counts and timestamps. We also get much less calls to runtime PM gets & > puts. > > ---------------------------------------------------------------- > H. Nikolaus Schaller (1): > drm/omap: dsi: fix compile errors when enabling debug prints > > Jarkko Nikula (1): > drm/omap: panel-sony-acx565akm.c: Add MODULE_ALIAS > > Laurent Pinchart (24): > drm: Kbuild: add omap_drm.h to the installed headers > drm: omapdrm: fb: Limit number of planes per framebuffer to two > drm: omapdrm: fb: Use format information provided by the DRM core > drm: omapdrm: fb: Simplify objects lookup when creating framebuffer > drm: omapdrm: fb: Simplify mode command checks when creating framebuffer > drm: omapdrm: fb: Turn framebuffer creation error messages into debug > drm: omapdrm: Handle FIFO underflow IRQs internally > drm: omapdrm: Handle CRTC error IRQs directly > drm: omapdrm: Handle OCP error IRQ directly > drm: omapdrm: Replace DSS manager state check with omapdrm CRTC state > drm: omapdrm: Let the DRM core skip plane commit on inactive CRTCs > drm: omapdrm: Check the CRTC software state at enable/disable time > drm: omapdrm: Prevent processing the same event multiple times > drm: omapdrm: Use a spinlock to protect the CRTC pending flag > drm: omapdrm: Keep vblank interrupt enabled while CRTC is active > drm: omapdrm: Don't expose the omap_irq_(un)register() functions > drm: omapdrm: Remove unused parameter from omap_drm_irq handler > drm: omapdrm: Don't call DISPC power handling in IRQ wait functions > drm: omapdrm: Inline the pipe2vbl function > drm: omapdrm: Simplify IRQ wait implementation > drm: omapdrm: Remove global variables > drm: omapdrm: Use sizeof(*var) instead of sizeof(type) for structures > drm: Move vblank cleanup from unregister to release > drm: omapdrm: Perform initialization/cleanup at probe/remove time > > Tomi Valkeinen (1): > Merge omapdrm work from Laurent > > drivers/gpu/drm/drm_drv.c | 4 +- > drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c | 2 +- > .../drm/omapdrm/displays/panel-sony-acx565akm.c | 1 + > drivers/gpu/drm/omapdrm/dss/dispc.c | 27 ++- > drivers/gpu/drm/omapdrm/dss/dsi.c | 18 +- > drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c | 3 +- > drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - > drivers/gpu/drm/omapdrm/omap_connector.c | 6 +- > drivers/gpu/drm/omapdrm/omap_crtc.c | 154 ++++++------- > drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 4 +- > drivers/gpu/drm/omapdrm/omap_drv.c | 218 +++++++++---------- > drivers/gpu/drm/omapdrm/omap_drv.h | 51 +---- > drivers/gpu/drm/omapdrm/omap_encoder.c | 2 +- > drivers/gpu/drm/omapdrm/omap_fb.c | 164 +++++++------- > drivers/gpu/drm/omapdrm/omap_irq.c | 242 +++++++++++---------- > drivers/gpu/drm/omapdrm/omap_plane.c | 24 -- > include/uapi/drm/Kbuild | 1 + > 17 files changed, 441 insertions(+), 481 deletions(-) >
Attachment:
signature.asc
Description: OpenPGP digital signature
_______________________________________________ dri-devel mailing list dri-devel@xxxxxxxxxxxxxxxxxxxxx https://lists.freedesktop.org/mailman/listinfo/dri-devel
