vtimofei
/
smithay
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

legacy: disable/enable connectors on remove/add

This commit is contained in:
Victor Brekenfeld 2020-04-26 17:03:07 +02:00
parent 7199640ad9
commit 4786db633b
2 changed files with 45 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
src/backend/drm/legacy/mod.rs
View File

@ -164,36 +164,8 @@ impl<A: AsRawFd + 'static> LegacyDrmDevice<A> {
}
if disable_connectors {
for conn in res_handles.connectors() {
let info = dev.get_connector(*conn).compat().map_err(|source| Error::Access {
errmsg: "Failed to get connector infos",
dev: dev.dev_path(),
source
})?;
if info.state() == connector::State::Connected {
let props = dev.get_properties(*conn).compat().map_err(|source| Error::Access {
errmsg: "Failed to get properties for connector",
dev: dev.dev_path(),
source
})?;
let (handles, _) = props.as_props_and_values();
for handle in handles {
let info = dev.get_property(*handle).compat().map_err(|source| Error::Access {
errmsg: "Failed to get property of connector",
dev: dev.dev_path(),
source
})?;
if info.name().to_str().map(|x| x == "DPMS").unwrap_or(false) {
dev.set_property(*conn, *handle, 3/*DRM_MODE_DPMS_OFF*/)
.compat().map_err(|source| Error::Access {
errmsg: "Failed to set property of connector",
dev: dev.dev_path(),
source
})?;
}
}
}
}
dev.set_connector_state(res_handles.connectors().iter().copied(), false)?;
for crtc in res_handles.crtcs() {
// null commit
dev.set_crtc(*crtc, None, (0, 0), &[], None)
@ -217,6 +189,42 @@ impl<A: AsRawFd + 'static> LegacyDrmDevice<A> {
}
}
impl<A: AsRawFd + 'static> Dev<A> {
pub(in crate::backend::drm::legacy) fn set_connector_state(&self, connectors: impl Iterator<Item=connector::Handle>, enabled: bool) -> Result<(), Error> {
for conn in connectors {
let info = self.get_connector(conn).compat().map_err(|source| Error::Access {
errmsg: "Failed to get connector infos",
dev: self.dev_path(),
source
})?;
if info.state() == connector::State::Connected {
let props = self.get_properties(conn).compat().map_err(|source| Error::Access {
errmsg: "Failed to get properties for connector",
dev: self.dev_path(),
source
})?;
let (handles, _) = props.as_props_and_values();
for handle in handles {
let info = self.get_property(*handle).compat().map_err(|source| Error::Access {
errmsg: "Failed to get property of connector",
dev: self.dev_path(),
source
})?;
if info.name().to_str().map(|x| x == "DPMS").unwrap_or(false) {
self.set_property(conn, *handle, if enabled { 0 /*DRM_MODE_DPMS_ON*/} else { 3 /*DRM_MODE_DPMS_OFF*/})
.compat().map_err(|source| Error::Access {
errmsg: "Failed to set property of connector",
dev: self.dev_path(),
source
})?;
}
}
}
}
Ok(())
}
}
impl<A: AsRawFd + 'static> AsRawFd for LegacyDrmDevice<A> {
fn as_raw_fd(&self) -> RawFd {
self.dev.as_raw_fd()

27
src/backend/drm/legacy/surface.rs
View File

@ -201,7 +201,7 @@ impl<A: AsRawFd + 'static> RawSurface for LegacyDrmSurfaceInternal<A> {
let added = pending.connectors.difference(&current.connectors);
let mut conn_removed = false;
for conn in removed {
for conn in removed.clone() {
if let Ok(info) = self.get_connector(*conn) {
info!(self.logger, "Removing connector: {:?}", info.interface());
} else {
@ -211,6 +211,7 @@ impl<A: AsRawFd + 'static> RawSurface for LegacyDrmSurfaceInternal<A> {
// the graphics pipeline will not be freed otherwise
conn_removed = true;
}
self.dev.set_connector_state(removed.copied(), false)?;
if conn_removed {
// We need to do a null commit to free graphics pipelines
@ -223,13 +224,14 @@ impl<A: AsRawFd + 'static> RawSurface for LegacyDrmSurfaceInternal<A> {
})?;
}
for conn in added {
for conn in added.clone() {
if let Ok(info) = self.get_connector(*conn) {
info!(self.logger, "Adding connector: {:?}", info.interface());
} else {
info!(self.logger, "Adding unknown connector");
}
}
self.dev.set_connector_state(added.copied(), true)?;
if current.mode != pending.mode {
info!(
@ -420,25 +422,10 @@ impl<A: AsRawFd + 'static> Drop for LegacyDrmSurfaceInternal<A> {
let _ = self.set_cursor(self.crtc, Option::<&DumbBuffer>::None);
// disable connectors again
let current = self.state.read().unwrap();
for conn in current.connectors.iter() {
if let Ok(info) = self.get_connector(*conn) {
if info.state() == connector::State::Connected {
if let Ok(props) = self.get_properties(*conn) {
let (handles, _) = props.as_props_and_values();
for handle in handles {
if let Ok(info) = self.get_property(*handle) {
if info.name().to_str().map(|x| x == "DPMS").unwrap_or(false) {
let _ = self.set_property(*conn, *handle, 3/*DRM_MODE_DPMS_OFF*/);
}
}
}
}
}
}
if let Ok(_) = self.dev.set_connector_state(current.connectors.iter().copied(), false) {
// null commit
let _ = self.set_crtc(self.crtc, None, (0, 0), &[], None);
}
// null commit
let _ = self.set_crtc(self.crtc, None, (0, 0), &[], None);
}
}