Commit 2236a61b authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'mediatek-drm-next-6.10' of... 

Merge tag 'mediatek-drm-next-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/chunkuang.hu/linux

 into drm-next

Mediatek DRM Next for Linux 6.10

1. Use devm_platform_get_and_ioremap_resource() in mtk_hdmi_ddc_probe()
2. Add GAMMA 12-bit LUT support for MT8188
3. Add 0 size check to mtk_drm_gem_obj
4. Init `ddp_comp` with devm_kcalloc()
5. Rename mtk_drm_* to mtk_*
6. Drop driver owner initialization
7. Fix mtk_dp_aux_transfer return value
8. Correct calculation formula of PHY Timing

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20240425153859.3579-1-chunkuang.hu@kernel.org
parents 9aa99bb1 417d8c47

Documentation/devicetree/bindings/display/mediatek/mediatek,gamma.yaml

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,7 @@ properties: 
      - enum:

          - mediatek,mt8173-disp-gamma

          - mediatek,mt8183-disp-gamma

          - mediatek,mt8195-disp-gamma

      - items:

          - enum:

              - mediatek,mt6795-disp-gamma
@@ -35,6 +36,10 @@ properties: 
              - mediatek,mt8192-disp-gamma

              - mediatek,mt8195-disp-gamma

          - const: mediatek,mt8183-disp-gamma

      - items:

          - enum:

              - mediatek,mt8188-disp-gamma

          - const: mediatek,mt8195-disp-gamma



  reg:

    maxItems: 1

drivers/gpu/drm/mediatek/Makefile

+6 −6
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0



mediatek-drm-y := mtk_disp_aal.o \

mediatek-drm-y := mtk_crtc.o \

		  mtk_ddp_comp.o \

		  mtk_disp_aal.o \

		  mtk_disp_ccorr.o \

		  mtk_disp_color.o \

		  mtk_disp_gamma.o \
@@ -8,16 +10,14 @@ mediatek-drm-y := mtk_disp_aal.o \ 
		  mtk_disp_ovl.o \

		  mtk_disp_ovl_adaptor.o \

		  mtk_disp_rdma.o \

		  mtk_drm_crtc.o \

		  mtk_drm_ddp_comp.o \

		  mtk_drm_drv.o \

		  mtk_drm_gem.o \

		  mtk_drm_plane.o \

		  mtk_dsi.o \

		  mtk_dpi.o \

		  mtk_ethdr.o \

		  mtk_gem.o \

		  mtk_mdp_rdma.o \

		  mtk_padding.o

		  mtk_padding.o \

		  mtk_plane.o



obj-$(CONFIG_DRM_MEDIATEK) += mediatek-drm.o

drivers/gpu/drm/mediatek/mtk_drm_crtc.c→drivers/gpu/drm/mediatek/mtk_crtc.c

+105 −113
Original line number Diff line number Diff line
@@ -19,14 +19,14 @@ 
#include <drm/drm_probe_helper.h>

#include <drm/drm_vblank.h>



#include "mtk_crtc.h"

#include "mtk_ddp_comp.h"

#include "mtk_drm_drv.h"

#include "mtk_drm_crtc.h"

#include "mtk_drm_ddp_comp.h"

#include "mtk_drm_gem.h"

#include "mtk_drm_plane.h"

#include "mtk_gem.h"

#include "mtk_plane.h"



/*

 * struct mtk_drm_crtc - MediaTek specific crtc structure.

 * struct mtk_crtc - MediaTek specific crtc structure.

 * @base: crtc object.

 * @enabled: records whether crtc_enable succeeded

 * @planes: array of 4 drm_plane structures, one for each overlay plane
@@ -38,7 +38,7 @@ 
 *

 * TODO: Needs update: this header is missing a bunch of member descriptions.

 */

struct mtk_drm_crtc {

struct mtk_crtc {

	struct drm_crtc			base;

	bool				enabled;
@@ -80,9 +80,9 @@ struct mtk_crtc_state { 
	unsigned int			pending_vrefresh;

};



static inline struct mtk_drm_crtc *to_mtk_crtc(struct drm_crtc *c)

static inline struct mtk_crtc *to_mtk_crtc(struct drm_crtc *c)

{

	return container_of(c, struct mtk_drm_crtc, base);

	return container_of(c, struct mtk_crtc, base);

}



static inline struct mtk_crtc_state *to_mtk_crtc_state(struct drm_crtc_state *s)
@@ -90,7 +90,7 @@ static inline struct mtk_crtc_state *to_mtk_crtc_state(struct drm_crtc_state *s) 
	return container_of(s, struct mtk_crtc_state, base);

}



static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)

static void mtk_crtc_finish_page_flip(struct mtk_crtc *mtk_crtc)

{

	struct drm_crtc *crtc = &mtk_crtc->base;

	unsigned long flags;
@@ -104,11 +104,11 @@ static void mtk_drm_crtc_finish_page_flip(struct mtk_drm_crtc *mtk_crtc) 
	}

}



static void mtk_drm_finish_page_flip(struct mtk_drm_crtc *mtk_crtc)

static void mtk_drm_finish_page_flip(struct mtk_crtc *mtk_crtc)

{

	drm_crtc_handle_vblank(&mtk_crtc->base);

	if (!mtk_crtc->config_updating && mtk_crtc->pending_needs_vblank) {

		mtk_drm_crtc_finish_page_flip(mtk_crtc);

		mtk_crtc_finish_page_flip(mtk_crtc);

		mtk_crtc->pending_needs_vblank = false;

	}

}
@@ -151,9 +151,9 @@ static void mtk_drm_cmdq_pkt_destroy(struct cmdq_pkt *pkt) 
}

#endif



static void mtk_drm_crtc_destroy(struct drm_crtc *crtc)

static void mtk_crtc_destroy(struct drm_crtc *crtc)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	int i;



	mtk_mutex_put(mtk_crtc->mutex);
@@ -176,7 +176,7 @@ static void mtk_drm_crtc_destroy(struct drm_crtc *crtc) 
	drm_crtc_cleanup(crtc);

}



static void mtk_drm_crtc_reset(struct drm_crtc *crtc)

static void mtk_crtc_reset(struct drm_crtc *crtc)

{

	struct mtk_crtc_state *state;
@@ -191,7 +191,7 @@ static void mtk_drm_crtc_reset(struct drm_crtc *crtc) 
		__drm_atomic_helper_crtc_reset(crtc, &state->base);

}



static struct drm_crtc_state *mtk_drm_crtc_duplicate_state(struct drm_crtc *crtc)

static struct drm_crtc_state *mtk_crtc_duplicate_state(struct drm_crtc *crtc)

{

	struct mtk_crtc_state *state;
@@ -208,7 +208,7 @@ static struct drm_crtc_state *mtk_drm_crtc_duplicate_state(struct drm_crtc *crtc 
	return &state->base;

}



static void mtk_drm_crtc_destroy_state(struct drm_crtc *crtc,

static void mtk_crtc_destroy_state(struct drm_crtc *crtc,

				   struct drm_crtc_state *state)

{

	__drm_atomic_helper_crtc_destroy_state(state);
@@ -216,10 +216,9 @@ static void mtk_drm_crtc_destroy_state(struct drm_crtc *crtc, 
}



static enum drm_mode_status

mtk_drm_crtc_mode_valid(struct drm_crtc *crtc,

			const struct drm_display_mode *mode)

mtk_crtc_mode_valid(struct drm_crtc *crtc, const struct drm_display_mode *mode)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	enum drm_mode_status status = MODE_OK;

	int i;
@@ -231,7 +230,7 @@ mtk_drm_crtc_mode_valid(struct drm_crtc *crtc, 
	return status;

}



static bool mtk_drm_crtc_mode_fixup(struct drm_crtc *crtc,

static bool mtk_crtc_mode_fixup(struct drm_crtc *crtc,

				const struct drm_display_mode *mode,

				struct drm_display_mode *adjusted_mode)

{
@@ -239,7 +238,7 @@ static bool mtk_drm_crtc_mode_fixup(struct drm_crtc *crtc, 
	return true;

}



static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc)

static void mtk_crtc_mode_set_nofb(struct drm_crtc *crtc)

{

	struct mtk_crtc_state *state = to_mtk_crtc_state(crtc->state);
@@ -250,7 +249,7 @@ static void mtk_drm_crtc_mode_set_nofb(struct drm_crtc *crtc) 
	state->pending_config = true;

}



static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc)

static int mtk_crtc_ddp_clk_enable(struct mtk_crtc *mtk_crtc)

{

	int ret;

	int i;
@@ -270,7 +269,7 @@ static int mtk_crtc_ddp_clk_enable(struct mtk_drm_crtc *mtk_crtc) 
	return ret;

}



static void mtk_crtc_ddp_clk_disable(struct mtk_drm_crtc *mtk_crtc)

static void mtk_crtc_ddp_clk_disable(struct mtk_crtc *mtk_crtc)

{

	int i;
@@ -279,11 +278,11 @@ static void mtk_crtc_ddp_clk_disable(struct mtk_drm_crtc *mtk_crtc) 
}



static

struct mtk_ddp_comp *mtk_drm_ddp_comp_for_plane(struct drm_crtc *crtc,

struct mtk_ddp_comp *mtk_ddp_comp_for_plane(struct drm_crtc *crtc,

					    struct drm_plane *plane,

					    unsigned int *local_layer)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_ddp_comp *comp;

	int i, count = 0;

	unsigned int local_index = plane - mtk_crtc->planes;
@@ -306,7 +305,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl, void *mssg) 
{

	struct cmdq_cb_data *data = mssg;

	struct cmdq_client *cmdq_cl = container_of(cl, struct cmdq_client, client);

	struct mtk_drm_crtc *mtk_crtc = container_of(cmdq_cl, struct mtk_drm_crtc, cmdq_client);

	struct mtk_crtc *mtk_crtc = container_of(cmdq_cl, struct mtk_crtc, cmdq_client);

	struct mtk_crtc_state *state;

	unsigned int i;
@@ -346,7 +345,7 @@ static void ddp_cmdq_cb(struct mbox_client *cl, void *mssg) 
}

#endif



static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc)

static int mtk_crtc_ddp_hw_init(struct mtk_crtc *mtk_crtc)

{

	struct drm_crtc *crtc = &mtk_crtc->base;

	struct drm_connector *connector;
@@ -431,7 +430,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) 


		/* should not enable layer before crtc enabled */

		plane_state->pending.enable = false;

		comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);

		comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer);

		if (comp)

			mtk_ddp_comp_layer_config(comp, local_layer,

						  plane_state, NULL);
@@ -446,7 +445,7 @@ static int mtk_crtc_ddp_hw_init(struct mtk_drm_crtc *mtk_crtc) 
	return ret;

}



static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc)

static void mtk_crtc_ddp_hw_fini(struct mtk_crtc *mtk_crtc)

{

	struct drm_device *drm = mtk_crtc->base.dev;

	struct drm_crtc *crtc = &mtk_crtc->base;
@@ -491,7 +490,7 @@ static void mtk_crtc_ddp_hw_fini(struct mtk_drm_crtc *mtk_crtc) 
static void mtk_crtc_ddp_config(struct drm_crtc *crtc,

				struct cmdq_pkt *cmdq_handle)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc_state *state = to_mtk_crtc_state(mtk_crtc->base.state);

	struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];

	unsigned int i;
@@ -522,8 +521,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, 
			if (!plane_state->pending.config)

				continue;



			comp = mtk_drm_ddp_comp_for_plane(crtc, plane,

							  &local_layer);

			comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer);



			if (comp)

				mtk_ddp_comp_layer_config(comp, local_layer,
@@ -547,8 +545,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, 
			if (!plane_state->pending.async_config)

				continue;



			comp = mtk_drm_ddp_comp_for_plane(crtc, plane,

							  &local_layer);

			comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer);



			if (comp)

				mtk_ddp_comp_layer_config(comp, local_layer,
@@ -563,8 +560,7 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, 
	}

}



static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc,

				       bool needs_vblank)

static void mtk_crtc_update_config(struct mtk_crtc *mtk_crtc, bool needs_vblank)

{

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	struct cmdq_pkt *cmdq_handle = &mtk_crtc->cmdq_handle;
@@ -636,7 +632,7 @@ static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc, 
static void mtk_crtc_ddp_irq(void *data)

{

	struct drm_crtc *crtc = data;

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_drm_private *priv = crtc->dev->dev_private;



#if IS_REACHABLE(CONFIG_MTK_CMDQ)
@@ -652,9 +648,9 @@ static void mtk_crtc_ddp_irq(void *data) 
	mtk_drm_finish_page_flip(mtk_crtc);

}



static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc)

static int mtk_crtc_enable_vblank(struct drm_crtc *crtc)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];



	mtk_ddp_comp_enable_vblank(comp);
@@ -662,22 +658,22 @@ static int mtk_drm_crtc_enable_vblank(struct drm_crtc *crtc) 
	return 0;

}



static void mtk_drm_crtc_disable_vblank(struct drm_crtc *crtc)

static void mtk_crtc_disable_vblank(struct drm_crtc *crtc)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];



	mtk_ddp_comp_disable_vblank(comp);

}



static void mtk_drm_crtc_update_output(struct drm_crtc *crtc,

static void mtk_crtc_update_output(struct drm_crtc *crtc,

				   struct drm_atomic_state *state)

{

	int crtc_index = drm_crtc_index(crtc);

	int i;

	struct device *dev;

	struct drm_crtc_state *crtc_state = state->crtcs[crtc_index].new_state;

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_drm_private *priv;

	unsigned int encoder_mask = crtc_state->encoder_mask;
@@ -707,33 +703,33 @@ static void mtk_drm_crtc_update_output(struct drm_crtc *crtc, 
	}

}



int mtk_drm_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,

int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,

			 struct mtk_plane_state *state)

{

	unsigned int local_layer;

	struct mtk_ddp_comp *comp;



	comp = mtk_drm_ddp_comp_for_plane(crtc, plane, &local_layer);

	comp = mtk_ddp_comp_for_plane(crtc, plane, &local_layer);

	if (comp)

		return mtk_ddp_comp_layer_check(comp, local_layer, state);

	return 0;

}



void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,

void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,

			   struct drm_atomic_state *state)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);



	if (!mtk_crtc->enabled)

		return;



	mtk_drm_crtc_update_config(mtk_crtc, false);

	mtk_crtc_update_config(mtk_crtc, false);

}



static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,

static void mtk_crtc_atomic_enable(struct drm_crtc *crtc,

				   struct drm_atomic_state *state)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];

	int ret;
@@ -745,7 +741,7 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, 
		return;

	}



	mtk_drm_crtc_update_output(crtc, state);

	mtk_crtc_update_output(crtc, state);



	ret = mtk_crtc_ddp_hw_init(mtk_crtc);

	if (ret) {
@@ -757,10 +753,10 @@ static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc, 
	mtk_crtc->enabled = true;

}



static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc,

static void mtk_crtc_atomic_disable(struct drm_crtc *crtc,

				    struct drm_atomic_state *state)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[0];

	int i;
@@ -779,7 +775,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, 
	}

	mtk_crtc->pending_planes = true;



	mtk_drm_crtc_update_config(mtk_crtc, false);

	mtk_crtc_update_config(mtk_crtc, false);

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	/* Wait for planes to be disabled by cmdq */

	if (mtk_crtc->cmdq_client.chan)
@@ -797,13 +793,13 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, 
	mtk_crtc->enabled = false;

}



static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc,

static void mtk_crtc_atomic_begin(struct drm_crtc *crtc,

				  struct drm_atomic_state *state)

{

	struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state,

									  crtc);

	struct mtk_crtc_state *mtk_crtc_state = to_mtk_crtc_state(crtc_state);

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	unsigned long flags;



	if (mtk_crtc->event && mtk_crtc_state->base.event)
@@ -821,10 +817,10 @@ static void mtk_drm_crtc_atomic_begin(struct drm_crtc *crtc, 
	}

}



static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc,

static void mtk_crtc_atomic_flush(struct drm_crtc *crtc,

				  struct drm_atomic_state *state)

{

	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	struct mtk_crtc *mtk_crtc = to_mtk_crtc(crtc);

	int i;



	if (crtc->state->color_mgmt_changed)
@@ -832,32 +828,31 @@ static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc, 
			mtk_ddp_gamma_set(mtk_crtc->ddp_comp[i], crtc->state);

			mtk_ddp_ctm_set(mtk_crtc->ddp_comp[i], crtc->state);

		}

	mtk_drm_crtc_update_config(mtk_crtc, !!mtk_crtc->event);

	mtk_crtc_update_config(mtk_crtc, !!mtk_crtc->event);

}



static const struct drm_crtc_funcs mtk_crtc_funcs = {

	.set_config		= drm_atomic_helper_set_config,

	.page_flip		= drm_atomic_helper_page_flip,

	.destroy		= mtk_drm_crtc_destroy,

	.reset			= mtk_drm_crtc_reset,

	.atomic_duplicate_state	= mtk_drm_crtc_duplicate_state,

	.atomic_destroy_state	= mtk_drm_crtc_destroy_state,

	.enable_vblank		= mtk_drm_crtc_enable_vblank,

	.disable_vblank		= mtk_drm_crtc_disable_vblank,

	.destroy		= mtk_crtc_destroy,

	.reset			= mtk_crtc_reset,

	.atomic_duplicate_state	= mtk_crtc_duplicate_state,

	.atomic_destroy_state	= mtk_crtc_destroy_state,

	.enable_vblank		= mtk_crtc_enable_vblank,

	.disable_vblank		= mtk_crtc_disable_vblank,

};



static const struct drm_crtc_helper_funcs mtk_crtc_helper_funcs = {

	.mode_fixup	= mtk_drm_crtc_mode_fixup,

	.mode_set_nofb	= mtk_drm_crtc_mode_set_nofb,

	.mode_valid	= mtk_drm_crtc_mode_valid,

	.atomic_begin	= mtk_drm_crtc_atomic_begin,

	.atomic_flush	= mtk_drm_crtc_atomic_flush,

	.atomic_enable	= mtk_drm_crtc_atomic_enable,

	.atomic_disable	= mtk_drm_crtc_atomic_disable,

	.mode_fixup	= mtk_crtc_mode_fixup,

	.mode_set_nofb	= mtk_crtc_mode_set_nofb,

	.mode_valid	= mtk_crtc_mode_valid,

	.atomic_begin	= mtk_crtc_atomic_begin,

	.atomic_flush	= mtk_crtc_atomic_flush,

	.atomic_enable	= mtk_crtc_atomic_enable,

	.atomic_disable	= mtk_crtc_atomic_disable,

};



static int mtk_drm_crtc_init(struct drm_device *drm,

			     struct mtk_drm_crtc *mtk_crtc,

static int mtk_crtc_init(struct drm_device *drm, struct mtk_crtc *mtk_crtc,

			 unsigned int pipe)

{

	struct drm_plane *primary = NULL;
@@ -885,8 +880,7 @@ static int mtk_drm_crtc_init(struct drm_device *drm, 
	return ret;

}



static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc,

					int comp_idx)

static int mtk_crtc_num_comp_planes(struct mtk_crtc *mtk_crtc, int comp_idx)

{

	struct mtk_ddp_comp *comp;
@@ -904,7 +898,7 @@ static int mtk_drm_crtc_num_comp_planes(struct mtk_drm_crtc *mtk_crtc, 
}



static inline

enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx,

enum drm_plane_type mtk_crtc_plane_type(unsigned int plane_idx,

					unsigned int num_planes)

{

	if (plane_idx == 0)
@@ -916,11 +910,11 @@ enum drm_plane_type mtk_drm_crtc_plane_type(unsigned int plane_idx, 


}



static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev,

					 struct mtk_drm_crtc *mtk_crtc,

static int mtk_crtc_init_comp_planes(struct drm_device *drm_dev,

				     struct mtk_crtc *mtk_crtc,

				     int comp_idx, int pipe)

{

	int num_planes = mtk_drm_crtc_num_comp_planes(mtk_crtc, comp_idx);

	int num_planes = mtk_crtc_num_comp_planes(mtk_crtc, comp_idx);

	struct mtk_ddp_comp *comp = mtk_crtc->ddp_comp[comp_idx];

	int i, ret;
@@ -928,8 +922,7 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev, 
		ret = mtk_plane_init(drm_dev,

				&mtk_crtc->planes[mtk_crtc->layer_nr],

				BIT(pipe),

				mtk_drm_crtc_plane_type(mtk_crtc->layer_nr,

							num_planes),

				mtk_crtc_plane_type(mtk_crtc->layer_nr, num_planes),

				mtk_ddp_comp_supported_rotations(comp),

				mtk_ddp_comp_get_formats(comp),

				mtk_ddp_comp_get_num_formats(comp));
@@ -941,9 +934,9 @@ static int mtk_drm_crtc_init_comp_planes(struct drm_device *drm_dev, 
	return 0;

}



struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc)

struct device *mtk_crtc_dma_dev_get(struct drm_crtc *crtc)

{

	struct mtk_drm_crtc *mtk_crtc = NULL;

	struct mtk_crtc *mtk_crtc = NULL;



	if (!crtc)

		return NULL;
@@ -955,14 +948,14 @@ struct device *mtk_drm_crtc_dma_dev_get(struct drm_crtc *crtc) 
	return mtk_crtc->dma_dev;

}



int mtk_drm_crtc_create(struct drm_device *drm_dev,

			const unsigned int *path, unsigned int path_len,

			int priv_data_index, const struct mtk_drm_route *conn_routes,

int mtk_crtc_create(struct drm_device *drm_dev, const unsigned int *path,

		    unsigned int path_len, int priv_data_index,

		    const struct mtk_drm_route *conn_routes,

		    unsigned int num_conn_routes)

{

	struct mtk_drm_private *priv = drm_dev->dev_private;

	struct device *dev = drm_dev->dev;

	struct mtk_drm_crtc *mtk_crtc;

	struct mtk_crtc *mtk_crtc;

	unsigned int num_comp_planes = 0;

	int ret;

	int i;
@@ -1009,7 +1002,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 


	mtk_crtc->mmsys_dev = priv->mmsys_dev;

	mtk_crtc->ddp_comp_nr = path_len;

	mtk_crtc->ddp_comp = devm_kmalloc_array(dev,

	mtk_crtc->ddp_comp = devm_kcalloc(dev,

					  mtk_crtc->ddp_comp_nr + (conn_routes ? 1 : 0),

					  sizeof(*mtk_crtc->ddp_comp),

					  GFP_KERNEL);
@@ -1047,7 +1040,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 
	}



	for (i = 0; i < mtk_crtc->ddp_comp_nr; i++)

		num_comp_planes += mtk_drm_crtc_num_comp_planes(mtk_crtc, i);

		num_comp_planes += mtk_crtc_num_comp_planes(mtk_crtc, i);



	mtk_crtc->planes = devm_kcalloc(dev, num_comp_planes,

					sizeof(struct drm_plane), GFP_KERNEL);
@@ -1055,8 +1048,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 
		return -ENOMEM;



	for (i = 0; i < mtk_crtc->ddp_comp_nr; i++) {

		ret = mtk_drm_crtc_init_comp_planes(drm_dev, mtk_crtc, i,

						    crtc_i);

		ret = mtk_crtc_init_comp_planes(drm_dev, mtk_crtc, i, crtc_i);

		if (ret)

			return ret;

	}
@@ -1068,7 +1060,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 
	 */

	mtk_crtc->dma_dev = mtk_ddp_comp_dma_dev_get(&priv->ddp_comp[path[0]]);



	ret = mtk_drm_crtc_init(drm_dev, mtk_crtc, crtc_i);

	ret = mtk_crtc_init(drm_dev, mtk_crtc, crtc_i);

	if (ret < 0)

		return ret;
@@ -1138,7 +1130,7 @@ int mtk_drm_crtc_create(struct drm_device *drm_dev, 
		mtk_crtc->num_conn_routes = num_conn_routes;

		mtk_crtc->conn_routes = conn_routes;



		/* increase ddp_comp_nr at the end of mtk_drm_crtc_create */

		/* increase ddp_comp_nr at the end of mtk_crtc_create */

		mtk_crtc->ddp_comp_nr++;

	}

drivers/gpu/drm/mediatek/mtk_crtc.h

0 → 100644
+28 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 * Copyright (c) 2015 MediaTek Inc.

 */



#ifndef MTK_CRTC_H

#define MTK_CRTC_H



#include <drm/drm_crtc.h>

#include "mtk_ddp_comp.h"

#include "mtk_drm_drv.h"

#include "mtk_plane.h"



#define MTK_MAX_BPC	10

#define MTK_MIN_BPC	3



void mtk_crtc_commit(struct drm_crtc *crtc);

int mtk_crtc_create(struct drm_device *drm_dev, const unsigned int *path,

		    unsigned int path_len, int priv_data_index,

		    const struct mtk_drm_route *conn_routes,

		    unsigned int num_conn_routes);

int mtk_crtc_plane_check(struct drm_crtc *crtc, struct drm_plane *plane,

			 struct mtk_plane_state *state);

void mtk_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane,

			   struct drm_atomic_state *plane_state);

struct device *mtk_crtc_dma_dev_get(struct drm_crtc *crtc);



#endif /* MTK_CRTC_H */

drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c→drivers/gpu/drm/mediatek/mtk_ddp_comp.c

+28 −23
Original line number Diff line number Diff line
@@ -14,11 +14,11 @@ 
#include <linux/soc/mediatek/mtk-cmdq.h>

#include <drm/drm_print.h>



#include "mtk_crtc.h"

#include "mtk_ddp_comp.h"

#include "mtk_disp_drv.h"

#include "mtk_drm_drv.h"

#include "mtk_drm_plane.h"

#include "mtk_drm_ddp_comp.h"

#include "mtk_drm_crtc.h"

#include "mtk_plane.h"





#define DISP_REG_DITHER_EN			0x0000
@@ -497,7 +497,7 @@ static const struct mtk_ddp_comp_match mtk_ddp_matches[DDP_COMPONENT_DRM_ID_MAX] 
	[DDP_COMPONENT_WDMA1]		= { MTK_DISP_WDMA,		1, NULL },

};



static bool mtk_drm_find_comp_in_ddp(struct device *dev,

static bool mtk_ddp_comp_find(struct device *dev,

			      const unsigned int *path,

			      unsigned int path_len,

			      struct mtk_ddp_comp *ddp_comp)
@@ -514,7 +514,7 @@ static bool mtk_drm_find_comp_in_ddp(struct device *dev, 
	return false;

}



static unsigned int mtk_drm_find_comp_in_ddp_conn_path(struct device *dev,

static unsigned int mtk_ddp_comp_find_in_route(struct device *dev,

					       const struct mtk_drm_route *routes,

					       unsigned int num_routes,

					       struct mtk_ddp_comp *ddp_comp)
@@ -554,23 +554,28 @@ int mtk_ddp_comp_get_id(struct device_node *node, 
	return -EINVAL;

}



unsigned int mtk_drm_find_possible_crtc_by_comp(struct drm_device *drm,

						struct device *dev)

unsigned int mtk_find_possible_crtcs(struct drm_device *drm, struct device *dev)

{

	struct mtk_drm_private *private = drm->dev_private;

	unsigned int ret = 0;



	if (mtk_drm_find_comp_in_ddp(dev, private->data->main_path, private->data->main_len,

	if (mtk_ddp_comp_find(dev,

			      private->data->main_path,

			      private->data->main_len,

			      private->ddp_comp))

		ret = BIT(0);

	else if (mtk_drm_find_comp_in_ddp(dev, private->data->ext_path,

					  private->data->ext_len, private->ddp_comp))

	else if (mtk_ddp_comp_find(dev,

				   private->data->ext_path,

				   private->data->ext_len,

				   private->ddp_comp))

		ret = BIT(1);

	else if (mtk_drm_find_comp_in_ddp(dev, private->data->third_path,

					  private->data->third_len, private->ddp_comp))

	else if (mtk_ddp_comp_find(dev,

				   private->data->third_path,

				   private->data->third_len,

				   private->ddp_comp))

		ret = BIT(2);

	else

		ret = mtk_drm_find_comp_in_ddp_conn_path(dev,

		ret = mtk_ddp_comp_find_in_route(dev,

						 private->data->conn_routes,

						 private->data->num_conn_routes,

						 private->ddp_comp);