Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

Browse source

This pull request includes,
    - Code refactoring on HDMI DDC and PHY.
    - Regression fixup on deadlock issue with G2D pm integration.
    - Fixup on page fault issue with wait_for_vblank mechianism specific to Exynos drm.
    - And some cleanups.

* 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: g2d: simplify g2d_free_runqueue_node()
  drm/exynos: g2d: use autosuspend mode for PM runtime
  drm/exynos: g2d: wait for engine to finish
  drm/exynos: g2d: remove runqueue nodes in g2d_{close,remove}()
  drm/exynos: g2d: move PM management to runqueue worker
  Revert "drm/exynos: g2d: fix system and runtime pm integration"
  drm/exynos: use drm core to handle page-flip event
  drm/exynos: mark exynos_dp_crtc_clock_enable() static
  drm/exynos/fimd: add clock rate checking
  drm/exynos: fix pending update handling
  drm/exynos/vidi: use timer for vblanks instead of sleeping worker
  drm/exynos: g2d: beautify probing message
  drm/exynos: mixer: simplify loop in vp_win_reset()
  drm/exynos: mixer: convert booleans to flags in mixer context
  gpu: drm: exynos_hdmi: Remove duplicate initialization of regulator bulk consumer
  gpu: drm: exynos_hdmi: Move PHY logic into single function
  gpu: drm: exynos_hdmi: Move DDC logic into single function

...

This commit is contained in:

Dave Airlie 2016-10-04 12:43:31 +10:00

parent 28a396545a c046279646

commit f5dce66593

12 changed files with 352 additions and 326 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

11

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

View file

9

drivers/gpu/drm/exynos/exynos7_drm_decon.c

View file

2

drivers/gpu/drm/exynos/exynos_dp.c

View file

58

drivers/gpu/drm/exynos/exynos_drm_crtc.c

View file

44

drivers/gpu/drm/exynos/exynos_drm_drv.c

View file

4

drivers/gpu/drm/exynos/exynos_drm_drv.h

View file

56

drivers/gpu/drm/exynos/exynos_drm_fimd.c

View file

241

drivers/gpu/drm/exynos/exynos_drm_g2d.c

View file

1

drivers/gpu/drm/exynos/exynos_drm_plane.c

View file

76

drivers/gpu/drm/exynos/exynos_drm_vidi.c

View file

112

drivers/gpu/drm/exynos/exynos_hdmi.c

View file

68

drivers/gpu/drm/exynos/exynos_mixer.c

View file