drm/mediatek: Find the cursor plane instead of hard coding it (318caac7) · Commits · 戴 / test

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+12 −6

Original line number	Diff line number	Diff line
		@@ -636,10 +636,18 @@ static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = {

		static int mtk_drm_crtc_init(struct drm_device *drm,
		struct mtk_drm_crtc *mtk_crtc,
		struct drm_plane *primary,
		struct drm_plane *cursor, unsigned int pipe)
		unsigned int pipe)
		{
		int ret;
		struct drm_plane *primary = NULL;
		struct drm_plane *cursor = NULL;
		int i, ret;

		for (i = 0; i < mtk_crtc->layer_nr; i++) {
		if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_PRIMARY)
		primary = &mtk_crtc->planes[i];
		else if (mtk_crtc->planes[i].type == DRM_PLANE_TYPE_CURSOR)
		cursor = &mtk_crtc->planes[i];
		}

		ret = drm_crtc_init_with_planes(drm, &mtk_crtc->base, primary, cursor,
		&mtk_crtc_funcs, NULL);
		@@ -807,9 +815,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev,
		return ret;
		}

		ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, &mtk_crtc->planes[0],
		mtk_crtc->layer_nr > 1 ? &mtk_crtc->planes[1] :
		NULL, pipe);
		ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, pipe);
		if (ret < 0)
		return ret;