Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 42532512 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'exynos-drm-next' of... 

Merge branch 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next

   Sorry for late. This pull request includes some enhancements
   for Exynos drm, new feature supports, cleanups and fixups
   like below,

   - Consider low power transmission for drm mipi dsi module,
     and also add non-continuous clock mode support for Exynos
     mipi dsi driver.
   - Add Exynos3250 SoC support.
   - Enhance and clean up ipp framework and fimc driver.
   - Update to use component match support and fix up
     de-initialization order.
   - Remove a direct mmap interface and relevant stuff specific to
     Exynos drm, use drm generic mmap interface instead.
     And we will remove the specific interface from userspace
     library, libdrm soon.
   - Use universal plane which allows to replace fake primary plane
     with the real one.
   - Some code cleanups and fixups.

* 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos: (40 commits)
  drm/exynos: switch to universal plane API
  drm/exynos: use drm generic mmap interface
  drm/exynos: remove DRM_EXYNOS_GEM_MAP_OFFSET ioctl
  drm/exynos: factor out initial setting of each driver
  drm/exynos/hdmi: unregister connector on removal
  drm/exynos/dp: unregister connector on removal
  drm/exynos/dpi: unregister connector and panel on removal
  drm/exynos/dsi: unregister connector on removal
  drm/exynos/fb: free exynos framebuffer on error
  drm/exynos/fbdev: fix fbdev gem object cleanup
  drm/exynos: fix drm driver de-initialization order
  drm/exynos/ipp: traverse ipp drivers list safely
  drm/exynos: update to use component match support
  drm/exynos/ipp: add file checks for ioctls
  drm/exynos/ipp: remove file argument from node related functions
  drm/exynos/fimc: fix source buffer registers
  drm/exynos/fimc: simplify buffer queuing
  drm/exynos/fimc: do not enable fimc twice
  drm/exynos/fimc: avoid clearing overflow bits
  drm/exynos/ipp: remove events during command cleaning
  ...
parents 6b654af5 72ed6ccd

Documentation/devicetree/bindings/video/exynos_dsim.txt

+1 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ Exynos MIPI DSI Master 


Required properties:

  - compatible: value should be one of the following

		"samsung,exynos3250-mipi-dsi" /* for Exynos3250/3472 SoCs */

		"samsung,exynos4210-mipi-dsi" /* for Exynos4 SoCs */

		"samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */

  - reg: physical base address and length of the registers set for the device

Documentation/devicetree/bindings/video/samsung-fimd.txt

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ Required properties: 
		"samsung,s3c2443-fimd"; /* for S3C24XX SoCs */

		"samsung,s3c6400-fimd"; /* for S3C64XX SoCs */

		"samsung,s5pv210-fimd"; /* for S5PV210 SoC */

		"samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */

		"samsung,exynos4210-fimd"; /* for Exynos4 SoCs */

		"samsung,exynos5250-fimd"; /* for Exynos5 SoCs */

arch/arm/boot/dts/exynos3250.dtsi

+33 −0
Original line number Diff line number Diff line
@@ -132,6 +132,12 @@ 
			reg = <0x10020000 0x4000>;

		};



		mipi_phy: video-phy@10020710 {

			compatible = "samsung,s5pv210-mipi-video-phy";

			reg = <0x10020710 8>;

			#phy-cells = <1>;

		};



		pd_cam: cam-power-domain@10023C00 {

			compatible = "samsung,exynos4210-pd";

			reg = <0x10023C00 0x20>;
@@ -216,6 +222,33 @@ 
			interrupts = <0 240 0>;

		};



		fimd: fimd@11c00000 {

			compatible = "samsung,exynos3250-fimd";

			reg = <0x11c00000 0x30000>;

			interrupt-names = "fifo", "vsync", "lcd_sys";

			interrupts = <0 84 0>, <0 85 0>, <0 86 0>;

			clocks = <&cmu CLK_SCLK_FIMD0>, <&cmu CLK_FIMD0>;

			clock-names = "sclk_fimd", "fimd";

			samsung,power-domain = <&pd_lcd0>;

			samsung,sysreg = <&sys_reg>;

			status = "disabled";

		};



		dsi_0: dsi@11C80000 {

			compatible = "samsung,exynos3250-mipi-dsi";

			reg = <0x11C80000 0x10000>;

			interrupts = <0 83 0>;

			samsung,phy-type = <0>;

			samsung,power-domain = <&pd_lcd0>;

			phys = <&mipi_phy 1>;

			phy-names = "dsim";

			clocks = <&cmu CLK_DSIM0>, <&cmu CLK_SCLK_MIPI0>;

			clock-names = "bus_clk", "pll_clk";

			#address-cells = <1>;

			#size-cells = <0>;

			status = "disabled";

		};



		mshc_0: mshc@12510000 {

			compatible = "samsung,exynos5250-dw-mshc";

			reg = <0x12510000 0x1000>;

drivers/gpu/drm/drm_mipi_dsi.c

+6 −0
Original line number Diff line number Diff line
@@ -231,6 +231,9 @@ ssize_t mipi_dsi_dcs_write(struct mipi_dsi_device *dsi, const void *data, 
		break;

	}



	if (dsi->mode_flags & MIPI_DSI_MODE_LPM)

		msg.flags = MIPI_DSI_MSG_USE_LPM;



	return ops->transfer(dsi->host, &msg);

}

EXPORT_SYMBOL(mipi_dsi_dcs_write);
@@ -260,6 +263,9 @@ ssize_t mipi_dsi_dcs_read(struct mipi_dsi_device *dsi, u8 cmd, void *data, 
	if (!ops || !ops->transfer)

		return -ENOSYS;



	if (dsi->mode_flags & MIPI_DSI_MODE_LPM)

		msg.flags = MIPI_DSI_MSG_USE_LPM;



	return ops->transfer(dsi->host, &msg);

}

EXPORT_SYMBOL(mipi_dsi_dcs_read);

drivers/gpu/drm/exynos/exynos_dp_core.c

+3 −1
Original line number Diff line number Diff line
@@ -937,6 +937,8 @@ static enum drm_connector_status exynos_dp_detect( 


static void exynos_dp_connector_destroy(struct drm_connector *connector)

{

	drm_connector_unregister(connector);

	drm_connector_cleanup(connector);

}



static struct drm_connector_funcs exynos_dp_connector_funcs = {
@@ -1358,8 +1360,8 @@ static void exynos_dp_unbind(struct device *dev, struct device *master, 


	exynos_dp_dpms(display, DRM_MODE_DPMS_OFF);



	exynos_dp_connector_destroy(&dp->connector);

	encoder->funcs->destroy(encoder);

	drm_connector_cleanup(&dp->connector);

}



static const struct component_ops exynos_dp_ops = {