Commit d27cd40a authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Vincent Abriou
Browse files

drm: sti: Replace drm_fb_get_bpp_depth() with drm_format_plane_cpp() 



The driver needs the number of bytes per pixel, not the bpp and depth
info meant for fbdev compatibility. Use the right API.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Acked-by: default avatarVincent Abriou <vincent.abriou@st.com>
parent 26e34d2d

drivers/gpu/drm/sti/sti_gdp.c

+3 −3
Original line number Original line Diff line number Diff line
@@ -719,7 +719,7 @@ static void sti_gdp_atomic_update(struct drm_plane *drm_plane, 
	u32 dma_updated_top;

	u32 dma_updated_top;

	u32 dma_updated_btm;

	u32 dma_updated_btm;

	int format;

	int format;

	unsigned int depth, bpp;

	unsigned int bpp;

	u32 ydo, xdo, yds, xds;

	u32 ydo, xdo, yds, xds;





	if (!crtc || !fb)

	if (!crtc || !fb)
@@ -758,9 +758,9 @@ static void sti_gdp_atomic_update(struct drm_plane *drm_plane, 
			 (unsigned long)cma_obj->paddr);

			 (unsigned long)cma_obj->paddr);





	/* pixel memory location */

	/* pixel memory location */

	drm_fb_get_bpp_depth(fb->pixel_format, &depth, &bpp);

	bpp = drm_format_plane_cpp(fb->pixel_format, 0);

	top_field->gam_gdp_pml = (u32)cma_obj->paddr + fb->offsets[0];

	top_field->gam_gdp_pml = (u32)cma_obj->paddr + fb->offsets[0];

	top_field->gam_gdp_pml += src_x * (bpp >> 3);

	top_field->gam_gdp_pml += src_x * bpp;

	top_field->gam_gdp_pml += src_y * fb->pitches[0];

	top_field->gam_gdp_pml += src_y * fb->pitches[0];





	/* output parameters (clamped / cropped) */

	/* output parameters (clamped / cropped) */

CRA Git | Maintained and supported by SUSTech CRA and CCSE