Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4ea9526b authored by Gustavo Padovan's avatar Gustavo Padovan Committed by Inki Dae
Browse files

drm/exynos: atomic phase 2: wire up state reset(), duplicate() and destroy() 



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: default avatarGustavo Padovan <gustavo.padovan@collabora.co.uk>
Reviewed-by: default avatarJoonyoung Shim <jy0922.shim@samsung.com>
Tested-by: default avatarTobias Jakobi <tjakobi@math.uni-bielefeld.de>
Signed-off-by: default avatarInki Dae <inki.dae@samsung.com>
parent 020e79de

drivers/gpu/drm/bridge/ps8622.c

+4 −0
Original line number Diff line number Diff line
@@ -32,6 +32,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
@@ -503,6 +504,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)

drivers/gpu/drm/bridge/ptn3460.c

+4 −0
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 


#include "drm_crtc.h"

#include "drm_crtc_helper.h"

#include "drm_atomic_helper.h"

#include "drm_edid.h"

#include "drmP.h"
@@ -262,6 +263,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)

drivers/gpu/drm/exynos/exynos_dp_core.c

+4 −0
Original line number Diff line number Diff line
@@ -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 "exynos_dp_core.h"
@@ -956,6 +957,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)

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+5 −0
Original line number Diff line number Diff line
@@ -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"
@@ -188,6 +190,9 @@ 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,

};



struct exynos_drm_crtc *exynos_drm_crtc_create(struct drm_device *drm_dev,

drivers/gpu/drm/exynos/exynos_drm_dpi.c

+4 −0
Original line number Diff line number Diff line
@@ -13,6 +13,7 @@ 
#include <drm/drmP.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_panel.h>

#include <drm/drm_atomic_helper.h>



#include <linux/regulator/consumer.h>
@@ -63,6 +64,9 @@ static struct drm_connector_funcs exynos_dpi_connector_funcs = { 
	.detect = exynos_dpi_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = exynos_dpi_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_dpi_get_modes(struct drm_connector *connector)