Commit e1174133 authored by Thomas Zimmermann's avatar Thomas Zimmermann
Browse files

drm/tidss: Remove return values from dispc_plane_{setup, enable}() 



Calls to dispc_plane_setup() and dispc_plane_enable() cannot fail.
Remove the return value.

Signed-off-by: default avatarThomas Zimmermann <tzimmermann@suse.de>
Reviewed-by: default avatarJavier Martinez Canillas <javierm@redhat.com>
Reviewed-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20230209154107.30680-6-tzimmermann@suse.de
parent 2a742fd1

drivers/gpu/drm/tidss/tidss_dispc.c

+4 −8
Original line number Diff line number Diff line
@@ -1985,7 +1985,7 @@ dma_addr_t dispc_plane_state_p_uv_addr(const struct drm_plane_state *state) 
		(y * fb->pitches[1] / fb->format->vsub);

}



int dispc_plane_setup(struct dispc_device *dispc, u32 hw_plane,

void dispc_plane_setup(struct dispc_device *dispc, u32 hw_plane,

		       const struct drm_plane_state *state,

		       u32 hw_videoport)

{
@@ -2066,15 +2066,11 @@ int dispc_plane_setup(struct dispc_device *dispc, u32 hw_plane, 
	else

		VID_REG_FLD_MOD(dispc, hw_plane, DISPC_VID_ATTRIBUTES, 0,

				28, 28);



	return 0;

}



int dispc_plane_enable(struct dispc_device *dispc, u32 hw_plane, bool enable)

void dispc_plane_enable(struct dispc_device *dispc, u32 hw_plane, bool enable)

{

	VID_REG_FLD_MOD(dispc, hw_plane, DISPC_VID_ATTRIBUTES, !!enable, 0, 0);



	return 0;

}



static u32 dispc_vid_get_fifo_size(struct dispc_device *dispc, u32 hw_plane)

drivers/gpu/drm/tidss/tidss_dispc.h

+4 −4
Original line number Diff line number Diff line
@@ -123,10 +123,10 @@ int dispc_runtime_resume(struct dispc_device *dispc); 
int dispc_plane_check(struct dispc_device *dispc, u32 hw_plane,

		      const struct drm_plane_state *state,

		      u32 hw_videoport);

int dispc_plane_setup(struct dispc_device *dispc, u32 hw_plane,

void dispc_plane_setup(struct dispc_device *dispc, u32 hw_plane,

		       const struct drm_plane_state *state,

		       u32 hw_videoport);

int dispc_plane_enable(struct dispc_device *dispc, u32 hw_plane, bool enable);

void dispc_plane_enable(struct dispc_device *dispc, u32 hw_plane, bool enable);

const u32 *dispc_plane_formats(struct dispc_device *dispc, unsigned int *len);



int dispc_init(struct tidss_device *tidss);

drivers/gpu/drm/tidss/tidss_plane.c

+1 −10
Original line number Diff line number Diff line
@@ -113,7 +113,6 @@ static void tidss_plane_atomic_update(struct drm_plane *plane, 
	struct drm_plane_state *new_state = drm_atomic_get_new_plane_state(state,

									   plane);

	u32 hw_videoport;

	int ret;



	dev_dbg(ddev->dev, "%s\n", __func__);
@@ -124,15 +123,7 @@ static void tidss_plane_atomic_update(struct drm_plane *plane, 


	hw_videoport = to_tidss_crtc(new_state->crtc)->hw_videoport;



	ret = dispc_plane_setup(tidss->dispc, tplane->hw_plane_id,

				new_state, hw_videoport);



	if (ret) {

		dev_err(plane->dev->dev, "%s: Failed to setup plane %d\n",

			__func__, tplane->hw_plane_id);

		dispc_plane_enable(tidss->dispc, tplane->hw_plane_id, false);

		return;

	}

	dispc_plane_setup(tidss->dispc, tplane->hw_plane_id, new_state, hw_videoport);



	dispc_plane_enable(tidss->dispc, tplane->hw_plane_id, true);

}