From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 9 Apr 2024 16:24:37 +0000 (-0700)
Subject: Merge tag 'drm-fixes-2024-04-09' of https://gitlab.freedesktop.org/drm/kernel
X-Git-Tag: v6.9-rc4-pxa1908~65
X-Git-Url: https://git.dujemihanovic.xyz/?a=commitdiff_plain;h=2c71fdf02a95b3dd425b42f28fd47fb2b1d22702;p=linux.git

Merge tag 'drm-fixes-2024-04-09' of https://gitlab.freedesktop.org/drm/kernel

Pull drm nouveau fix from Dave Airlie:
 "A previous fix to nouveau devinit on the GSP paths fixed the Turing
  but broke Ampere, I did some more digging and found the proper fix.
  Sending it early as I want to make sure it makes the next 6.8 stable
  kernels to fix the regression.

  Regular fixes will be at end of week as usual.

  nouveau:

   - regression fix for GSP display enable"

* tag 'drm-fixes-2024-04-09' of https://gitlab.freedesktop.org/drm/kernel:
  nouveau: fix devinit paths to only handle display on GSP.
---

2c71fdf02a95b3dd425b42f28fd47fb2b1d22702