Unverified Commit fc1acf31 authored by Paul Cercueil's avatar Paul Cercueil
Browse files

drm/ingenic: Add support for the IPU 



Add support for the Image Processing Unit (IPU) found in all Ingenic
SoCs.

The IPU can upscale and downscale a source frame of arbitrary size
ranging from 4x4 to 4096x4096 on newer SoCs, with bicubic filtering
on newer SoCs, bilinear filtering on older SoCs. Nearest-neighbour can
also be obtained with proper coefficients.

Starting from the JZ4725B, the IPU supports a mode where its output is
sent directly to the LCDC, without having to be written to RAM first.
This makes it possible to use the IPU as a DRM plane on the compatible
SoCs, and have it convert and scale anything the userspace asks for to
what's available for the display.

Regarding pixel formats, older SoCs support packed YUV 4:2:2 and various
planar YUV formats. Newer SoCs introduced support for RGB.

Since the IPU is a separate hardware block, to make it work properly the
Ingenic DRM driver will now register itself as a component master in
case the IPU driver has been enabled in the config.

When enabled in the config, the CRTC will see the IPU as a second primary
plane. It cannot be enabled at the same time as the regular primary
plane. It has the same priority, which means that it will also display
below the overlay plane.

v2: - ingenic-ipu is no longer its own module. It will be built
      into the ingenic-drm module.
    - If enabled in the config, both the core driver and the IPU
      driver will register as components; otherwise the core
      driver will bypass that and call the ingenic_drm_bind()
      function directly.
    - Since both files now build into the same module, the
      symbols previously exported as GPL are not exported anymore,
      since they are only used internally.
    - Fix SPDX license header in ingenic-ipu.h
    - Avoid using 'for(;;);' loops without trailing statement(s)

v3: - Pass priv structure to IRQ handler; that way we don't hardcode
      the expectation that the IPU plane is at index #0.
    - Rework osd_changed() to account for src_* changes
    - Add multiplanar YUV 4:4:4 support
    - Commit fb addresses to HW at vblank, since addr registers are
      not shadow registers
    - Probe IPU component later so that IPU plane is last
    - Fix driver not working on IPU-less hardware
    - Use IPU driver's name as the IRQ name to avoid having two
      'ingenic-drm' in /proc/interrupts
    - Fix IPU only working for still images on JZ4725B
    - Add a bit more code comments

Signed-off-by: default avatarPaul Cercueil <paul@crapouillou.net>
Reviewed-by: default avatarSam Ravnborg <sam@ravnborg.org>
Link: https://patchwork.freedesktop.org/patch/msgid/20200716163846.174790-10-paul@crapouillou.net
parent 3c9bea4e

drivers/gpu/drm/ingenic/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -14,3 +14,14 @@ config DRM_INGENIC 
	  Choose this option for DRM support for the Ingenic SoCs.



	  If M is selected the module will be called ingenic-drm.



if DRM_INGENIC



config DRM_INGENIC_IPU

	bool "IPU support for Ingenic SoCs"

	help

	  Choose this option to enable support for the IPU found in Ingenic SoCs.



	  The Image Processing Unit (IPU) will appear as a second primary plane.



endif

drivers/gpu/drm/ingenic/Makefile

+2 −1
Original line number Diff line number Diff line 
obj-$(CONFIG_DRM_INGENIC) += ingenic-drm.o

ingenic-drm-y += ingenic-drm-drv.o
 
ingenic-drm-y = ingenic-drm-drv.o

ingenic-drm-$(CONFIG_DRM_INGENIC_IPU) += ingenic-ipu.o

drivers/gpu/drm/ingenic/ingenic-drm-drv.c

+156 −15
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ 


#include "ingenic-drm.h"



#include <linux/component.h>

#include <linux/clk.h>

#include <linux/dma-mapping.h>

#include <linux/module.h>
@@ -54,7 +55,7 @@ struct ingenic_drm { 
	 * f0 (aka. foreground0) can be overlayed. Z-order is fixed in

	 * hardware and cannot be changed.

	 */

	struct drm_plane f0, f1;

	struct drm_plane f0, f1, *ipu_plane;

	struct drm_crtc crtc;

	struct drm_encoder encoder;
@@ -190,13 +191,21 @@ static void ingenic_drm_crtc_update_timings(struct ingenic_drm *priv, 


	regmap_set_bits(priv->map, JZ_REG_LCD_CTRL,

			JZ_LCD_CTRL_OFUP | JZ_LCD_CTRL_BURST_16);



	/*

	 * IPU restart - specify how much time the LCDC will wait before

	 * transferring a new frame from the IPU. The value is the one

	 * suggested in the programming manual.

	 */

	regmap_write(priv->map, JZ_REG_LCD_IPUR, JZ_LCD_IPUR_IPUREN |

		     (ht * vpe / 3) << JZ_LCD_IPUR_IPUR_LSB);

}



static int ingenic_drm_crtc_atomic_check(struct drm_crtc *crtc,

					 struct drm_crtc_state *state)

{

	struct ingenic_drm *priv = drm_crtc_get_priv(crtc);

	struct drm_plane_state *f1_state, *f0_state;

	struct drm_plane_state *f1_state, *f0_state, *ipu_state;

	long rate;



	if (!drm_atomic_crtc_needs_modeset(state))
@@ -215,13 +224,44 @@ static int ingenic_drm_crtc_atomic_check(struct drm_crtc *crtc, 
		f1_state = drm_atomic_get_plane_state(state->state, &priv->f1);

		f0_state = drm_atomic_get_plane_state(state->state, &priv->f0);



		if (IS_ENABLED(CONFIG_DRM_INGENIC_IPU) && priv->ipu_plane) {

			ipu_state = drm_atomic_get_plane_state(state->state, priv->ipu_plane);



			/* IPU and F1 planes cannot be enabled at the same time. */

			if (f1_state->fb && ipu_state->fb) {

				dev_dbg(priv->dev, "Cannot enable both F1 and IPU\n");

				return -EINVAL;

			}

		}



		/* If all the planes are disabled, we won't get a VBLANK IRQ */

		priv->no_vblank = !f1_state->fb && !f0_state->fb;

		priv->no_vblank = !f1_state->fb && !f0_state->fb &&

				  !(priv->ipu_plane && ipu_state->fb);

	}



	return 0;

}



static void ingenic_drm_crtc_atomic_begin(struct drm_crtc *crtc,

					  struct drm_crtc_state *oldstate)

{

	struct ingenic_drm *priv = drm_crtc_get_priv(crtc);

	u32 ctrl = 0;



	if (priv->soc_info->has_osd &&

	    drm_atomic_crtc_needs_modeset(crtc->state)) {

		/*

		 * If IPU plane is enabled, enable IPU as source for the F1

		 * plane; otherwise use regular DMA.

		 */

		if (priv->ipu_plane && priv->ipu_plane->state->fb)

			ctrl |= JZ_LCD_OSDCTRL_IPU;



		regmap_update_bits(priv->map, JZ_REG_LCD_OSDCTRL,

				   JZ_LCD_OSDCTRL_IPU, ctrl);

	}

}



static void ingenic_drm_crtc_atomic_flush(struct drm_crtc *crtc,

					  struct drm_crtc_state *oldstate)

{
@@ -311,10 +351,9 @@ static void ingenic_drm_plane_enable(struct ingenic_drm *priv, 
	}

}



static void ingenic_drm_plane_atomic_disable(struct drm_plane *plane,

					     struct drm_plane_state *old_state)

void ingenic_drm_plane_disable(struct device *dev, struct drm_plane *plane)

{

	struct ingenic_drm *priv = drm_device_get_priv(plane->dev);

	struct ingenic_drm *priv = dev_get_drvdata(dev);

	unsigned int en_bit;



	if (priv->soc_info->has_osd) {
@@ -327,9 +366,18 @@ static void ingenic_drm_plane_atomic_disable(struct drm_plane *plane, 
	}

}



static void ingenic_drm_plane_config(struct ingenic_drm *priv,

static void ingenic_drm_plane_atomic_disable(struct drm_plane *plane,

					     struct drm_plane_state *old_state)

{

	struct ingenic_drm *priv = drm_device_get_priv(plane->dev);



	ingenic_drm_plane_disable(priv->dev, plane);

}



void ingenic_drm_plane_config(struct device *dev,

			      struct drm_plane *plane, u32 fourcc)

{

	struct ingenic_drm *priv = dev_get_drvdata(dev);

	struct drm_plane_state *state = plane->state;

	unsigned int xy_reg, size_reg;

	unsigned int ctrl = 0;
@@ -411,7 +459,7 @@ static void ingenic_drm_plane_atomic_update(struct drm_plane *plane, 
		hwdesc->cmd = JZ_LCD_CMD_EOF_IRQ | (width * height * cpp / 4);



		if (drm_atomic_crtc_needs_modeset(state->crtc->state))

			ingenic_drm_plane_config(priv, plane,

			ingenic_drm_plane_config(priv->dev, plane,

						 state->fb->format->format);

	}

}
@@ -604,6 +652,7 @@ static const struct drm_plane_helper_funcs ingenic_drm_plane_helper_funcs = { 
static const struct drm_crtc_helper_funcs ingenic_drm_crtc_helper_funcs = {

	.atomic_enable		= ingenic_drm_crtc_atomic_enable,

	.atomic_disable		= ingenic_drm_crtc_atomic_disable,

	.atomic_begin		= ingenic_drm_crtc_atomic_begin,

	.atomic_flush		= ingenic_drm_crtc_atomic_flush,

	.atomic_check		= ingenic_drm_crtc_atomic_check,

};
@@ -624,10 +673,17 @@ static struct drm_mode_config_helper_funcs ingenic_drm_mode_config_helpers = { 
	.atomic_commit_tail = ingenic_drm_atomic_helper_commit_tail,

};



static int ingenic_drm_probe(struct platform_device *pdev)

static void ingenic_drm_unbind_all(void *d)

{

	struct ingenic_drm *priv = d;



	component_unbind_all(priv->dev, &priv->drm);

}



static int ingenic_drm_bind(struct device *dev)

{

	struct platform_device *pdev = to_platform_device(dev);

	const struct jz_soc_info *soc_info;

	struct device *dev = &pdev->dev;

	struct ingenic_drm *priv;

	struct clk *parent_clk;

	struct drm_bridge *bridge;
@@ -728,6 +784,9 @@ static int ingenic_drm_probe(struct platform_device *pdev) 
		priv->dma_hwdesc_f0->id = 0xf0;

	}



	if (soc_info->has_osd)

		priv->ipu_plane = drm_plane_from_index(drm, 0);



	drm_plane_helper_add(&priv->f1, &ingenic_drm_plane_helper_funcs);



	ret = drm_universal_plane_init(drm, &priv->f1, 1,
@@ -736,7 +795,7 @@ static int ingenic_drm_probe(struct platform_device *pdev) 
				       ARRAY_SIZE(ingenic_drm_primary_formats),

				       NULL, DRM_PLANE_TYPE_PRIMARY, NULL);

	if (ret) {

		dev_err(dev, "Failed to register primary plane: %i\n", ret);

		dev_err(dev, "Failed to register plane: %i\n", ret);

		return ret;

	}
@@ -764,6 +823,25 @@ static int ingenic_drm_probe(struct platform_device *pdev) 
				ret);

			return ret;

		}



		if (IS_ENABLED(CONFIG_DRM_INGENIC_IPU)) {

			ret = component_bind_all(dev, drm);

			if (ret) {

				if (ret != -EPROBE_DEFER)

					dev_err(dev, "Failed to bind components: %i\n", ret);

				return ret;

			}



			ret = devm_add_action_or_reset(dev, ingenic_drm_unbind_all, priv);

			if (ret)

				return ret;



			priv->ipu_plane = drm_plane_from_index(drm, 2);

			if (!priv->ipu_plane) {

				dev_err(dev, "Failed to retrieve IPU plane\n");

				return -EINVAL;

			}

		}

	}



	priv->encoder.possible_crtcs = 1;
@@ -852,9 +930,14 @@ err_pixclk_disable: 
	return ret;

}



static int ingenic_drm_remove(struct platform_device *pdev)

static int compare_of(struct device *dev, void *data)

{

	struct ingenic_drm *priv = platform_get_drvdata(pdev);

	return dev->of_node == data;

}



static void ingenic_drm_unbind(struct device *dev)

{

	struct ingenic_drm *priv = dev_get_drvdata(dev);



	if (priv->lcd_clk)

		clk_disable_unprepare(priv->lcd_clk);
@@ -862,6 +945,42 @@ static int ingenic_drm_remove(struct platform_device *pdev) 


	drm_dev_unregister(&priv->drm);

	drm_atomic_helper_shutdown(&priv->drm);

}



static const struct component_master_ops ingenic_master_ops = {

	.bind = ingenic_drm_bind,

	.unbind = ingenic_drm_unbind,

};



static int ingenic_drm_probe(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;

	struct component_match *match = NULL;

	struct device_node *np;



	if (!IS_ENABLED(CONFIG_DRM_INGENIC_IPU))

		return ingenic_drm_bind(dev);



	/* IPU is at port address 8 */

	np = of_graph_get_remote_node(dev->of_node, 8, 0);

	if (!np) {

		dev_err(dev, "Unable to get IPU node\n");

		return -EINVAL;

	}



	drm_of_component_match_add(dev, &match, compare_of, np);



	return component_master_add_with_match(dev, &ingenic_master_ops, match);

}



static int ingenic_drm_remove(struct platform_device *pdev)

{

	struct device *dev = &pdev->dev;



	if (!IS_ENABLED(CONFIG_DRM_INGENIC_IPU))

		ingenic_drm_unbind(dev);

	else

		component_master_del(dev, &ingenic_master_ops);



	return 0;

}
@@ -903,7 +1022,29 @@ static struct platform_driver ingenic_drm_driver = { 
	.probe = ingenic_drm_probe,

	.remove = ingenic_drm_remove,

};

module_platform_driver(ingenic_drm_driver);



static int ingenic_drm_init(void)

{

	int err;



	if (IS_ENABLED(CONFIG_DRM_INGENIC_IPU)) {

		err = platform_driver_register(ingenic_ipu_driver_ptr);

		if (err)

			return err;

	}



	return platform_driver_register(&ingenic_drm_driver);

}

module_init(ingenic_drm_init);



static void ingenic_drm_exit(void)

{

	platform_driver_unregister(&ingenic_drm_driver);



	if (IS_ENABLED(CONFIG_DRM_INGENIC_IPU))

		platform_driver_unregister(ingenic_ipu_driver_ptr);

}

module_exit(ingenic_drm_exit);



MODULE_AUTHOR("Paul Cercueil <paul@crapouillou.net>");

MODULE_DESCRIPTION("DRM driver for the Ingenic SoCs\n");

drivers/gpu/drm/ingenic/ingenic-drm.h

+12 −0
Original line number Diff line number Diff line
@@ -8,6 +8,7 @@ 
#define DRIVERS_GPU_DRM_INGENIC_INGENIC_DRM_H



#include <linux/bitops.h>

#include <linux/types.h>



#define JZ_REG_LCD_CFG				0x00

#define JZ_REG_LCD_VSYNC			0x04
@@ -158,4 +159,15 @@ 
#define JZ_LCD_SIZE01_WIDTH_LSB			0

#define JZ_LCD_SIZE01_HEIGHT_LSB		16



struct device;

struct drm_plane;

struct drm_plane_state;

struct platform_driver;



void ingenic_drm_plane_config(struct device *dev,

			      struct drm_plane *plane, u32 fourcc);

void ingenic_drm_plane_disable(struct device *dev, struct drm_plane *plane);



extern struct platform_driver *ingenic_ipu_driver_ptr;



#endif /* DRIVERS_GPU_DRM_INGENIC_INGENIC_DRM_H */

drivers/gpu/drm/ingenic/ingenic-ipu.c

0 → 100644
+853 −0

File added.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE