Commit 0c799717 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

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

Mediatek DRM Next for Linux 5.13

1. Fine tune the line time for EOTp.
2. Add support mt8192 dpi.
3. Make crtc config-updating atomic.
4. Don't support hdmi connector creation.

From: Chun-Kuang Hu <chunkuang.hu@kernel.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20210405082248.3578-1-chunkuang.hu@kernel.org


Signed-off-by: default avatarDave Airlie <airlied@redhat.com>
parents 1539f716 2e477391

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

+4 −8
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ properties: 
      - mediatek,mt7623-dpi

      - mediatek,mt8173-dpi

      - mediatek,mt8183-dpi

      - mediatek,mt8192-dpi



  reg:

    maxItems: 1
@@ -50,15 +51,10 @@ properties: 
      - const: sleep



  port:

    type: object

    $ref: /schemas/graph.yaml#/properties/port

    description:

      Output port node with endpoint definitions as described in

      Documentation/devicetree/bindings/graph.txt. This port should be connected

      to the input port of an attached HDMI or LVDS encoder chip.



    properties:

      endpoint:

        type: object

      Output port node. This port should be connected to the input port of an

      attached HDMI or LVDS encoder chip.



required:

  - compatible

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -5978,6 +5978,7 @@ DRM DRIVERS FOR MEDIATEK 
M:	Chun-Kuang Hu <chunkuang.hu@kernel.org>

M:	Philipp Zabel <p.zabel@pengutronix.de>

L:	dri-devel@lists.freedesktop.org

L:	linux-mediatek@lists.infradead.org (moderated for non-subscribers)

S:	Supported

F:	Documentation/devicetree/bindings/display/mediatek/

F:	drivers/gpu/drm/mediatek/

drivers/gpu/drm/mediatek/mtk_cec.c

+3 −3
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include <linux/delay.h>

#include <linux/io.h>

#include <linux/interrupt.h>

#include <linux/module.h>

#include <linux/mod_devicetable.h>

#include <linux/platform_device.h>
@@ -208,10 +209,8 @@ static int mtk_cec_probe(struct platform_device *pdev) 
	}



	cec->irq = platform_get_irq(pdev, 0);

	if (cec->irq < 0) {

		dev_err(dev, "Failed to get cec irq: %d\n", cec->irq);

	if (cec->irq < 0)

		return cec->irq;

	}



	ret = devm_request_threaded_irq(dev, cec->irq, NULL,

					mtk_cec_htplg_isr_thread,
@@ -247,6 +246,7 @@ static const struct of_device_id mtk_cec_of_ids[] = { 
	{ .compatible = "mediatek,mt8173-cec", },

	{}

};

MODULE_DEVICE_TABLE(of, mtk_cec_of_ids);



struct platform_driver mtk_cec_driver = {

	.probe = mtk_cec_probe,

drivers/gpu/drm/mediatek/mtk_dpi.c

+29 −3
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ struct mtk_dpi_yc_limit { 
struct mtk_dpi_conf {

	unsigned int (*cal_factor)(int clock);

	u32 reg_h_fre_con;

	u32 max_clock_khz;

	bool edge_sel_en;

};
@@ -557,9 +558,23 @@ static void mtk_dpi_bridge_enable(struct drm_bridge *bridge) 
	mtk_dpi_set_display_mode(dpi, &dpi->mode);

}



static enum drm_mode_status

mtk_dpi_bridge_mode_valid(struct drm_bridge *bridge,

			  const struct drm_display_info *info,

			  const struct drm_display_mode *mode)

{

	struct mtk_dpi *dpi = bridge_to_dpi(bridge);



	if (mode->clock > dpi->conf->max_clock_khz)

		return MODE_CLOCK_HIGH;



	return MODE_OK;

}



static const struct drm_bridge_funcs mtk_dpi_bridge_funcs = {

	.attach = mtk_dpi_bridge_attach,

	.mode_set = mtk_dpi_bridge_mode_set,

	.mode_valid = mtk_dpi_bridge_mode_valid,

	.disable = mtk_dpi_bridge_disable,

	.enable = mtk_dpi_bridge_enable,

};
@@ -668,17 +683,26 @@ static unsigned int mt8183_calculate_factor(int clock) 
static const struct mtk_dpi_conf mt8173_conf = {

	.cal_factor = mt8173_calculate_factor,

	.reg_h_fre_con = 0xe0,

	.max_clock_khz = 300000,

};



static const struct mtk_dpi_conf mt2701_conf = {

	.cal_factor = mt2701_calculate_factor,

	.reg_h_fre_con = 0xb0,

	.edge_sel_en = true,

	.max_clock_khz = 150000,

};



static const struct mtk_dpi_conf mt8183_conf = {

	.cal_factor = mt8183_calculate_factor,

	.reg_h_fre_con = 0xe0,

	.max_clock_khz = 100000,

};



static const struct mtk_dpi_conf mt8192_conf = {

	.cal_factor = mt8183_calculate_factor,

	.reg_h_fre_con = 0xe0,

	.max_clock_khz = 150000,

};



static int mtk_dpi_probe(struct platform_device *pdev)
@@ -751,10 +775,8 @@ static int mtk_dpi_probe(struct platform_device *pdev) 
	}



	dpi->irq = platform_get_irq(pdev, 0);

	if (dpi->irq <= 0) {

		dev_err(dev, "Failed to get irq: %d\n", dpi->irq);

	if (dpi->irq <= 0)

		return -EINVAL;

	}



	ret = drm_of_find_panel_or_bridge(dev->of_node, 0, 0,

					  NULL, &dpi->next_bridge);
@@ -801,8 +823,12 @@ static const struct of_device_id mtk_dpi_of_ids[] = { 
	{ .compatible = "mediatek,mt8183-dpi",

	  .data = &mt8183_conf,

	},

	{ .compatible = "mediatek,mt8192-dpi",

	  .data = &mt8192_conf,

	},

	{ },

};

MODULE_DEVICE_TABLE(of, mtk_dpi_of_ids);



struct platform_driver mtk_dpi_driver = {

	.probe = mtk_dpi_probe,

drivers/gpu/drm/mediatek/mtk_drm_crtc.c

+12 −7
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ struct mtk_drm_crtc { 


	/* lock for display hardware access */

	struct mutex			hw_lock;

	bool				config_updating;

};



struct mtk_crtc_state {
@@ -97,7 +98,7 @@ 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)

{

	drm_crtc_handle_vblank(&mtk_crtc->base);

	if (mtk_crtc->pending_needs_vblank) {

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

		mtk_drm_crtc_finish_page_flip(mtk_crtc);

		mtk_crtc->pending_needs_vblank = false;

	}
@@ -425,7 +426,8 @@ static void mtk_crtc_ddp_config(struct drm_crtc *crtc, 
	}

}



static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc)

static void mtk_drm_crtc_update_config(struct mtk_drm_crtc *mtk_crtc,

				       bool needs_vblank)

{

#if IS_REACHABLE(CONFIG_MTK_CMDQ)

	struct cmdq_pkt *cmdq_handle;
@@ -436,6 +438,10 @@ static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc) 
	int i;



	mutex_lock(&mtk_crtc->hw_lock);

	mtk_crtc->config_updating = true;

	if (needs_vblank)

		mtk_crtc->pending_needs_vblank = true;



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

		struct drm_plane *plane = &mtk_crtc->planes[i];

		struct mtk_plane_state *plane_state;
@@ -472,6 +478,7 @@ static void mtk_drm_crtc_hw_config(struct mtk_drm_crtc *mtk_crtc) 
		cmdq_pkt_flush_async(cmdq_handle, ddp_cmdq_cb, cmdq_handle);

	}

#endif

	mtk_crtc->config_updating = false;

	mutex_unlock(&mtk_crtc->hw_lock);

}
@@ -532,7 +539,7 @@ void mtk_drm_crtc_async_update(struct drm_crtc *crtc, struct drm_plane *plane, 
		return;



	plane_helper_funcs->atomic_update(plane, state);

	mtk_drm_crtc_hw_config(mtk_crtc);

	mtk_drm_crtc_update_config(mtk_crtc, false);

}



static void mtk_drm_crtc_atomic_enable(struct drm_crtc *crtc,
@@ -582,7 +589,7 @@ static void mtk_drm_crtc_atomic_disable(struct drm_crtc *crtc, 
	}

	mtk_crtc->pending_planes = true;



	mtk_drm_crtc_hw_config(mtk_crtc);

	mtk_drm_crtc_update_config(mtk_crtc, false);

	/* Wait for planes to be disabled */

	drm_crtc_wait_one_vblank(crtc);
@@ -618,14 +625,12 @@ static void mtk_drm_crtc_atomic_flush(struct drm_crtc *crtc, 
	struct mtk_drm_crtc *mtk_crtc = to_mtk_crtc(crtc);

	int i;



	if (mtk_crtc->event)

		mtk_crtc->pending_needs_vblank = true;

	if (crtc->state->color_mgmt_changed)

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

			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_hw_config(mtk_crtc);

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

}



static const struct drm_crtc_funcs mtk_crtc_funcs = {