libdrm: move dependency on nvidia-drm out of weston-init #1760
Conversation
|
There used to be a conflict between enabling modesetting in the nvidia-drm driver and the |
|
That makes sense - I didn’t check with the X server, so I’ll follow up here. |
The nvidia-drm kernel module and associated load config are needed by libdrm but were only getting picked up by weston-init. There are valid configurations (headless, egl-only) that need libdrm but do not pull in weston, so the runtime recommendation is moved to the libdrm bbappend. Signed-off-by: Kurt Kiefer <[email protected]>
|
Interestingly, it is fine with this option in the linux-yocto kernel (doesn't matter one way or another there), but with jammy it's old problem with the I'll change this to adjust that parameter if x11 is enabled and not xwayland. |
We want to be able to pull in the module load configuration by default but need to be careful to not enable the 'modeset' parameter on the driver unless we won't be using x11 in the image. We can't check distro features, so we make the modprobe conf RCONFLICT with x11, and don't allow it to be pulled in if 'modeset' is enabled. Also add variables to allow overriding the setting for the 'modeset' and 'fbdev' parameters in a bbappend, local.conf file, or similar. Signed-off-by: Kurt Kiefer <[email protected]>
kekiefer
force-pushed
the
master+nvidia-drm
branch
from
124427f
to
67a058e
Compare
|
I've updated this to RCONFLICT a |
There was a problem hiding this comment.
The weston-init recipe is already marked as machine-specific, but libdrm is not. Adding
PACKAGE_ARCH:tegra = "${TEGRA_PKGARCH}"
as part of this change will help prevent weird build failures when mixing tegra and non-tegra builds.
| RRECOMMENDS:${PN} = "${PN}-modeset" | ||
|
|
||
| # if modesetting was enabled at build time, don't include the modprobe conf at runtime alongside the XSERVER packages | ||
| RCONFLICTS:${PN}-modeset = "${@d.getVar('XSERVER') if bb.utils.to_boolean(d.getVar('NVIDIA_DRM_MODESET')) else ''}" |
There was a problem hiding this comment.
Instead of all of the XSERVER variable contents, you could be more specific here and just name xserver-xorg-video-nvidia, which where we have the conflict.... but I'm not sure it makes that much difference.
The nvidia-drm kernel module and associated load config are needed by libdrm but were only getting picked up by weston-init.
There are valid configurations (headless, egl-only) that need libdrm but do not pull in weston, so the runtime recommendation is moved to the libdrm bbappend.