Comments

Kernel – 6.0-rc1 is here – No Surprises.. — 4 Comments

  1. I’ve tweaked juan bruguera’s patch for nv470. It works with 515.65.01 by applying it direct to the run file with –apply-patch

    diff -Naur kernel/nvidia/nv-acpi.c kernel/nvidia/nv-acpi.c
    — kernel/nvidia/nv-acpi.c 2022-07-20 15:32:29.000000000 +0100
    +++ kernel/nvidia/nv-acpi.c 2022-08-15 13:28:33.295924247 +0100
    @@ -28,8 +28,8 @@
    #include “nv-reg.h”

    #include

    -#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED)
    +#include
    +#if defined(NV_LINUX_ACPI_EVENTS_SUPPORTED) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0))
    static NV_STATUS nv_acpi_extract_integer (const union acpi_object *, void *, NvU32, NvU32 *);
    static NV_STATUS nv_acpi_extract_buffer (const union acpi_object *, void *, NvU32, NvU32 *);
    static NV_STATUS nv_acpi_extract_package (const union acpi_object *, void *, NvU32, NvU32 *);
    diff -Naur kernel/nvidia/nv.c kernel/nvidia/nv.c
    — kernel/nvidia/nv.c 2022-07-20 15:32:29.000000000 +0100
    +++ kernel/nvidia/nv.c 2022-08-15 13:32:12.222653466 +0100
    @@ -5428,7 +5428,7 @@
    {
    NvU8 buf[8];

    -#if defined(NV_SEQ_READ_ITER_PRESENT)
    +#if defined(NV_SEQ_READ_ITER_PRESENT) && (LINUX_VERSION_CODE < KERNEL_VERSION(6, 0, 0))
    struct file *file;
    ssize_t num_read;
    struct kiocb kiocb;
    diff -Naur kernel/nvidia-drm/nvidia-drm-helper.c kernel/nvidia-drm/nvidia-drm-helper.c
    — kernel/nvidia-drm/nvidia-drm-helper.c 2022-07-20 14:42:53.000000000 +0100
    +++ kernel/nvidia-drm/nvidia-drm-helper.c 2022-08-15 13:26:13.156737883 +0100
    @@ -41,6 +41,11 @@
    #include
    #endif

    +// Add header which is no longer indirectly referenced as of Linux 6.0-rc1
    +#if defined(NV_DRM_DRM_FRAMEBUFFER_H_PRESENT)
    +#include
    +#endif
    +
    static void __nv_drm_framebuffer_put(struct drm_framebuffer *fb)
    {
    #if defined(NV_DRM_FRAMEBUFFER_GET_PRESENT)

  2. Looks like the text between the chars was interpreted by the comment management software as HTML tag and hence, omitted.

    As a consequence, there are a lot of lines containing only #include, without an argument. Verified this against the source files, and it does not appear to be correct.

  3. I’ve only just checked back on this. Sorry I missed those omissions. In the correct order the missing items (all in chevrons) are:
    linux/acpi.h
    drm/drm_atomic_uapi.h
    drm/drm_framebuffer.h
    Jusy in case anyone’s still interested.

  4. Sorry for omissions that I didn’t spot. For those still interested here they are(insert chevrons before using, of course):

    linux/acpi.h
    linux/version.h
    drm/drm_atomic_uapi.h

Leave a Reply

Your email address will not be published.

This site uses Akismet to reduce spam. Learn how your comment data is processed.