Commit 64c026e2 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

Inki writes:
      This is initial pull request for Exynos. It includes a big change
       that it makes drm_display_mode for timings parameters to be used
       for exynos4 and exynos5 commonly and cleans up unnecessary codes.
       And also it adds device tree support for fimd to get timing values
       and interrupt source from dts file.

       In addition, one more patch, device tree support feature for Exynos
       FIMC, is being reviewed. This patch was posted a little ago like below,
            http://www.mail-archive.com/linux-samsung-soc@vger.kernel.org/msg17568.html

       So we are going to request git pull one more time after reviewed.

* 'exynos-drm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos:
  drm/exynos: prepare FIMD clocks
  Revert "of/exynos_g2d: Add Bindings for exynos G2D driver"
  drm/exynos: drm_connector: Fix error check condition
  drm/exynos: drm_rotator: Fix incorrect usage of IS_ERR_OR_NULL
  drm/exynos: mixer: Fix incorrect usage of IS_ERR_OR_NULL
  drm/exynos: hdmi: Fix incorrect usage of IS_ERR_OR_NULL
  drm/exynos: change the method for getting the interrupt
  drm/exynos: enable OF_VIDEOMODE and FB_MODE_HELPERS for exynos drm fimd
  drm/exynos: Add display-timing node parsing using video helper function
  drm/exynos: hdmi: move mode_fixup to drm common hdmi
  drm/exynos: hdmi: using drm_display_mode timings for exynos4
parents f0aa848f b4e3a3e8

Documentation/devicetree/bindings/drm/exynos/g2d.txt

deleted100644 → 0
+0 −22
Original line number Diff line number Diff line 
Samsung 2D Graphic Accelerator using DRM frame work



Samsung FIMG2D is a graphics 2D accelerator which supports Bit Block Transfer.

We set the drawing-context registers for configuring rendering parameters and

then start rendering.

This driver is for SOCs which contain G2D IPs with version 4.1.



Required properties:

	-compatible:

		should be "samsung,exynos-g2d-41".

	-reg:

		physical base address of the controller and length

		of memory mapped region.

	-interrupts:

		interrupt combiner values.



Example:

	g2d {

		compatible = "samsung,exynos-g2d-41";

		reg = <0x10850000 0x1000>;

		interrupts = <0 91 0>;

	};

drivers/gpu/drm/exynos/Kconfig

+3 −1
Original line number Diff line number Diff line
@@ -24,7 +24,9 @@ config DRM_EXYNOS_DMABUF 


config DRM_EXYNOS_FIMD

	bool "Exynos DRM FIMD"

	depends on DRM_EXYNOS && !FB_S3C && !ARCH_MULTIPLATFORM

	depends on OF && DRM_EXYNOS && !FB_S3C && !ARCH_MULTIPLATFORM

	select OF_VIDEOMODE

	select FB_MODE_HELPERS

	help

	  Choose this option if you want to use Exynos FIMD for DRM.

drivers/gpu/drm/exynos/exynos_drm_connector.c

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ static int exynos_drm_connector_get_modes(struct drm_connector *connector) 
		}



		count = drm_add_edid_modes(connector, edid);

		if (count < 0) {

		if (!count) {

			DRM_ERROR("Add edid modes failed %d\n", count);

			goto out;

		}

drivers/gpu/drm/exynos/exynos_drm_fimd.c

+33 −7
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/of_device.h>

#include <linux/pm_runtime.h>



#include <video/of_display_timing.h>

#include <video/samsung_fimd.h>

#include <drm/exynos_drm.h>
@@ -884,11 +885,26 @@ static int fimd_probe(struct platform_device *pdev) 


	DRM_DEBUG_KMS("%s\n", __FILE__);



	if (pdev->dev.of_node) {

		pdata = devm_kzalloc(dev, sizeof(*pdata), GFP_KERNEL);

		if (!pdata) {

			DRM_ERROR("memory allocation for pdata failed\n");

			return -ENOMEM;

		}



		ret = of_get_fb_videomode(dev->of_node, &pdata->panel.timing,

					OF_USE_NATIVE_MODE);

		if (ret) {

			DRM_ERROR("failed: of_get_fb_videomode() : %d\n", ret);

			return ret;

		}

	} else {

		pdata = pdev->dev.platform_data;

		if (!pdata) {

		dev_err(dev, "no platform data specified\n");

			DRM_ERROR("no platform data specified\n");

			return -EINVAL;

		}

	}



	panel = &pdata->panel;

	if (!panel) {
@@ -918,7 +934,7 @@ static int fimd_probe(struct platform_device *pdev) 
	if (IS_ERR(ctx->regs))

		return PTR_ERR(ctx->regs);



	res = platform_get_resource(pdev, IORESOURCE_IRQ, 0);

	res = platform_get_resource_byname(pdev, IORESOURCE_IRQ, "vsync");

	if (!res) {

		dev_err(dev, "irq request failed.\n");

		return -ENXIO;
@@ -933,6 +949,16 @@ static int fimd_probe(struct platform_device *pdev) 
		return ret;

	}



	ret = clk_prepare(ctx->bus_clk);

	if (ret < 0)

		return ret;



	ret = clk_prepare(ctx->lcd_clk);

	if  (ret < 0) {

		clk_unprepare(ctx->bus_clk);

		return ret;

	}



	ctx->vidcon0 = pdata->vidcon0;

	ctx->vidcon1 = pdata->vidcon1;

	ctx->default_win = pdata->default_win;
@@ -980,8 +1006,8 @@ static int fimd_remove(struct platform_device *pdev) 
	if (ctx->suspended)

		goto out;



	clk_disable(ctx->lcd_clk);

	clk_disable(ctx->bus_clk);

	clk_unprepare(ctx->lcd_clk);

	clk_unprepare(ctx->bus_clk);



	pm_runtime_set_suspended(dev);

	pm_runtime_put_sync(dev);

drivers/gpu/drm/exynos/exynos_drm_hdmi.c

+36 −4
Original line number Diff line number Diff line
@@ -205,13 +205,45 @@ static void drm_hdmi_mode_fixup(struct device *subdrv_dev, 
				const struct drm_display_mode *mode,

				struct drm_display_mode *adjusted_mode)

{

	struct drm_hdmi_context *ctx = to_context(subdrv_dev);

	struct drm_display_mode *m;

	int mode_ok;



	DRM_DEBUG_KMS("%s\n", __FILE__);



	if (hdmi_ops && hdmi_ops->mode_fixup)

		hdmi_ops->mode_fixup(ctx->hdmi_ctx->ctx, connector, mode,

				     adjusted_mode);

	drm_mode_set_crtcinfo(adjusted_mode, 0);



	mode_ok = drm_hdmi_check_timing(subdrv_dev, adjusted_mode);



	/* just return if user desired mode exists. */

	if (mode_ok == 0)

		return;



	/*

	 * otherwise, find the most suitable mode among modes and change it

	 * to adjusted_mode.

	 */

	list_for_each_entry(m, &connector->modes, head) {

		mode_ok = drm_hdmi_check_timing(subdrv_dev, m);



		if (mode_ok == 0) {

			struct drm_mode_object base;

			struct list_head head;



			DRM_INFO("desired mode doesn't exist so\n");

			DRM_INFO("use the most suitable mode among modes.\n");



			DRM_DEBUG_KMS("Adjusted Mode: [%d]x[%d] [%d]Hz\n",

				m->hdisplay, m->vdisplay, m->vrefresh);



			/* preserve display mode header while copying. */

			head = adjusted_mode->head;

			base = adjusted_mode->base;

			memcpy(adjusted_mode, m, sizeof(*m));

			adjusted_mode->head = head;

			adjusted_mode->base = base;

			break;

		}

	}

}



static void drm_hdmi_mode_set(struct device *subdrv_dev, void *mode)

CRA Git | Maintained and supported by SUSTech CRA and CCSE