Skip to content

Commit a04616a

Browse files
airliedairlied
committed
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: Dave Airlie <[email protected]> From: Inki Dae <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 61ff410 + c0bf499 commit a04616a

File tree

9 files changed

+35
-35
lines changed

9 files changed

+35
-35
lines changed

‎drivers/gpu/drm/exynos/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
# SPDX-License-Identifier: GPL-2.0-only
22
config DRM_EXYNOS
3-
tristate "DRM Support for Samsung SoC EXYNOS Series"
3+
tristate "DRM Support for Samsung SoC Exynos Series"
44
depends on OF && DRM && (ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || ARCH_MULTIPLATFORM || COMPILE_TEST)
55
depends on MMU
66
select DRM_KMS_HELPER
77
select VIDEOMODE_HELPERS
88
select SND_SOC_HDMI_CODEC if SND_SOC
99
help
10-
Choose this option if you have a Samsung SoC EXYNOS chipset.
10+
Choose this option if you have a Samsung SoC Exynos chipset.
1111
If M is selected the module will be called exynosdrm.
1212

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

6464
config DRM_EXYNOS_DP
65-
bool "EXYNOS specific extensions for Analogix DP driver"
65+
bool "Exynos specific extensions for Analogix DP driver"
6666
depends on DRM_EXYNOS_FIMD || DRM_EXYNOS7_DECON
6767
select DRM_ANALOGIX_DP
6868
default DRM_EXYNOS

‎drivers/gpu/drm/exynos/exynos5433_drm_decon.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -510,7 +510,7 @@ static void decon_swreset(struct decon_context *ctx)
510510
ctx->addr + DECON_CRCCTRL);
511511
}
512512

513-
static void decon_enable(struct exynos_drm_crtc *crtc)
513+
static void decon_atomic_enable(struct exynos_drm_crtc *crtc)
514514
{
515515
struct decon_context *ctx = crtc->ctx;
516516

@@ -523,7 +523,7 @@ static void decon_enable(struct exynos_drm_crtc *crtc)
523523
decon_commit(ctx->crtc);
524524
}
525525

526-
static void decon_disable(struct exynos_drm_crtc *crtc)
526+
static void decon_atomic_disable(struct exynos_drm_crtc *crtc)
527527
{
528528
struct decon_context *ctx = crtc->ctx;
529529
int i;
@@ -599,8 +599,8 @@ static enum drm_mode_status decon_mode_valid(struct exynos_drm_crtc *crtc,
599599
}
600600

601601
static const struct exynos_drm_crtc_ops decon_crtc_ops = {
602-
.enable = decon_enable,
603-
.disable = decon_disable,
602+
.atomic_enable = decon_atomic_enable,
603+
.atomic_disable = decon_atomic_disable,
604604
.enable_vblank = decon_enable_vblank,
605605
.disable_vblank = decon_disable_vblank,
606606
.atomic_begin = decon_atomic_begin,
@@ -651,7 +651,7 @@ static void decon_unbind(struct device *dev, struct device *master, void *data)
651651
{
652652
struct decon_context *ctx = dev_get_drvdata(dev);
653653

654-
decon_disable(ctx->crtc);
654+
decon_atomic_disable(ctx->crtc);
655655

656656
/* detach this sub driver from iommu mapping if supported. */
657657
exynos_drm_unregister_dma(ctx->drm_dev, ctx->dev);

‎drivers/gpu/drm/exynos/exynos7_drm_decon.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ static void decon_init(struct decon_context *ctx)
526526
writel(VIDCON1_VCLK_HOLD, ctx->regs + VIDCON1(0));
527527
}
528528

529-
static void decon_enable(struct exynos_drm_crtc *crtc)
529+
static void decon_atomic_enable(struct exynos_drm_crtc *crtc)
530530
{
531531
struct decon_context *ctx = crtc->ctx;
532532

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

549-
static void decon_disable(struct exynos_drm_crtc *crtc)
549+
static void decon_atomic_disable(struct exynos_drm_crtc *crtc)
550550
{
551551
struct decon_context *ctx = crtc->ctx;
552552
int i;
@@ -568,8 +568,8 @@ static void decon_disable(struct exynos_drm_crtc *crtc)
568568
}
569569

570570
static const struct exynos_drm_crtc_ops decon_crtc_ops = {
571-
.enable = decon_enable,
572-
.disable = decon_disable,
571+
.atomic_enable = decon_atomic_enable,
572+
.atomic_disable = decon_atomic_disable,
573573
.enable_vblank = decon_enable_vblank,
574574
.disable_vblank = decon_disable_vblank,
575575
.atomic_begin = decon_atomic_begin,
@@ -653,7 +653,7 @@ static void decon_unbind(struct device *dev, struct device *master,
653653
{
654654
struct decon_context *ctx = dev_get_drvdata(dev);
655655

656-
decon_disable(ctx->crtc);
656+
decon_atomic_disable(ctx->crtc);
657657

658658
if (ctx->encoder)
659659
exynos_dpi_remove(ctx->encoder);

‎drivers/gpu/drm/exynos/exynos_drm_crtc.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ static void exynos_drm_crtc_atomic_enable(struct drm_crtc *crtc,
2323
{
2424
struct exynos_drm_crtc *exynos_crtc = to_exynos_crtc(crtc);
2525

26-
if (exynos_crtc->ops->enable)
27-
exynos_crtc->ops->enable(exynos_crtc);
26+
if (exynos_crtc->ops->atomic_enable)
27+
exynos_crtc->ops->atomic_enable(exynos_crtc);
2828

2929
drm_crtc_vblank_on(crtc);
3030
}
@@ -36,8 +36,8 @@ static void exynos_drm_crtc_atomic_disable(struct drm_crtc *crtc,
3636

3737
drm_crtc_vblank_off(crtc);
3838

39-
if (exynos_crtc->ops->disable)
40-
exynos_crtc->ops->disable(exynos_crtc);
39+
if (exynos_crtc->ops->atomic_disable)
40+
exynos_crtc->ops->atomic_disable(exynos_crtc);
4141

4242
if (crtc->state->event && !crtc->state->active) {
4343
spin_lock_irq(&crtc->dev->event_lock);

‎drivers/gpu/drm/exynos/exynos_drm_drv.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -118,8 +118,8 @@ struct exynos_drm_plane_config {
118118
/*
119119
* Exynos drm crtc ops
120120
*
121-
* @enable: enable the device
122-
* @disable: disable the device
121+
* @atomic_enable: enable the device
122+
* @atomic_disable: disable the device
123123
* @enable_vblank: specific driver callback for enabling vblank interrupt.
124124
* @disable_vblank: specific driver callback for disabling vblank interrupt.
125125
* @mode_valid: specific driver callback for mode validation
@@ -133,8 +133,8 @@ struct exynos_drm_plane_config {
133133
*/
134134
struct exynos_drm_crtc;
135135
struct exynos_drm_crtc_ops {
136-
void (*enable)(struct exynos_drm_crtc *crtc);
137-
void (*disable)(struct exynos_drm_crtc *crtc);
136+
void (*atomic_enable)(struct exynos_drm_crtc *crtc);
137+
void (*atomic_disable)(struct exynos_drm_crtc *crtc);
138138
int (*enable_vblank)(struct exynos_drm_crtc *crtc);
139139
void (*disable_vblank)(struct exynos_drm_crtc *crtc);
140140
enum drm_mode_status (*mode_valid)(struct exynos_drm_crtc *crtc,

‎drivers/gpu/drm/exynos/exynos_drm_fimd.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -894,7 +894,7 @@ static void fimd_disable_plane(struct exynos_drm_crtc *crtc,
894894
fimd_enable_shadow_channel_path(ctx, win, false);
895895
}
896896

897-
static void fimd_enable(struct exynos_drm_crtc *crtc)
897+
static void fimd_atomic_enable(struct exynos_drm_crtc *crtc)
898898
{
899899
struct fimd_context *ctx = crtc->ctx;
900900

@@ -912,7 +912,7 @@ static void fimd_enable(struct exynos_drm_crtc *crtc)
912912
fimd_commit(ctx->crtc);
913913
}
914914

915-
static void fimd_disable(struct exynos_drm_crtc *crtc)
915+
static void fimd_atomic_disable(struct exynos_drm_crtc *crtc)
916916
{
917917
struct fimd_context *ctx = crtc->ctx;
918918
int i;
@@ -1006,8 +1006,8 @@ static void fimd_dp_clock_enable(struct exynos_drm_clk *clk, bool enable)
10061006
}
10071007

10081008
static const struct exynos_drm_crtc_ops fimd_crtc_ops = {
1009-
.enable = fimd_enable,
1010-
.disable = fimd_disable,
1009+
.atomic_enable = fimd_atomic_enable,
1010+
.atomic_disable = fimd_atomic_disable,
10111011
.enable_vblank = fimd_enable_vblank,
10121012
.disable_vblank = fimd_disable_vblank,
10131013
.atomic_begin = fimd_atomic_begin,
@@ -1098,7 +1098,7 @@ static void fimd_unbind(struct device *dev, struct device *master,
10981098
{
10991099
struct fimd_context *ctx = dev_get_drvdata(dev);
11001100

1101-
fimd_disable(ctx->crtc);
1101+
fimd_atomic_disable(ctx->crtc);
11021102

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

‎drivers/gpu/drm/exynos/exynos_drm_vidi.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ static void vidi_update_plane(struct exynos_drm_crtc *crtc,
120120
DRM_DEV_DEBUG_KMS(ctx->dev, "dma_addr = %pad\n", &addr);
121121
}
122122

123-
static void vidi_enable(struct exynos_drm_crtc *crtc)
123+
static void vidi_atomic_enable(struct exynos_drm_crtc *crtc)
124124
{
125125
struct vidi_context *ctx = crtc->ctx;
126126

@@ -133,7 +133,7 @@ static void vidi_enable(struct exynos_drm_crtc *crtc)
133133
drm_crtc_vblank_on(&crtc->base);
134134
}
135135

136-
static void vidi_disable(struct exynos_drm_crtc *crtc)
136+
static void vidi_atomic_disable(struct exynos_drm_crtc *crtc)
137137
{
138138
struct vidi_context *ctx = crtc->ctx;
139139

@@ -147,8 +147,8 @@ static void vidi_disable(struct exynos_drm_crtc *crtc)
147147
}
148148

149149
static const struct exynos_drm_crtc_ops vidi_crtc_ops = {
150-
.enable = vidi_enable,
151-
.disable = vidi_disable,
150+
.atomic_enable = vidi_atomic_enable,
151+
.atomic_disable = vidi_atomic_disable,
152152
.enable_vblank = vidi_enable_vblank,
153153
.disable_vblank = vidi_disable_vblank,
154154
.update_plane = vidi_update_plane,

‎drivers/gpu/drm/exynos/exynos_mixer.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -986,7 +986,7 @@ static void mixer_atomic_flush(struct exynos_drm_crtc *crtc)
986986
exynos_crtc_handle_event(crtc);
987987
}
988988

989-
static void mixer_enable(struct exynos_drm_crtc *crtc)
989+
static void mixer_atomic_enable(struct exynos_drm_crtc *crtc)
990990
{
991991
struct mixer_context *ctx = crtc->ctx;
992992

@@ -1015,7 +1015,7 @@ static void mixer_enable(struct exynos_drm_crtc *crtc)
10151015
set_bit(MXR_BIT_POWERED, &ctx->flags);
10161016
}
10171017

1018-
static void mixer_disable(struct exynos_drm_crtc *crtc)
1018+
static void mixer_atomic_disable(struct exynos_drm_crtc *crtc)
10191019
{
10201020
struct mixer_context *ctx = crtc->ctx;
10211021
int i;
@@ -1109,8 +1109,8 @@ static bool mixer_mode_fixup(struct exynos_drm_crtc *crtc,
11091109
}
11101110

11111111
static const struct exynos_drm_crtc_ops mixer_crtc_ops = {
1112-
.enable = mixer_enable,
1113-
.disable = mixer_disable,
1112+
.atomic_enable = mixer_atomic_enable,
1113+
.atomic_disable = mixer_atomic_disable,
11141114
.enable_vblank = mixer_enable_vblank,
11151115
.disable_vblank = mixer_disable_vblank,
11161116
.atomic_begin = mixer_atomic_begin,

‎include/uapi/drm/exynos_drm.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ struct drm_exynos_ioctl_ipp_commit {
394394
#define DRM_IOCTL_EXYNOS_IPP_COMMIT DRM_IOWR(DRM_COMMAND_BASE + \
395395
DRM_EXYNOS_IPP_COMMIT, struct drm_exynos_ioctl_ipp_commit)
396396

397-
/* EXYNOS specific events */
397+
/* Exynos specific events */
398398
#define DRM_EXYNOS_G2D_EVENT 0x80000000
399399
#define DRM_EXYNOS_IPP_EVENT 0x80000002
400400

0 commit comments

Comments
 (0)