Skip to content

Commit 72fdb40

Browse files
danvetdanvet
committed
drm: extract drm_atomic_uapi.c
This leaves all the commit/check and state handling in drm_atomic.c, while pulling all the uapi glue and the huge ioctl itself into a seprate file. This seems to almost perfectly split the rather big drm_atomic.c file into 2 equal sizes. Also adjust the kerneldoc and type a very terse overview text. v2: Rebase. v3: Fix tiny typo. v4: - Fixup armada, newly converted atomic driver hooray! - Fixup msm/dpu1, newly added too. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> Cc: David Airlie <airlied@linux.ie> Cc: Gustavo Padovan <gustavo@padovan.org> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> Cc: Sean Paul <seanpaul@chromium.org> Cc: Jani Nikula <jani.nikula@linux.intel.com> Cc: Joonas Lahtinen <joonas.lahtinen@linux.intel.com> Cc: Rodrigo Vivi <rodrigo.vivi@intel.com> Cc: Rob Clark <robdclark@gmail.com> Cc: Eric Anholt <eric@anholt.net> Cc: intel-gfx@lists.freedesktop.org Cc: linux-arm-msm@vger.kernel.org Cc: freedreno@lists.freedesktop.org Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180905135711.28370-7-daniel.vetter@ffwll.ch
1 parent 2ec04b3 commit 72fdb40

18 files changed

+1483
-1375
lines changed

‎Documentation/gpu/drm-kms.rst

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,6 +287,15 @@ Atomic Mode Setting Function Reference
287287
.. kernel-doc:: drivers/gpu/drm/drm_atomic.c
288288
:export:
289289

290+
Atomic Mode Setting IOCTL and UAPI Functions
291+
--------------------------------------------
292+
293+
.. kernel-doc:: drivers/gpu/drm/drm_atomic_uapi.c
294+
:doc: overview
295+
296+
.. kernel-doc:: drivers/gpu/drm/drm_atomic_uapi.c
297+
:export:
298+
290299
CRTC Abstraction
291300
================
292301

@@ -563,7 +572,7 @@ Tile Group Property
563572
Explicit Fencing Properties
564573
---------------------------
565574

566-
.. kernel-doc:: drivers/gpu/drm/drm_atomic.c
575+
.. kernel-doc:: drivers/gpu/drm/drm_atomic_uapi.c
567576
:doc: explicit fencing properties
568577

569578
Existing KMS Properties

‎drivers/gpu/drm/Makefile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ drm-y := drm_auth.o drm_bufs.o drm_cache.o \
1818
drm_encoder.o drm_mode_object.o drm_property.o \
1919
drm_plane.o drm_color_mgmt.o drm_print.o \
2020
drm_dumb_buffers.o drm_mode_config.o drm_vblank.o \
21-
drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o
21+
drm_syncobj.o drm_lease.o drm_writeback.o drm_client.o \
22+
drm_atomic_uapi.o
2223

2324
drm-$(CONFIG_DRM_LIB_RANDOM) += lib/drm_random.o
2425
drm-$(CONFIG_DRM_VM) += drm_vm.o

‎drivers/gpu/drm/armada/armada_overlay.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
*/
99
#include <drm/drmP.h>
1010
#include <drm/drm_atomic.h>
11+
#include <drm/drm_atomic_uapi.h>
1112
#include <drm/drm_atomic_helper.h>
1213
#include <drm/drm_plane_helper.h>
1314
#include <drm/armada_drm.h>

0 commit comments

Comments
 (0)