Skip to content

Commit a436c77

Browse files
committed
Merge tag 'exynos-drm-next-for-v6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos into drm-next
Three cleanups - Drop stale exynos file pattern from MAINTAINERS file The old "exynos" directory is removed from MAINTAINERS as Samsung Exynos display bindings have been relocated. This resolves a warning from get_maintainers.pl about no files matching the outdated directory. - Constify struct exynos_drm_ipp_funcs By making struct exynos_drm_ipp_funcs constant, the patch enhances security by moving the structure to a read-only section of memory. This change results in a slight reduction in the data section size. - Remove unnecessary code The function exynos_atomic_commit is removed as it became redundant after a previous update. This cleans up the code and eliminates unused function declarations. One fixup - Fix wrong assignment in gsc_bind() A double assignment in gsc_bind() was flagged by the cocci tool and corrected to fix an incorrect assignment, addressing a potential issue introduced in a prior commit. Signed-off-by: Dave Airlie <[email protected]> From: Inki Dae <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
2 parents 741d73f + 94ebc3d commit a436c77

File tree

5 files changed

+4
-9
lines changed

5 files changed

+4
-9
lines changed

MAINTAINERS

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7475,7 +7475,6 @@ M: Kyungmin Park <[email protected]>
74757475
74767476
S: Supported
74777477
T: git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git
7478-
F: Documentation/devicetree/bindings/display/exynos/
74797478
F: Documentation/devicetree/bindings/display/samsung/
74807479
F: drivers/gpu/drm/exynos/
74817480
F: include/uapi/drm/exynos_drm.h

drivers/gpu/drm/exynos/exynos_drm_drv.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -254,10 +254,6 @@ static inline int exynos_drm_check_fimc_device(struct device *dev)
254254
}
255255
#endif
256256

257-
int exynos_atomic_commit(struct drm_device *dev, struct drm_atomic_state *state,
258-
bool nonblock);
259-
260-
261257
extern struct platform_driver fimd_driver;
262258
extern struct platform_driver exynos5433_decon_driver;
263259
extern struct platform_driver decon_driver;

drivers/gpu/drm/exynos/exynos_drm_fimc.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1125,7 +1125,7 @@ static void fimc_abort(struct exynos_drm_ipp *ipp,
11251125
}
11261126
}
11271127

1128-
static struct exynos_drm_ipp_funcs ipp_funcs = {
1128+
static const struct exynos_drm_ipp_funcs ipp_funcs = {
11291129
.commit = fimc_commit,
11301130
.abort = fimc_abort,
11311131
};

drivers/gpu/drm/exynos/exynos_drm_gsc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1162,7 +1162,7 @@ static void gsc_abort(struct exynos_drm_ipp *ipp,
11621162
}
11631163
}
11641164

1165-
static struct exynos_drm_ipp_funcs ipp_funcs = {
1165+
static const struct exynos_drm_ipp_funcs ipp_funcs = {
11661166
.commit = gsc_commit,
11671167
.abort = gsc_abort,
11681168
};
@@ -1174,7 +1174,7 @@ static int gsc_bind(struct device *dev, struct device *master, void *data)
11741174
struct exynos_drm_ipp *ipp = &ctx->ipp;
11751175

11761176
ctx->drm_dev = drm_dev;
1177-
ctx->drm_dev = drm_dev;
1177+
ipp->drm_dev = drm_dev;
11781178
exynos_drm_register_dma(drm_dev, dev, &ctx->dma_priv);
11791179

11801180
exynos_drm_ipp_register(dev, ipp, &ipp_funcs,

drivers/gpu/drm/exynos/exynos_drm_scaler.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -403,7 +403,7 @@ static int scaler_commit(struct exynos_drm_ipp *ipp,
403403
return 0;
404404
}
405405

406-
static struct exynos_drm_ipp_funcs ipp_funcs = {
406+
static const struct exynos_drm_ipp_funcs ipp_funcs = {
407407
.commit = scaler_commit,
408408
};
409409

0 commit comments

Comments
 (0)