From: Dave Airlie <airlied@redhat.com>
Date: Tue, 15 Dec 2015 00:42:07 +0000 (+1000)
Subject: Merge branch 'exynos-drm-next' of git://git.kernel.org:/pub/scm/linux/kernel/git... 
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=870a171814da2b3230edbbfbb4b2fa1c4abb5413;p=linux-beck.git

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

- Support runtime pm
  . In case of most ARM SoC, each IP has each power domain which should be
    controlled by each IP driver using runtime pm interface. So this patch
    series makes each IP driver to control its own power domain when
    drm dpms is requested.
- Support of_graph based dt binding for DP panel.
  . This patch series adds of_graph based dt binding for DP panel.
    And also it keeps backward compatibility. This includes dt binding
    patch so I got Acked-by from Krzysztof Kozlowski who is a Exynos
    SoC maintainer and from Rob Herring who is a device tree maintainer.

- Cleanup for Exynos DRM IPP enhancement.
  . This patch series is a first step for enhancing existing IPP framework
    which will integrate existing IPP functions with DRM KMS part so that
    these can be transparent to userspace. For other portion of the patch
    series, we will have more times for the review.]

* 'exynos-drm-next' of git://git.kernel.org:/pub/scm/linux/kernel/git/daeinki/drm-exynos: (29 commits)
  drm/exynos: gem: remove old unused prototypes
  drm/exynos: fimd: fix dma burst size setting for small plane size
  drm/exynos: fix clipping when scaling is enabled
  drm/exynos: mixer: use ratio precalculated in exynos_state
  drm/exynos: add generic check for plane state
  drm/exynos: introduce exynos_drm_plane_config structure
  drm/exynos: mixer: enable video overlay plane only when VP is available
  drm/exynos: mixer: use crtc->state->adjusted_mode instead of crtc->mode
  drm/exynos: introduce exynos_drm_plane_state structure
  drm/exynos: move dma_addr attribute from exynos plane to exynos fb
  drm/exynos: exynos7-decon: remove excessive check
  drm/exynos: rotator: convert to common clock framework
  drm/exynos: gsc: add device tree support and remove usage of static mappings
  drm/exynos: gsc: fix wrong pm_runtime state
  drm/exynos: gsc: prepare and unprepare gsc clock
  ARM: dts: Use OF graph for DP to panel connection in exynos5800-peach-pi
  dt-bindings: exynos-dp: update ports node binding for panel
  drm/exynos: dp: add of_graph dt binding support for panel
  drm/exynos: decon: remove unused variables
  drm/exynos: dsi: modify a error type when getting a node failed
  ...
---

870a171814da2b3230edbbfbb4b2fa1c4abb5413
diff --cc drivers/gpu/drm/exynos/exynos_drm_plane.c
index 383ee1edb965,427aeec78a28..e668fcdbcafc
--- a/drivers/gpu/drm/exynos/exynos_drm_plane.c
+++ b/drivers/gpu/drm/exynos/exynos_drm_plane.c
@@@ -226,9 -285,13 +285,12 @@@ int exynos_plane_init(struct drm_devic
  {
  	int err;
  
- 	err = drm_universal_plane_init(dev, &exynos_plane->base, possible_crtcs,
- 				       &exynos_plane_funcs, formats, fcount,
- 				       type, NULL);
+ 	err = drm_universal_plane_init(dev, &exynos_plane->base,
+ 				       possible_crtcs,
+ 				       &exynos_plane_funcs,
+ 				       config->pixel_formats,
+ 				       config->num_pixel_formats,
 -				       config->type);
 -
++				       config->type, NULL);
  	if (err) {
  		DRM_ERROR("failed to initialize plane\n");
  		return err;