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. - -----BEGIN PGP SIGNATURE----- iQIzBAABCgAdFiEEuXvWqAysSYEJGuVH/lWMcqZwE8MFAmJOw0MACgkQ/lWMcqZw E8NhfhAAkfyLCzPd428NrgLRVmXsIvOF9bBn0KcCljA1S+wWQtYoAtOPdBce/kh7 bADTbMOuA91OYuROiZANs750ejNSCXmSBqawb1SkQD5Go1ixt2dylGJvxT7p1HG2 obCVKrcheJZ4Pe2HkOeUyK+KRGLfc72wg2hC9sbPDA29SgsvktnMMEOJW6/6hzxv luMsgdsDVM7y8IC61idRPUgwZ3tB2H6XRY9qpOZSO9Lc0+uF9OaS6MSFIILkoeY5 5Akkpn5nTrpWZYQblGmswN/gkKoUU2KQmTTnetYdoJeBlrqtLb7vxeIFbcCVhvx8 hTJ2yx/+CIcmWelZqTOhP1WS+x4CplaWBcpMmmEU7XOKGM3JdlPic3a4wGVI9Wab Pz1UDO7swvTf2t7ViBEkmZW0qUXXqpMozPLg7mZLn+cVn51azTrGgXQ/QSvvBdq/ AwKdrGloXkDcGRyIeIQ3ZUspJJA+21w5P4cJTssG1p8QjTxQlzk98odHGoy71RcU UmEyCc1vOn8Y16nai0bwBQAyLWHEwETaMR2L0+W29/OVuqUCIaeaP7gbjuDrV9Hi vqXtpvMXQzqADKKaRyeQjzbA7R1V2XA+SWNqU6JDtXWEF78eBnRdqfIf/6KrZTzx gqlhU5W9vfOZHUbV303h+ezi0HM4blEivttw5ZAjIXTIPcCoOsY= =RS8I -----END PGP SIGNATURE----- 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
This commit is contained in:
commit
88711fa9a1
|
@ -51,7 +51,6 @@ properties:
|
|||
Video port for MIPI DPI output (panel or connector).
|
||||
|
||||
required:
|
||||
- port@0
|
||||
- port@1
|
||||
|
||||
required:
|
||||
|
|
|
@ -39,7 +39,6 @@ properties:
|
|||
Video port for MIPI DPI output (panel or connector).
|
||||
|
||||
required:
|
||||
- port@0
|
||||
- port@1
|
||||
|
||||
required:
|
||||
|
|
|
@ -83,6 +83,8 @@ properties:
|
|||
required:
|
||||
- compatible
|
||||
- reg
|
||||
- width-mm
|
||||
- height-mm
|
||||
- panel-timing
|
||||
|
||||
unevaluatedProperties: false
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -23,7 +23,7 @@
|
|||
*/
|
||||
#include "priv.h"
|
||||
|
||||
static void
|
||||
void
|
||||
gp102_pmu_reset(struct nvkm_pmu *pmu)
|
||||
{
|
||||
struct nvkm_device *device = pmu->subdev.device;
|
||||
|
|
|
@ -83,6 +83,7 @@ gp10b_pmu = {
|
|||
.intr = gt215_pmu_intr,
|
||||
.recv = gm20b_pmu_recv,
|
||||
.initmsg = gm20b_pmu_initmsg,
|
||||
.reset = gp102_pmu_reset,
|
||||
};
|
||||
|
||||
#if IS_ENABLED(CONFIG_ARCH_TEGRA_210_SOC)
|
||||
|
|
|
@ -41,6 +41,7 @@ int gt215_pmu_send(struct nvkm_pmu *, u32[2], u32, u32, u32, u32);
|
|||
|
||||
bool gf100_pmu_enabled(struct nvkm_pmu *);
|
||||
void gf100_pmu_reset(struct nvkm_pmu *);
|
||||
void gp102_pmu_reset(struct nvkm_pmu *pmu);
|
||||
|
||||
void gk110_pmu_pgob(struct nvkm_pmu *, bool);
|
||||
|
||||
|
|
|
@ -1579,7 +1579,14 @@ static void do_remove_conflicting_framebuffers(struct apertures_struct *a,
|
|||
* If it's not a platform device, at least print a warning. A
|
||||
* fix would add code to remove the device from the system.
|
||||
*/
|
||||
if (dev_is_platform(device)) {
|
||||
if (!device) {
|
||||
/* TODO: Represent each OF framebuffer as its own
|
||||
* device in the device hierarchy. For now, offb
|
||||
* doesn't have such a device, so unregister the
|
||||
* framebuffer as before without warning.
|
||||
*/
|
||||
do_unregister_framebuffer(registered_fb[i]);
|
||||
} else if (dev_is_platform(device)) {
|
||||
registered_fb[i]->forced_out = true;
|
||||
platform_device_unregister(to_platform_device(device));
|
||||
} else {
|
||||
|
|
Loading…
Reference in New Issue