mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-29 13:46:49 +00:00
xf86-video-nvidia: add fix for kernel 4.14.0
This commit is contained in:
parent
9bb24f6920
commit
c8835203ca
@ -0,0 +1,59 @@
|
|||||||
|
diff --git a/kernel/nvidia-drm/nvidia-drm-crtc.c b/kernel/nvidia-drm/nvidia-drm-crtc.c
|
||||||
|
index 4d9bdf3..e2f4f46 100644
|
||||||
|
--- a/kernel/nvidia-drm/nvidia-drm-crtc.c
|
||||||
|
+++ b/kernel/nvidia-drm/nvidia-drm-crtc.c
|
||||||
|
@@ -162,7 +162,8 @@ static void nvidia_crtc_disable(struct drm_crtc *crtc)
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
-static void nvidia_crtc_enable(struct drm_crtc *crtc)
|
||||||
|
+static void nvidia_crtc_enable(struct drm_crtc *crtc,
|
||||||
|
+ struct drm_crtc_state *old_state)
|
||||||
|
{
|
||||||
|
|
||||||
|
}
|
||||||
|
@@ -170,7 +171,7 @@ static void nvidia_crtc_enable(struct drm_crtc *crtc)
|
||||||
|
static const struct drm_crtc_helper_funcs nv_crtc_helper_funcs = {
|
||||||
|
.prepare = nvidia_crtc_prepare,
|
||||||
|
.commit = nvidia_crtc_commit,
|
||||||
|
- .enable = nvidia_crtc_enable,
|
||||||
|
+ .atomic_enable = nvidia_crtc_enable,
|
||||||
|
.disable = nvidia_crtc_disable,
|
||||||
|
.mode_fixup = nvidia_crtc_mode_fixup,
|
||||||
|
};
|
||||||
|
@@ -223,10 +224,9 @@ static struct drm_plane *nvidia_plane_create
|
||||||
|
dev,
|
||||||
|
plane, crtc_mask, funcs,
|
||||||
|
formats, formats_count,
|
||||||
|
+ NULL,
|
||||||
|
plane_type
|
||||||
|
-#if defined(NV_DRM_INIT_FUNCTIONS_HAVE_NAME_ARG)
|
||||||
|
, NULL
|
||||||
|
-#endif
|
||||||
|
);
|
||||||
|
|
||||||
|
if (ret != 0)
|
||||||
|
@@ -354,9 +354,7 @@ struct drm_crtc *nvidia_drm_add_crtc(struct drm_device *dev, NvU32 head)
|
||||||
|
&nv_crtc->base,
|
||||||
|
primary_plane, cursor_plane,
|
||||||
|
&nv_crtc_funcs
|
||||||
|
-#if defined(NV_DRM_INIT_FUNCTIONS_HAVE_NAME_ARG)
|
||||||
|
, NULL
|
||||||
|
-#endif
|
||||||
|
);
|
||||||
|
|
||||||
|
if (ret != 0)
|
||||||
|
diff --git a/kernel/nvidia-drm/nvidia-drm-encoder.c b/kernel/nvidia-drm/nvidia-drm-encoder.c
|
||||||
|
index 9d3a267..512182c 100644
|
||||||
|
--- a/kernel/nvidia-drm/nvidia-drm-encoder.c
|
||||||
|
+++ b/kernel/nvidia-drm/nvidia-drm-encoder.c
|
||||||
|
@@ -150,9 +150,7 @@ nvidia_encoder_new(struct drm_device *dev,
|
||||||
|
ret = drm_encoder_init(dev,
|
||||||
|
&nv_encoder->base, &nv_encoder_funcs,
|
||||||
|
nvkms_connector_signal_to_drm_encoder_signal(format)
|
||||||
|
-#if defined(NV_DRM_INIT_FUNCTIONS_HAVE_NAME_ARG)
|
||||||
|
, NULL
|
||||||
|
-#endif
|
||||||
|
);
|
||||||
|
|
||||||
|
if (ret != 0)
|
Loading…
x
Reference in New Issue
Block a user