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

Commit 9d44189f authored by Thierry Reding's avatar Thierry Reding
Browse files

drm/tegra: Atomic conversion, phase 2 



Hook up the default ->reset() and ->atomic_duplicate_state() helpers.
This ensures that state objects are properly created and framebuffer
reference counts correctly maintained.

Signed-off-by: default avatarThierry Reding <treding@nvidia.com>
parent 4aa3df71

drivers/gpu/drm/tegra/dc.c

+12 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "drm.h"

#include "gem.h"



#include <drm/drm_atomic.h>

#include <drm/drm_atomic_helper.h>

#include <drm/drm_plane_helper.h>
@@ -399,6 +400,8 @@ static const struct drm_plane_funcs tegra_primary_plane_funcs = { 
	.update_plane = drm_plane_helper_update,

	.disable_plane = drm_plane_helper_disable,

	.destroy = tegra_primary_plane_destroy,

	.reset = drm_atomic_helper_plane_reset,

	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,

};
@@ -683,6 +686,8 @@ static const struct drm_plane_funcs tegra_cursor_plane_funcs = { 
	.update_plane = drm_plane_helper_update,

	.disable_plane = drm_plane_helper_disable,

	.destroy = tegra_plane_destroy,

	.reset = drm_atomic_helper_plane_reset,

	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,

};
@@ -731,6 +736,8 @@ static const struct drm_plane_funcs tegra_overlay_plane_funcs = { 
	.update_plane = drm_plane_helper_update,

	.disable_plane = drm_plane_helper_disable,

	.destroy = tegra_overlay_plane_destroy,

	.reset = drm_atomic_helper_plane_reset,

	.atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_plane_destroy_state,

};
@@ -983,6 +990,9 @@ static int tegra_dc_page_flip(struct drm_crtc *crtc, struct drm_framebuffer *fb, 
		drm_crtc_vblank_get(crtc);

	}



	if (crtc->primary->state)

		drm_atomic_set_fb_for_plane(crtc->primary->state, fb);



	tegra_dc_set_base(dc, 0, 0, fb);

	crtc->primary->fb = fb;
@@ -998,6 +1008,8 @@ static const struct drm_crtc_funcs tegra_crtc_funcs = { 
	.page_flip = tegra_dc_page_flip,

	.set_config = drm_crtc_helper_set_config,

	.destroy = tegra_dc_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,

};

drivers/gpu/drm/tegra/drm.c

+2 −0
Original line number Diff line number Diff line
@@ -77,6 +77,8 @@ static int tegra_drm_load(struct drm_device *drm, unsigned long flags) 
	if (err < 0)

		goto fbdev;



	drm_mode_config_reset(drm);



	/*

	 * We don't use the drm_irq_install() helpers provided by the DRM

	 * core, so we need to set this manually in order to allow the

drivers/gpu/drm/tegra/dsi.c

+2 −0
Original line number Diff line number Diff line
@@ -734,9 +734,11 @@ static void tegra_dsi_connector_dpms(struct drm_connector *connector, int mode) 


static const struct drm_connector_funcs tegra_dsi_connector_funcs = {

	.dpms = tegra_dsi_connector_dpms,

	.reset = drm_atomic_helper_connector_reset,

	.detect = tegra_output_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = tegra_output_connector_destroy,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};

drivers/gpu/drm/tegra/hdmi.c

+2 −0
Original line number Diff line number Diff line
@@ -779,9 +779,11 @@ static void tegra_hdmi_connector_dpms(struct drm_connector *connector, 


static const struct drm_connector_funcs tegra_hdmi_connector_funcs = {

	.dpms = tegra_hdmi_connector_dpms,

	.reset = drm_atomic_helper_connector_reset,

	.detect = tegra_output_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = tegra_output_connector_destroy,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};

drivers/gpu/drm/tegra/rgb.c

+2 −0
Original line number Diff line number Diff line
@@ -95,9 +95,11 @@ static void tegra_rgb_connector_dpms(struct drm_connector *connector, 


static const struct drm_connector_funcs tegra_rgb_connector_funcs = {

	.dpms = tegra_rgb_connector_dpms,

	.reset = drm_atomic_helper_connector_reset,

	.detect = tegra_output_connector_detect,

	.fill_modes = drm_helper_probe_single_connector_modes,

	.destroy = tegra_output_connector_destroy,

	.atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state,

	.atomic_destroy_state = drm_atomic_helper_connector_destroy_state,

};