Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

drm/vc4: Correct disabling of render nodes #3365

Merged
merged 2 commits into from
Dec 2, 2019

Conversation

6by9
Copy link
Contributor

@6by9 6by9 commented Dec 2, 2019

See #3363
4.19 had an early version of this patch merged which didn't match all the DT compatible strings. Revert the early version and cherry-pick the mainline version.

6by9 and others added 2 commits December 2, 2019 11:06
… probe."

This reverts commit 5135ce6.
We merged v1 of the commit submitted to mainline, whilst they accepted
a v3. Revert the v1 to update.

Signed-off-by: Dave Stevenson <[email protected]>
Commit ffc2674 upstream.

One might want to use the VC4 display stack without using Mesa.
Similar to the debugfs fixes for not having all of the possible
display bits enabled, make sure you can't oops in vc4 if v3d isn't
enabled.

v2: Fix matching against other v3d variants (review by Paul), don't
    forget to set irq_enabled so that the vblank uapi works
v3: Use -ENODEV instead of -EINVAL on Paul's suggestion.

Signed-off-by: Eric Anholt <[email protected]>
Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
Reviewed-by: Paul Kocialkowski <[email protected]>
@6by9
Copy link
Contributor Author

6by9 commented Dec 2, 2019

WIP as I'm still compiling the resulting tree to test.

@6by9 6by9 changed the title WIP: drm/vc4: Correct disabling of render nodes drm/vc4: Correct disabling of render nodes Dec 2, 2019
@6by9
Copy link
Contributor Author

6by9 commented Dec 2, 2019

That seems to work. WIP tag removed.

@pelwell pelwell merged commit 5a3f419 into raspberrypi:rpi-4.19.y Dec 2, 2019
schnitzeltony added a commit to schnitzeltony/meta-raspi-light that referenced this pull request Dec 2, 2019
fixes plasma-wayland session see [1-2] - party party party

[1] raspberrypi/linux#3363
[2] raspberrypi/linux#3365

Signed-off-by: Andreas Müller <[email protected]>
popcornmix added a commit to raspberrypi/firmware that referenced this pull request Dec 11, 2019
kernel: dwc_otg: checking the urb->transfer_buffer too early
See: raspberrypi/linux#3341

kernel: overlays: Make mcp342x run-time compatible
See: https://www.raspberrypi.org/forums/viewtopic.php?f=107&t=258294

kernel: Add Support for simultaneous use of JustBoom DAC and JustBoom Digi based Audio boards
See: raspberrypi/linux#3337

kernel: drm/vc4: Correct disabling of render nodes
See: raspberrypi/linux#3365

firmware: power: Use Pi4 PMIC values on Pi3+

firmware: Fix filtered handling of array variables
See: #1296

firmware: Update libfdt to v1.5.1+
See: raspberrypi/userland#582

firmware: dtoverlay: Extend DT parameter syntax

firmware: memorymap: Include FW revision in start.elf

userland: mmal: Support 64 bit clients
See: raspberrypi/userland#586
popcornmix added a commit to Hexxeh/rpi-firmware that referenced this pull request Dec 11, 2019
kernel: dwc_otg: checking the urb->transfer_buffer too early
See: raspberrypi/linux#3341

kernel: overlays: Make mcp342x run-time compatible
See: https://www.raspberrypi.org/forums/viewtopic.php?f=107&t=258294

kernel: Add Support for simultaneous use of JustBoom DAC and JustBoom Digi based Audio boards
See: raspberrypi/linux#3337

kernel: drm/vc4: Correct disabling of render nodes
See: raspberrypi/linux#3365

firmware: power: Use Pi4 PMIC values on Pi3+

firmware: Fix filtered handling of array variables
See: raspberrypi/firmware#1296

firmware: Update libfdt to v1.5.1+
See: raspberrypi/userland#582

firmware: dtoverlay: Extend DT parameter syntax

firmware: memorymap: Include FW revision in start.elf

userland: mmal: Support 64 bit clients
See: raspberrypi/userland#586
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants