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

downgrade some recoverable errors to warnings

This commit is contained in:
Victor Brekenfeld 2020-05-12 20:00:45 +02:00
parent 9610f31e44
commit 64a57a4cc8
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
anvil/src/glium_drawer.rs
View File

@ -473,7 +473,7 @@ pub fn schedule_initial_render<F: GLGraphicsBackend + 'static, Data: 'static>(
SwapBuffersError::AlreadySwapped => {} SwapBuffersError::AlreadySwapped => {}
SwapBuffersError::TemporaryFailure(err) => { SwapBuffersError::TemporaryFailure(err) => {
// TODO dont reschedule after 3(?) retries // TODO dont reschedule after 3(?) retries
error!(renderer.log, "Failed to submit page_flip: {}", err); warn!(renderer.log, "Failed to submit page_flip: {}", err);
let handle = evt_handle.clone(); let handle = evt_handle.clone();
evt_handle.insert_idle(move |_| schedule_initial_render(renderer, &handle)); evt_handle.insert_idle(move |_| schedule_initial_render(renderer, &handle));
} }

8
anvil/src/udev.rs
View File

@ -380,7 +380,7 @@ impl<S: SessionNotifier, Data: 'static> UdevHandlerImpl<S, Data> {
|fd| match FallbackDevice::new(SessionFd(fd), true, self.logger.clone()) { |fd| match FallbackDevice::new(SessionFd(fd), true, self.logger.clone()) {
Ok(drm) => Some(drm), Ok(drm) => Some(drm),
Err(err) => { Err(err) => {
error!(self.logger, "Skipping drm device, because of error: {}", err); warn!(self.logger, "Skipping drm device, because of error: {}", err);
None None
} }
}, },
@ -388,14 +388,14 @@ impl<S: SessionNotifier, Data: 'static> UdevHandlerImpl<S, Data> {
.and_then(|drm| match GbmDevice::new(drm, self.logger.clone()) { .and_then(|drm| match GbmDevice::new(drm, self.logger.clone()) {
Ok(gbm) => Some(gbm), Ok(gbm) => Some(gbm),
Err(err) => { Err(err) => {
error!(self.logger, "Skipping gbm device, because of error: {}", err); warn!(self.logger, "Skipping gbm device, because of error: {}", err);
None None
} }
}) })
.and_then(|gbm| match EglDevice::new(gbm, self.logger.clone()) { .and_then(|gbm| match EglDevice::new(gbm, self.logger.clone()) {
Ok(egl) => Some(egl), Ok(egl) => Some(egl),
Err(err) => { Err(err) => {
error!(self.logger, "Skipping egl device, because of error: {}", err); warn!(self.logger, "Skipping egl device, because of error: {}", err);
None None
} }
}) })
@ -636,7 +636,7 @@ impl DrmRenderer {
} }
if let Err(err) = result { if let Err(err) = result {
error!(self.logger, "Error during rendering: {:?}", err); warn!(self.logger, "Error during rendering: {:?}", err);
let reschedule = match err { let reschedule = match err {
SwapBuffersError::AlreadySwapped => false, SwapBuffersError::AlreadySwapped => false,
SwapBuffersError::TemporaryFailure(err) => { SwapBuffersError::TemporaryFailure(err) => {

2
src/backend/drm/common/fallback.rs
View File

@ -191,7 +191,7 @@ impl<A: AsRawFd + Clone + 'static> FallbackDevice<AtomicDrmDevice<A>, LegacyDrmD
match AtomicDrmDevice::new(fd.clone(), disable_connectors, log.clone()) { match AtomicDrmDevice::new(fd.clone(), disable_connectors, log.clone()) {
Ok(dev) => Ok(FallbackDevice::Preference(dev)), Ok(dev) => Ok(FallbackDevice::Preference(dev)),
Err(err) => { Err(err) => {
error!(log, "Failed to initialize preferred AtomicDrmDevice: {}", err); warn!(log, "Failed to initialize preferred AtomicDrmDevice: {}", err);
info!(log, "Falling back to fallback LegacyDrmDevice"); info!(log, "Falling back to fallback LegacyDrmDevice");
Ok(FallbackDevice::Fallback(LegacyDrmDevice::new( Ok(FallbackDevice::Fallback(LegacyDrmDevice::new(
fd, fd,