Merge tag 'mediatek-drm-next-5.8' of... (5f0ed4f8) · Commits · 戴 / test

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

+6 −0

Original line number	Diff line number	Diff line
		@@ -17,6 +17,9 @@ Required properties:
		Documentation/devicetree/bindings/graph.txt. This port should be connected
		to the input port of an attached HDMI or LVDS encoder chip.

		Optional properties:
		- pinctrl-names: Contain "default" and "sleep".

		Example:

		dpi0: dpi@1401d000 {
		@@ -27,6 +30,9 @@ dpi0: dpi@1401d000 {
		<&mmsys CLK_MM_DPI_ENGINE>,
		<&apmixedsys CLK_APMIXED_TVDPLL>;
		clock-names = "pixel", "engine", "pll";
		pinctrl-names = "default", "sleep";
		pinctrl-0 = <&dpi_pin_func>;
		pinctrl-1 = <&dpi_pin_idle>;

		port {
		dpi0_out: endpoint {

Documentation/devicetree/bindings/display/mediatek/mediatek,dsi.txt

+10 −0

Original line number	Diff line number	Diff line
		@@ -33,6 +33,13 @@ Required properties:
		- #clock-cells: must be <0>;
		- #phy-cells: must be <0>.

		Optional properties:
		- drive-strength-microamp: adjust driving current, should be 3000 ~ 6000. And
		the step is 200.
		- nvmem-cells: A phandle to the calibration data provided by a nvmem device. If
		unspecified default values shall be used.
		- nvmem-cell-names: Should be "calibration-data"

		Example:

		mipi_tx0: mipi-dphy@10215000 {
		@@ -42,6 +49,9 @@ mipi_tx0: mipi-dphy@10215000 {
		clock-output-names = "mipi_tx0_pll";
		#clock-cells = <0>;
		#phy-cells = <0>;
		drive-strength-microamp = <4600>;
		nvmem-cells= <&mipi_tx_calibration>;
		nvmem-cell-names = "calibration-data";
		};

		dsi0: dsi@1401b000 {

drivers/gpu/drm/mediatek/mtk_dpi.c

+31 −0

Original line number	Diff line number	Diff line
		@@ -10,7 +10,9 @@
		#include <linux/kernel.h>
		#include <linux/of.h>
		#include <linux/of_device.h>
		#include <linux/of_gpio.h>
		#include <linux/of_graph.h>
		#include <linux/pinctrl/consumer.h>
		#include <linux/platform_device.h>
		#include <linux/types.h>

		@@ -75,6 +77,9 @@ struct mtk_dpi {
		enum mtk_dpi_out_yc_map yc_map;
		enum mtk_dpi_out_bit_num bit_num;
		enum mtk_dpi_out_channel_swap channel_swap;
		struct pinctrl *pinctrl;
		struct pinctrl_state *pins_gpio;
		struct pinctrl_state *pins_dpi;
		int refcount;
		};

		@@ -380,6 +385,9 @@ static void mtk_dpi_power_off(struct mtk_dpi *dpi)
		if (--dpi->refcount != 0)
		return;

		if (dpi->pinctrl && dpi->pins_gpio)
		pinctrl_select_state(dpi->pinctrl, dpi->pins_gpio);

		mtk_dpi_disable(dpi);
		clk_disable_unprepare(dpi->pixel_clk);
		clk_disable_unprepare(dpi->engine_clk);
		@@ -404,6 +412,9 @@ static int mtk_dpi_power_on(struct mtk_dpi *dpi)
		goto err_pixel;
		}

		if (dpi->pinctrl && dpi->pins_dpi)
		pinctrl_select_state(dpi->pinctrl, dpi->pins_dpi);

		mtk_dpi_enable(dpi);
		return 0;

		@@ -697,6 +708,26 @@ static int mtk_dpi_probe(struct platform_device *pdev)
		dpi->dev = dev;
		dpi->conf = (struct mtk_dpi_conf *)of_device_get_match_data(dev);

		dpi->pinctrl = devm_pinctrl_get(&pdev->dev);
		if (IS_ERR(dpi->pinctrl)) {
		dpi->pinctrl = NULL;
		dev_dbg(&pdev->dev, "Cannot find pinctrl!\n");
		}
		if (dpi->pinctrl) {
		dpi->pins_gpio = pinctrl_lookup_state(dpi->pinctrl, "sleep");
		if (IS_ERR(dpi->pins_gpio)) {
		dpi->pins_gpio = NULL;
		dev_dbg(&pdev->dev, "Cannot find pinctrl idle!\n");
		}
		if (dpi->pins_gpio)
		pinctrl_select_state(dpi->pinctrl, dpi->pins_gpio);

		dpi->pins_dpi = pinctrl_lookup_state(dpi->pinctrl, "default");
		if (IS_ERR(dpi->pins_dpi)) {
		dpi->pins_dpi = NULL;
		dev_dbg(&pdev->dev, "Cannot find pinctrl active!\n");
		}
		}
		mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
		dpi->regs = devm_ioremap_resource(dev, mem);
		if (IS_ERR(dpi->regs)) {

drivers/gpu/drm/mediatek/mtk_drm_gem.c

+3 −0

Original line number	Diff line number	Diff line
		@@ -224,6 +224,9 @@ struct drm_gem_object mtk_gem_prime_import_sg_table(struct drm_device dev,

		expected = sg_dma_address(sg->sgl);
		for_each_sg(sg->sgl, s, sg->nents, i) {
		if (!sg_dma_len(s))
		break;

		if (sg_dma_address(s) != expected) {
		DRM_ERROR("sg_table is not contiguous");
		ret = -EINVAL;

drivers/gpu/drm/mediatek/mtk_hdmi.c

+7 −11

Original line number	Diff line number	Diff line
		@@ -311,14 +311,10 @@ static void mtk_hdmi_hw_send_info_frame(struct mtk_hdmi hdmi, u8 buffer,
		u8 checksum;
		int ctrl_frame_en = 0;

		frame_type = *buffer;
		buffer += 1;
		frame_ver = *buffer;
		buffer += 1;
		frame_len = *buffer;
		buffer += 1;
		checksum = *buffer;
		buffer += 1;
		frame_type = *buffer++;
		frame_ver = *buffer++;
		frame_len = *buffer++;
		checksum = *buffer++;
		frame_data = buffer;

		dev_dbg(hdmi->dev,
		@@ -982,7 +978,7 @@ static int mtk_hdmi_setup_avi_infoframe(struct mtk_hdmi *hdmi,
		struct drm_display_mode *mode)
		{
		struct hdmi_avi_infoframe frame;
		u8 buffer[17];
		u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AVI_INFOFRAME_SIZE];
		ssize_t err;

		err = drm_hdmi_avi_infoframe_from_display_mode(&frame,
		@@ -1008,7 +1004,7 @@ static int mtk_hdmi_setup_spd_infoframe(struct mtk_hdmi *hdmi,
		const char *product)
		{
		struct hdmi_spd_infoframe frame;
		u8 buffer[29];
		u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_SPD_INFOFRAME_SIZE];
		ssize_t err;

		err = hdmi_spd_infoframe_init(&frame, vendor, product);
		@@ -1031,7 +1027,7 @@ static int mtk_hdmi_setup_spd_infoframe(struct mtk_hdmi *hdmi,
		static int mtk_hdmi_setup_audio_infoframe(struct mtk_hdmi *hdmi)
		{
		struct hdmi_audio_infoframe frame;
		u8 buffer[14];
		u8 buffer[HDMI_INFOFRAME_HEADER_SIZE + HDMI_AUDIO_INFOFRAME_SIZE];
		ssize_t err;

		err = hdmi_audio_infoframe_init(&frame);

Admin message