Skip to content

Commit 88711fa

Browse files
committed
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: Dave 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
2 parents 995f748 + 1ecc0c0 commit 88711fa

8 files changed

Lines changed: 14 additions & 4 deletions

File tree

Documentation/devicetree/bindings/display/bridge/chipone,icn6211.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@ properties:
5151
Video port for MIPI DPI output (panel or connector).
5252

5353
required:
54-
- port@0
5554
- port@1
5655

5756
required:

Documentation/devicetree/bindings/display/bridge/toshiba,tc358762.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ properties:
3939
Video port for MIPI DPI output (panel or connector).
4040

4141
required:
42-
- port@0
4342
- port@1
4443

4544
required:

Documentation/devicetree/bindings/display/panel/panel-mipi-dbi-spi.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,8 @@ properties:
8383
required:
8484
- compatible
8585
- reg
86+
- width-mm
87+
- height-mm
8688
- panel-timing
8789

8890
unevaluatedProperties: false

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gm20b.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ gm20b_pmu = {
216216
.intr = gt215_pmu_intr,
217217
.recv = gm20b_pmu_recv,
218218
.initmsg = gm20b_pmu_initmsg,
219+
.reset = gf100_pmu_reset,
219220
};
220221

221222
#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp102.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
*/
2424
#include "priv.h"
2525

26-
static void
26+
void
2727
gp102_pmu_reset(struct nvkm_pmu *pmu)
2828
{
2929
struct nvkm_device *device = pmu->subdev.device;

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/gp10b.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ gp10b_pmu = {
8383
.intr = gt215_pmu_intr,
8484
.recv = gm20b_pmu_recv,
8585
.initmsg = gm20b_pmu_initmsg,
86+
.reset = gp102_pmu_reset,
8687
};
8788

8889
#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)

drivers/gpu/drm/nouveau/nvkm/subdev/pmu/priv.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ int gt215_pmu_send(struct nvkm_pmu *, u32[2], u32, u32, u32, u32);
4141

4242
bool gf100_pmu_enabled(struct nvkm_pmu *);
4343
void gf100_pmu_reset(struct nvkm_pmu *);
44+
void gp102_pmu_reset(struct nvkm_pmu *pmu);
4445

4546
void gk110_pmu_pgob(struct nvkm_pmu *, bool);
4647

drivers/video/fbdev/core/fbmem.c

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1579,7 +1579,14 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a,
15791579
* If it's not a platform device, at least print a warning. A
15801580
* fix would add code to remove the device from the system.
15811581
*/
1582-
if (dev_is_platform(device)) {
1582+
if (!device) {
1583+
/* TODO: Represent each OF framebuffer as its own
1584+
* device in the device hierarchy. For now, offb
1585+
* doesn't have such a device, so unregister the
1586+
* framebuffer as before without warning.
1587+
*/
1588+
do_unregister_framebuffer(registered_fb[i]);
1589+
} else if (dev_is_platform(device)) {
15831590
registered_fb[i]->forced_out = true;
15841591
platform_device_unregister(to_platform_device(device));
15851592
} else {

0 commit comments

Comments
 (0)