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

Commit 255c35f8 authored by Liu Ying's avatar Liu Ying Committed by Philipp Zabel
Browse files

drm/imx: atomic phase 2 step 1: Wire up state ->reset, ->duplicate and ->destroy 



Wire up CRTCs', planes' and connectors' ->reset, ->duplicate and ->destroy state
hooks to use the default implementations from the atomic helper library.
The helpers track each DRM object state.

Signed-off-by: default avatarLiu Ying <gnuiyl@gmail.com>
Acked-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
parent 33f14235

drivers/gpu/drm/bridge/dw-hdmi.c

+3 −0
Original line number Diff line number Diff line
@@ -1500,6 +1500,9 @@ static const struct drm_connector_funcs dw_hdmi_connector_funcs = { 
	.detect = dw_hdmi_connector_detect,

	.destroy = dw_hdmi_connector_destroy,

	.force = dw_hdmi_connector_force,

	.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 const struct drm_connector_funcs dw_hdmi_atomic_connector_funcs = {

drivers/gpu/drm/imx/imx-drm-core.c

+2 −0
Original line number Diff line number Diff line
@@ -279,6 +279,8 @@ static int imx_drm_driver_load(struct drm_device *drm, unsigned long flags) 
		}

	}



	drm_mode_config_reset(drm);



	/*

	 * All components are now initialised, so setup the fb helper.

	 * The fb helper takes copies of key hardware information, so the

drivers/gpu/drm/imx/imx-ldb.c

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <linux/clk.h>

#include <linux/component.h>

#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_crtc_helper.h>

#include <drm/drm_of.h>
@@ -362,6 +363,9 @@ static const struct drm_connector_funcs imx_ldb_connector_funcs = { 
	.fill_modes = drm_helper_probe_single_connector_modes,

	.detect = imx_ldb_connector_detect,

	.destroy = imx_drm_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 const struct drm_connector_helper_funcs imx_ldb_connector_helper_funcs = {

drivers/gpu/drm/imx/imx-tve.c

+4 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <linux/spinlock.h>

#include <linux/videodev2.h>

#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_fb_helper.h>

#include <drm/drm_crtc_helper.h>

#include <video/imx-ipu-v3.h>
@@ -360,6 +361,9 @@ static const struct drm_connector_funcs imx_tve_connector_funcs = { 
	.fill_modes = drm_helper_probe_single_connector_modes,

	.detect = imx_tve_connector_detect,

	.destroy = imx_drm_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 const struct drm_connector_helper_funcs imx_tve_connector_helper_funcs = {

drivers/gpu/drm/imx/ipuv3-crtc.c

+4 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/device.h>

#include <linux/platform_device.h>

#include <drm/drmP.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_crtc_helper.h>

#include <linux/fb.h>

#include <linux/clk.h>
@@ -232,6 +233,9 @@ static const struct drm_crtc_funcs ipu_crtc_funcs = { 
	.set_config = drm_crtc_helper_set_config,

	.destroy = drm_crtc_cleanup,

	.page_flip = ipu_page_flip,

	.reset = drm_atomic_helper_crtc_reset,

	.atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_crtc_destroy_state,

};



static void ipu_crtc_handle_pageflip(struct ipu_crtc *ipu_crtc)