On 05/22/2015 05:02 AM, Gustavo Padovan wrote:
> From: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
>
> Set CRTC, planes and connectors to use the default implementations from
> the atomic helper library. The helpers will work to keep track of state
> for each DRM object.
>
> Signed-off-by: Gustavo Padovan <gustavo.padovan at collabora.co.uk>
> ---
> drivers/gpu/drm/bridge/ps8622.c | 4 ++++
> drivers/gpu/drm/bridge/ptn3460.c | 4 ++++
> drivers/gpu/drm/exynos/exynos_dp_core.c | 4 ++++
> drivers/gpu/drm/exynos/exynos_drm_crtc.c | 6 ++++++
> drivers/gpu/drm/exynos/exynos_drm_dpi.c | 4 ++++
> drivers/gpu/drm/exynos/exynos_drm_drv.c | 2 ++
> drivers/gpu/drm/exynos/exynos_drm_dsi.c | 4 ++++
> drivers/gpu/drm/exynos/exynos_drm_plane.c | 4 ++++
> drivers/gpu/drm/exynos/exynos_drm_vidi.c | 4 ++++
> drivers/gpu/drm/exynos/exynos_hdmi.c | 4 ++++
> 10 files changed, 40 insertions(+)
>
> diff --git a/drivers/gpu/drm/bridge/ps8622.c b/drivers/gpu/drm/bridge/ps8622.c
> index e895aa7..b604326 100644
> --- a/drivers/gpu/drm/bridge/ps8622.c
> +++ b/drivers/gpu/drm/bridge/ps8622.c
> @@ -31,6 +31,7 @@
> #include "drmP.h"
> #include "drm_crtc.h"
> #include "drm_crtc_helper.h"
> +#include "drm_atomic_helper.h"
>
> /* Brightness scale on the Parade chip */
> #define PS8622_MAX_BRIGHTNESS 0xff
> @@ -502,6 +503,9 @@ static const struct drm_connector_funcs
> ps8622_connector_funcs = {
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = ps8622_detect,
> .destroy = ps8622_connector_destroy,
> + .reset = drm_atomic_helper_connector_reset,
> + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> };
>
> static int ps8622_attach(struct drm_bridge *bridge)
> diff --git a/drivers/gpu/drm/bridge/ptn3460.c
> b/drivers/gpu/drm/bridge/ptn3460.c
> index 9d2f053..8ed3617 100644
> --- a/drivers/gpu/drm/bridge/ptn3460.c
> +++ b/drivers/gpu/drm/bridge/ptn3460.c
> @@ -27,6 +27,7 @@
>
> #include "drm_crtc.h"
> #include "drm_crtc_helper.h"
> +#include "drm_atomic_helper.h"
> #include "drm_edid.h"
> #include "drmP.h"
>
> @@ -263,6 +264,9 @@ static struct drm_connector_funcs ptn3460_connector_funcs
> = {
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = ptn3460_detect,
> .destroy = ptn3460_connector_destroy,
> + .reset = drm_atomic_helper_connector_reset,
> + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> };
>
> static int ptn3460_bridge_attach(struct drm_bridge *bridge)
> diff --git a/drivers/gpu/drm/exynos/exynos_dp_core.c
> b/drivers/gpu/drm/exynos/exynos_dp_core.c
> index 30feb7d..195fe60 100644
> --- a/drivers/gpu/drm/exynos/exynos_dp_core.c
> +++ b/drivers/gpu/drm/exynos/exynos_dp_core.c
> @@ -28,6 +28,7 @@
> #include <drm/drmP.h>
> #include <drm/drm_crtc.h>
> #include <drm/drm_crtc_helper.h>
> +#include <drm/drm_atomic_helper.h>
> #include <drm/drm_panel.h>
> #include <drm/bridge/ptn3460.h>
>
> @@ -957,6 +958,9 @@ static struct drm_connector_funcs
> exynos_dp_connector_funcs = {
> .fill_modes = drm_helper_probe_single_connector_modes,
> .detect = exynos_dp_detect,
> .destroy = exynos_dp_connector_destroy,
> + .reset = drm_atomic_helper_connector_reset,
> + .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,
> + .atomic_destroy_state = drm_atomic_helper_connector_destroy_state,
> };
>
> static int exynos_dp_get_modes(struct drm_connector *connector)
> diff --git a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
> b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
> index 54b74e1..dbaf161 100644
> --- a/drivers/gpu/drm/exynos/exynos_drm_crtc.c
> +++ b/drivers/gpu/drm/exynos/exynos_drm_crtc.c
> @@ -14,6 +14,8 @@
>
> #include <drm/drmP.h>
> #include <drm/drm_crtc_helper.h>
> +#include <drm/drm_atomic.h>
> +#include <drm/drm_atomic_helper.h>
>
> #include "exynos_drm_crtc.h"
> #include "exynos_drm_drv.h"
> @@ -194,8 +196,12 @@ static struct drm_crtc_funcs exynos_crtc_funcs = {
> .set_config = drm_crtc_helper_set_config,
> .page_flip = exynos_drm_crtc_page_flip,
> .destroy = exynos_drm_crtc_destroy,
> + .reset = drm_atomic_helper_crtc_reset,
> + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,
> + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,
> };
>
> +
Please remove a blank line.
Thanks.
