]>
Commit | Line | Data |
---|---|---|
b9b3ea8b JR |
1 | --- NVIDIA-Linux-x86_64-390.143-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c~ 2021-03-12 08:31:39.000000000 +0100 |
2 | +++ NVIDIA-Linux-x86_64-390.143-no-compat32/kernel/nvidia-drm/nvidia-drm-crtc.c 2021-07-02 20:27:35.094061481 +0200 | |
3 | @@ -39,6 +39,8 @@ | |
4 | #include <drm/drm_atomic.h> | |
5 | #include <drm/drm_atomic_helper.h> | |
6 | ||
7 | +#include <linux/version.h> | |
8 | + | |
9 | static const u32 nv_default_supported_plane_drm_formats[] = { | |
10 | DRM_FORMAT_ARGB1555, | |
11 | DRM_FORMAT_XRGB1555, | |
12 | @@ -131,12 +133,19 @@ | |
13 | } | |
14 | ||
15 | static int nv_drm_plane_atomic_check(struct drm_plane *plane, | |
16 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0) | |
17 | struct drm_plane_state *plane_state) | |
18 | +#else | |
19 | + struct drm_atomic_state *state) | |
20 | +#endif | |
21 | { | |
22 | int i; | |
23 | struct drm_crtc *crtc; | |
24 | struct drm_crtc_state *crtc_state; | |
25 | NvKmsKapiPlaneType type; | |
26 | +#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 13, 0) | |
27 | + struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(state, plane); | |
28 | +#endif | |
29 | ||
30 | if (NV_DRM_WARN(!drm_plane_type_to_nvkms_plane_type(plane->type, &type))) { | |
31 | goto done; | |
32 | @@ -175,12 +175,20 @@ | |
33 | } | |
34 | ||
35 | static void nv_drm_plane_atomic_update(struct drm_plane *plane, | |
36 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0) | |
37 | struct drm_plane_state *old_state) | |
38 | +#else | |
39 | + struct drm_atomic_state *state) | |
40 | +#endif | |
41 | { | |
42 | } | |
43 | ||
44 | static void nv_drm_plane_atomic_disable(struct drm_plane *plane, | |
45 | +#if LINUX_VERSION_CODE < KERNEL_VERSION(5, 13, 0) | |
46 | struct drm_plane_state *old_state) | |
47 | +#else | |
48 | + struct drm_atomic_state *state) | |
49 | +#endif | |
50 | { | |
51 | } | |
52 |