Commit 88711fa9 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2022-04-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes



drm-misc-fixes for v5.18-rc2:
- Fix a crash when booting with nouveau on tegra.
- Don't require input port for MIPI-DSI, and make width/height mandatory.
- Fix unregistering of framebuffers without device.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/58fa2262-3eb6-876d-7157-ab7a135696b7@linux.intel.com
parents 995f7480 1ecc0c09
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -51,7 +51,6 @@ properties:
          Video port for MIPI DPI output (panel or connector).

    required:
      - port@0
      - port@1

required:
+0 −1
Original line number Diff line number Diff line
@@ -39,7 +39,6 @@ properties:
          Video port for MIPI DPI output (panel or connector).

    required:
      - port@0
      - port@1

required:
+2 −0
Original line number Diff line number Diff line
@@ -83,6 +83,8 @@ properties:
required:
  - compatible
  - reg
  - width-mm
  - height-mm
  - panel-timing

unevaluatedProperties: false
+1 −0
Original line number Diff line number Diff line
@@ -216,6 +216,7 @@ gm20b_pmu = {
	.intr = gt215_pmu_intr,
	.recv = gm20b_pmu_recv,
	.initmsg = gm20b_pmu_initmsg,
	.reset = gf100_pmu_reset,
};

#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@
 */
#include "priv.h"

static void
void
gp102_pmu_reset(struct nvkm_pmu *pmu)
{
	struct nvkm_device *device = pmu->subdev.device;
Loading