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

Merge tag 'exynos-drm-next-for-v5.6' of... 

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

 into drm-next

Change Exynos DRM specific callback function names
- it changes enable and disable callback functions names of
  struct exynos_drm_crtc_ops to atomic_enable and atomic_disable
  for consistency.
Modify "EXYNOS" prefix to "Exynos"
- "Exynos" name is a regular trademarked name promoted by its
  manufacturer, Samsung Electronics Co., Ltd.. This patch
  corrects the name.

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

From: Inki Dae <inki.dae@samsung.com>
Link: https://patchwork.freedesktop.org/patch/msgid/1579567970-4467-1-git-send-email-inki.dae@samsung.com
parents 61ff410f c0bf499f

drivers/gpu/drm/exynos/Kconfig

+3 −3
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

config DRM_EXYNOS

	tristate "DRM Support for Samsung SoC EXYNOS Series"

	tristate "DRM Support for Samsung SoC Exynos Series"

	depends on OF && DRM && (ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || ARCH_MULTIPLATFORM || COMPILE_TEST)

	depends on MMU

	select DRM_KMS_HELPER

	select VIDEOMODE_HELPERS

	select SND_SOC_HDMI_CODEC if SND_SOC

	help

	  Choose this option if you have a Samsung SoC EXYNOS chipset.

	  Choose this option if you have a Samsung SoC Exynos chipset.

	  If M is selected the module will be called exynosdrm.



if DRM_EXYNOS
@@ -62,7 +62,7 @@ config DRM_EXYNOS_DSI 
	  This enables support for Exynos MIPI-DSI device.



config DRM_EXYNOS_DP

	bool "EXYNOS specific extensions for Analogix DP driver"

	bool "Exynos specific extensions for Analogix DP driver"

	depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON

	select DRM_ANALOGIX_DP

	default DRM_EXYNOS

drivers/gpu/drm/exynos/exynos5433_drm_decon.c

+5 −5
Original line number Diff line number Diff line
@@ -510,7 +510,7 @@ static void decon_swreset(struct decon_context *ctx) 
	       ctx->addr + DECON_CRCCTRL);

}



static void decon_enable(struct exynos_drm_crtc *crtc)

static void decon_atomic_enable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;
@@ -523,7 +523,7 @@ static void decon_enable(struct exynos_drm_crtc *crtc) 
	decon_commit(ctx->crtc);

}



static void decon_disable(struct exynos_drm_crtc *crtc)

static void decon_atomic_disable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;

	int i;
@@ -599,8 +599,8 @@ static enum drm_mode_status decon_mode_valid(struct exynos_drm_crtc *crtc, 
}



static const struct exynos_drm_crtc_ops decon_crtc_ops = {

	.enable			= decon_enable,

	.disable		= decon_disable,

	.atomic_enable		= decon_atomic_enable,

	.atomic_disable		= decon_atomic_disable,

	.enable_vblank		= decon_enable_vblank,

	.disable_vblank		= decon_disable_vblank,

	.atomic_begin		= decon_atomic_begin,
@@ -651,7 +651,7 @@ static void decon_unbind(struct device *dev, struct device *master, void *data) 
{

	struct decon_context *ctx = dev_get_drvdata(dev);



	decon_disable(ctx->crtc);

	decon_atomic_disable(ctx->crtc);



	/* detach this sub driver from iommu mapping if supported. */

	exynos_drm_unregister_dma(ctx->drm_dev, ctx->dev);

drivers/gpu/drm/exynos/exynos7_drm_decon.c

+5 −5
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ static void decon_init(struct decon_context *ctx) 
		writel(VIDCON1_VCLK_HOLD, ctx->regs + VIDCON1(0));

}



static void decon_enable(struct exynos_drm_crtc *crtc)

static void decon_atomic_enable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;
@@ -546,7 +546,7 @@ static void decon_enable(struct exynos_drm_crtc *crtc) 
	ctx->suspended = false;

}



static void decon_disable(struct exynos_drm_crtc *crtc)

static void decon_atomic_disable(struct exynos_drm_crtc *crtc)

{

	struct decon_context *ctx = crtc->ctx;

	int i;
@@ -568,8 +568,8 @@ static void decon_disable(struct exynos_drm_crtc *crtc) 
}



static const struct exynos_drm_crtc_ops decon_crtc_ops = {

	.enable = decon_enable,

	.disable = decon_disable,

	.atomic_enable = decon_atomic_enable,

	.atomic_disable = decon_atomic_disable,

	.enable_vblank = decon_enable_vblank,

	.disable_vblank = decon_disable_vblank,

	.atomic_begin = decon_atomic_begin,
@@ -653,7 +653,7 @@ static void decon_unbind(struct device *dev, struct device *master, 
{

	struct decon_context *ctx = dev_get_drvdata(dev);



	decon_disable(ctx->crtc);

	decon_atomic_disable(ctx->crtc);



	if (ctx->encoder)

		exynos_dpi_remove(ctx->encoder);

drivers/gpu/drm/exynos/exynos_drm_crtc.c

+4 −4
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ static void exynos_drm_crtc_atomic_enable(struct drm_crtc *crtc, 
{

	struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);



	if (exynos_crtc->ops->enable)

		exynos_crtc->ops->enable(exynos_crtc);

	if (exynos_crtc->ops->atomic_enable)

		exynos_crtc->ops->atomic_enable(exynos_crtc);



	drm_crtc_vblank_on(crtc);

}
@@ -36,8 +36,8 @@ static void exynos_drm_crtc_atomic_disable(struct drm_crtc *crtc, 


	drm_crtc_vblank_off(crtc);



	if (exynos_crtc->ops->disable)

		exynos_crtc->ops->disable(exynos_crtc);

	if (exynos_crtc->ops->atomic_disable)

		exynos_crtc->ops->atomic_disable(exynos_crtc);



	if (crtc->state->event && !crtc->state->active) {

		spin_lock_irq(&crtc->dev->event_lock);

drivers/gpu/drm/exynos/exynos_drm_drv.h

+4 −4
Original line number Diff line number Diff line
@@ -118,8 +118,8 @@ struct exynos_drm_plane_config { 
/*

 * Exynos drm crtc ops

 *

 * @enable: enable the device

 * @disable: disable the device

 * @atomic_enable: enable the device

 * @atomic_disable: disable the device

 * @enable_vblank: specific driver callback for enabling vblank interrupt.

 * @disable_vblank: specific driver callback for disabling vblank interrupt.

 * @mode_valid: specific driver callback for mode validation
@@ -133,8 +133,8 @@ struct exynos_drm_plane_config { 
 */

struct exynos_drm_crtc;

struct exynos_drm_crtc_ops {

	void (*enable)(struct exynos_drm_crtc *crtc);

	void (*disable)(struct exynos_drm_crtc *crtc);

	void (*atomic_enable)(struct exynos_drm_crtc *crtc);

	void (*atomic_disable)(struct exynos_drm_crtc *crtc);

	int (*enable_vblank)(struct exynos_drm_crtc *crtc);

	void (*disable_vblank)(struct exynos_drm_crtc *crtc);

	enum drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,

CRA Git | Maintained and supported by SUSTech CRA and CCSE