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

Commit ffdbb82c authored by Fabien Dessenne's avatar Fabien Dessenne Committed by Vincent Abriou
Browse files

drm/sti: use vtg array instead of vtg_main/aux 



This is more generic and more consistent with the other members of the
sti_compositor struct.

Signed-off-by: default avatarFabien Dessenne <fabien.dessenne@st.com>
Acked-by: default avatarVincent Abriou <vincent.abriou@st.com>
parent ae217850

drivers/gpu/drm/sti/sti_compositor.c

+2 −2
Original line number Diff line number Diff line
@@ -268,12 +268,12 @@ static int sti_compositor_probe(struct platform_device *pdev) 


	vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 0);

	if (vtg_np)

		compo->vtg_main = of_vtg_find(vtg_np);

		compo->vtg[STI_MIXER_MAIN] = of_vtg_find(vtg_np);

	of_node_put(vtg_np);



	vtg_np = of_parse_phandle(pdev->dev.of_node, "st,vtg", 1);

	if (vtg_np)

		compo->vtg_aux = of_vtg_find(vtg_np);

		compo->vtg[STI_MIXER_AUX] = of_vtg_find(vtg_np);

	of_node_put(vtg_np);



	platform_set_drvdata(pdev, compo);

drivers/gpu/drm/sti/sti_compositor.h

+2 −4
Original line number Diff line number Diff line
@@ -60,8 +60,7 @@ struct sti_compositor_data { 
 * @rst_aux: reset control of the aux path

 * @mixer: array of mixers

 * @vid: array of vids

 * @vtg_main: vtg for main data path

 * @vtg_aux: vtg for auxillary data path

 * @vtg: array of vtgs

 * @vtg_vblank_nb: array of callbacks for VTG VSYNC notification

 */

struct sti_compositor {
@@ -76,8 +75,7 @@ struct sti_compositor { 
	struct reset_control *rst_aux;

	struct sti_mixer *mixer[STI_MAX_MIXER];

	struct sti_vid *vid[STI_MAX_VID];

	struct sti_vtg *vtg_main;

	struct sti_vtg *vtg_aux;

	struct sti_vtg *vtg[STI_MAX_MIXER];

	struct notifier_block vtg_vblank_nb[STI_MAX_MIXER];

};

drivers/gpu/drm/sti/sti_crtc.c

+5 −7
Original line number Diff line number Diff line
@@ -86,8 +86,7 @@ sti_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode) 
		goto pix_error;

	}



	sti_vtg_set_config(mixer->id == STI_MIXER_MAIN ?

			compo->vtg_main : compo->vtg_aux, &crtc->mode);

	sti_vtg_set_config(compo->vtg[mixer->id], &crtc->mode);



	if (sti_mixer_active_video_area(mixer, &crtc->mode)) {

		DRM_ERROR("Can't set active video area\n");
@@ -297,12 +296,11 @@ int sti_crtc_enable_vblank(struct drm_device *dev, unsigned int pipe) 
	struct sti_compositor *compo = dev_priv->compo;

	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb[pipe];

	struct drm_crtc *crtc = &compo->mixer[pipe]->drm_crtc;

	struct sti_vtg *vtg = compo->vtg[pipe];



	DRM_DEBUG_DRIVER("\n");



	if (sti_vtg_register_client(pipe == STI_MIXER_MAIN ?

			compo->vtg_main : compo->vtg_aux,

			vtg_vblank_nb, crtc)) {

	if (sti_vtg_register_client(vtg, vtg_vblank_nb, crtc)) {

		DRM_ERROR("Cannot register VTG notifier\n");

		return -EINVAL;

	}
@@ -316,11 +314,11 @@ void sti_crtc_disable_vblank(struct drm_device *drm_dev, unsigned int pipe) 
	struct sti_compositor *compo = priv->compo;

	struct notifier_block *vtg_vblank_nb = &compo->vtg_vblank_nb[pipe];

	struct drm_crtc *crtc = &compo->mixer[pipe]->drm_crtc;

	struct sti_vtg *vtg = compo->vtg[pipe];



	DRM_DEBUG_DRIVER("\n");



	if (sti_vtg_unregister_client(pipe == STI_MIXER_MAIN ?

			compo->vtg_main : compo->vtg_aux, vtg_vblank_nb))

	if (sti_vtg_unregister_client(vtg, vtg_vblank_nb))

		DRM_DEBUG_DRIVER("Warning: cannot unregister VTG notifier\n");



	/* free the resources of the pending requests */

drivers/gpu/drm/sti/sti_gdp.c

+1 −2
Original line number Diff line number Diff line
@@ -650,8 +650,7 @@ static int sti_gdp_atomic_check(struct drm_plane *drm_plane, 


	if (!gdp->vtg) {

		/* Register gdp callback */

		gdp->vtg = mixer->id == STI_MIXER_MAIN ?

					compo->vtg_main : compo->vtg_aux;

		gdp->vtg = compo->vtg[mixer->id];

		if (sti_vtg_register_client(gdp->vtg,

					    &gdp->vtg_field_nb, crtc)) {

			DRM_ERROR("Cannot register VTG notifier\n");