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

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

Merge tag 'exynos-drm-next-for-v4.19' of... 

Merge tag 'exynos-drm-next-for-v4.19' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos

 into drm-next

Cleanups
- Change g2d driver to component based driver
  . g2d driver was last customed sub driver so this patch series
    changes it to component based driver, which also makes gem handling
    to be more simplify.
- Cleanup of Exynos DRM suspend/resume
  . Register exynos drm core suspend/resume functions
    to prepare/complete callbacks of dev_pm_ops instead of suspend/resume
    callbacks to ensure exynos_drm_suspend() is called before any suspend
    callback from the real devices to avoid some issues on boards with
    complex pipelines.
  . Also Add pm_runtime_furce_suspend/resume as SYSTEM_SLEEP_PM_OPS
    to ensure that resources of each devices will be released
    for the system PM suspend/resume cycle.
- Remove local value not used.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

Link: https://patchwork.freedesktop.org/patch/msgid/1532505748-10025-1-git-send-email-inki.dae@samsung.com
parents 52ea6a11 3f2b78d6

drivers/gpu/drm/exynos/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ 
# Direct Rendering Infrastructure (DRI) in XFree86 4.1.0 and higher.



exynosdrm-y := exynos_drm_drv.o exynos_drm_crtc.o exynos_drm_fb.o \

		exynos_drm_gem.o exynos_drm_core.o exynos_drm_plane.o

		exynos_drm_gem.o exynos_drm_plane.o



exynosdrm-$(CONFIG_DRM_FBDEV_EMULATION) += exynos_drm_fbdev.o

exynosdrm-$(CONFIG_DRM_EXYNOS_IOMMU) += exynos_drm_iommu.o

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+5 −3
Original line number Diff line number Diff line
@@ -265,7 +265,7 @@ static void decon_win_set_pixfmt(struct decon_context *ctx, unsigned int win, 
	unsigned long val;



	val = readl(ctx->addr + DECON_WINCONx(win));

	val &= ~WINCONx_BPPMODE_MASK;

	val &= WINCONx_ENWIN_F;



	switch (fb->format->format) {

	case DRM_FORMAT_XRGB1555:
@@ -356,8 +356,8 @@ static void decon_update_plane(struct exynos_drm_crtc *crtc, 
		writel(val, ctx->addr + DECON_VIDOSDxB(win));

	}



	val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |

		VIDOSD_Wx_ALPHA_B_F(0x0);

	val = VIDOSD_Wx_ALPHA_R_F(0xff) | VIDOSD_Wx_ALPHA_G_F(0xff) |

		VIDOSD_Wx_ALPHA_B_F(0xff);

	writel(val, ctx->addr + DECON_VIDOSDxC(win));



	val = VIDOSD_Wx_ALPHA_R_F(0x0) | VIDOSD_Wx_ALPHA_G_F(0x0) |
@@ -673,6 +673,8 @@ static int exynos5433_decon_resume(struct device *dev) 
static const struct dev_pm_ops exynos5433_decon_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos5433_decon_suspend, exynos5433_decon_resume,

			   NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				     pm_runtime_force_resume)

};



static const struct of_device_id exynos5433_decon_driver_dt_match[] = {

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+2 −0
Original line number Diff line number Diff line
@@ -832,6 +832,8 @@ static int exynos7_decon_resume(struct device *dev) 
static const struct dev_pm_ops exynos7_decon_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos7_decon_suspend, exynos7_decon_resume,

			   NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

};



struct platform_driver decon_driver = {

drivers/gpu/drm/exynos/exynos_dp.c

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

#include <linux/of_graph.h>

#include <linux/component.h>

#include <linux/pm_runtime.h>

#include <video/of_display_timing.h>

#include <video/of_videomode.h>

#include <video/videomode.h>
@@ -278,6 +279,8 @@ static int exynos_dp_resume(struct device *dev) 


static const struct dev_pm_ops exynos_dp_pm_ops = {

	SET_RUNTIME_PM_OPS(exynos_dp_suspend, exynos_dp_resume, NULL)

	SET_SYSTEM_SLEEP_PM_OPS(pm_runtime_force_suspend,

				pm_runtime_force_resume)

};



static const struct of_device_id exynos_dp_match[] = {

drivers/gpu/drm/exynos/exynos_drm_core.c

deleted100644 → 0
+0 −119
Original line number Diff line number Diff line 
/* exynos_drm_core.c

 *

 * Copyright (c) 2011 Samsung Electronics Co., Ltd.

 * Author:

 *	Inki Dae <inki.dae@samsung.com>

 *	Joonyoung Shim <jy0922.shim@samsung.com>

 *	Seung-Woo Kim <sw0312.kim@samsung.com>

 *

 * This program is free software; you can redistribute  it and/or modify it

 * under  the terms of  the GNU General  Public License as published by the

 * Free Software Foundation;  either version 2 of the  License, or (at your

 * option) any later version.

 */



#include <drm/drmP.h>



#include "exynos_drm_drv.h"

#include "exynos_drm_crtc.h"



static LIST_HEAD(exynos_drm_subdrv_list);



int exynos_drm_subdrv_register(struct exynos_drm_subdrv *subdrv)

{

	if (!subdrv)

		return -EINVAL;



	list_add_tail(&subdrv->list, &exynos_drm_subdrv_list);



	return 0;

}



int exynos_drm_subdrv_unregister(struct exynos_drm_subdrv *subdrv)

{

	if (!subdrv)

		return -EINVAL;



	list_del(&subdrv->list);



	return 0;

}



int exynos_drm_device_subdrv_probe(struct drm_device *dev)

{

	struct exynos_drm_subdrv *subdrv, *n;

	int err;



	if (!dev)

		return -EINVAL;



	list_for_each_entry_safe(subdrv, n, &exynos_drm_subdrv_list, list) {

		if (subdrv->probe) {

			subdrv->drm_dev = dev;



			/*

			 * this probe callback would be called by sub driver

			 * after setting of all resources to this sub driver,

			 * such as clock, irq and register map are done.

			 */

			err = subdrv->probe(dev, subdrv->dev);

			if (err) {

				DRM_DEBUG("exynos drm subdrv probe failed.\n");

				list_del(&subdrv->list);

				continue;

			}

		}

	}



	return 0;

}



int exynos_drm_device_subdrv_remove(struct drm_device *dev)

{

	struct exynos_drm_subdrv *subdrv;



	if (!dev) {

		WARN(1, "Unexpected drm device unregister!\n");

		return -EINVAL;

	}



	list_for_each_entry(subdrv, &exynos_drm_subdrv_list, list) {

		if (subdrv->remove)

			subdrv->remove(dev, subdrv->dev);

	}



	return 0;

}



int exynos_drm_subdrv_open(struct drm_device *dev, struct drm_file *file)

{

	struct exynos_drm_subdrv *subdrv;

	int ret;



	list_for_each_entry(subdrv, &exynos_drm_subdrv_list, list) {

		if (subdrv->open) {

			ret = subdrv->open(dev, subdrv->dev, file);

			if (ret)

				goto err;

		}

	}



	return 0;



err:

	list_for_each_entry_continue_reverse(subdrv, &exynos_drm_subdrv_list, list) {

		if (subdrv->close)

			subdrv->close(dev, subdrv->dev, file);

	}

	return ret;

}



void exynos_drm_subdrv_close(struct drm_device *dev, struct drm_file *file)

{

	struct exynos_drm_subdrv *subdrv;



	list_for_each_entry(subdrv, &exynos_drm_subdrv_list, list) {

		if (subdrv->close)

			subdrv->close(dev, subdrv->dev, file);

	}

}