Skip to content

Commit

Permalink
Revert "kms: Dmabuf Feedback support"
Browse files Browse the repository at this point in the history 
This reverts commit c8bb417.
  • Loading branch information
@Drakulix
Drakulix committed Mar 23, 2023
1 parent 807291a commit 7ad3794
Show file tree
Hide file tree
Showing 8 changed files with 26 additions and 234 deletions.
81 changes: 7 additions & 74 deletions src/backend/kms/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ use crate::{
backend::render::{workspace_elements, CLEAR_COLOR},
config::OutputConfig,
shell::Shell,
state::{BackendData, ClientState, Common, Data, Fps, SurfaceDmabufFeedback},
state::{BackendData, ClientState, Common, Data, Fps},
utils::prelude::*,
wayland::{
handlers::screencopy::{render_session, UserdataExt},
Expand Down Expand Up @@ -38,7 +38,7 @@ use smithay::{
glow::GlowRenderer,
multigpu::{gbm::GbmGlesBackend, Error as MultiError, GpuManager},
utils::draw_render_elements,
Bind, Blit, ImportDma, Offscreen, Renderer, TextureFilter,
Bind, Blit, Offscreen, Renderer, TextureFilter,
},
session::{libseat::LibSeatSession, Event as SessionEvent, Session},
udev::{all_gpus, primary_gpu, UdevBackend, UdevEvent},
Expand All @@ -58,16 +58,12 @@ use smithay::{
},
input::Libinput,
nix::{fcntl::OFlag, sys::stat::dev_t},
wayland_protocols::wp::{
linux_dmabuf::zv1::server::zwp_linux_dmabuf_feedback_v1,
presentation_time::server::wp_presentation_feedback,
},
wayland_protocols::wp::presentation_time::server::wp_presentation_feedback,
wayland_server::{protocol::wl_surface::WlSurface, DisplayHandle, Resource},
},
utils::{DeviceFd, Size, Transform},
wayland::{
compositor::with_states,
dmabuf::{get_dmabuf, DmabufFeedbackBuilder, DmabufGlobal, SurfaceDmabufFeedbackState},
dmabuf::{get_dmabuf, DmabufGlobal},
relative_pointer::RelativePointerManagerState,
seat::WaylandFocus,
},
Expand Down Expand Up @@ -123,7 +119,6 @@ pub struct Surface {
dirty: bool,
render_timer_token: Option<RegistrationToken>,
fps: Fps,
feedback: Option<SurfaceDmabufFeedback>,
}

pub type GbmDrmCompositor = DrmCompositor<
Expand Down Expand Up @@ -894,7 +889,6 @@ impl Device {
dirty: false,
render_timer_token: None,
fps: Fps::new(renderer.as_mut()),
feedback: None,
};
self.surfaces.insert(crtc, data);

Expand All @@ -915,18 +909,10 @@ fn render_node_for_output(
.unwrap_or_else(|| workspace.windows().collect::<Vec<_>>())
.into_iter()
.flat_map(|w| {
// has the client requested surface-feedback? If yes it is properly rendering on our target_node
if with_states(&w.wl_surface()?, |data| {
SurfaceDmabufFeedbackState::from_states(data).is_some()
}) {
return Some(target_node.clone());
}
// else lets check the global drm-node the client got either through default-feedback or wl_drm
let client = dh.get_client(w.wl_surface()?.id()).ok()?;
if let Some(normal_client) = client.get_data::<ClientState>() {
return normal_client.drm_node.clone();
}
// last but not least all xwayland-surfaces should also share a single node
if let Some(xwayland_client) = client.get_data::<XWaylandClientData>() {
return xwayland_client.user_data().get::<DrmNode>().cloned();
}
Expand All @@ -950,51 +936,6 @@ fn render_node_for_output(
}
}

fn get_surface_dmabuf_feedback(
render_node: DrmNode,
renderer: &mut GlMultiRenderer<'_, '_>,
compositor: &GbmDrmCompositor,
) -> Option<SurfaceDmabufFeedback> {
let render_formats = renderer.dmabuf_formats().copied().collect::<HashSet<_>>();

let surface = compositor.surface();
let planes = surface.planes().unwrap();
// We limit the scan-out trache to formats we can also render from
// so that there is always a fallback render path available in case
// the supplied buffer can not be scanned out directly
let planes_formats = surface
.supported_formats(planes.primary.handle)
.unwrap()
.into_iter()
.chain(
planes
.overlay
.iter()
.flat_map(|p| surface.supported_formats(p.handle).unwrap()),
)
.collect::<HashSet<_>>()
.intersection(&render_formats)
.copied()
.collect::<Vec<_>>();

let builder = DmabufFeedbackBuilder::new(render_node.dev_id(), render_formats);
let render_feedback = builder.clone().build().unwrap();

let scanout_feedback = builder
.add_preference_tranche(
surface.device_fd().dev_id().unwrap(),
Some(zwp_linux_dmabuf_feedback_v1::TrancheFlags::Scanout),
planes_formats,
)
.build()
.unwrap();

Some(SurfaceDmabufFeedback {
render_feedback,
scanout_feedback,
})
}

impl Surface {
pub fn render_output(
&mut self,
Expand Down Expand Up @@ -1147,7 +1088,7 @@ impl Surface {
} else {
None
};
state.send_frames(&self.output, &frame_result.states, self.feedback.as_ref());
state.send_frames(&self.output, &frame_result.states);
compositor
.queue_frame(feedback)
.with_context(|| "Failed to submit result for display")?
Expand Down Expand Up @@ -1274,16 +1215,6 @@ impl KmsState {
.unwrap_or_else(|_| String::from("Unknown"))
)
})?;
surface.feedback =
self.api.single_renderer(&device.render_node).ok().and_then(
|mut renderer| {
get_surface_dmabuf_feedback(
device.render_node,
&mut renderer,
&target,
)
},
);
surface.surface = Some(target);
true
};
Expand Down Expand Up @@ -1356,6 +1287,8 @@ impl KmsState {
}

pub fn dmabuf_imported(&mut self, global: &DmabufGlobal, dmabuf: Dmabuf) -> Result<()> {
use smithay::backend::renderer::ImportDma;

for device in self.devices.values() {
if device
.socket
Expand Down
11 changes: 2 additions & 9 deletions src/backend/kms/socket.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,7 @@ use smithay::{
calloop::RegistrationToken,
wayland_server::{backend::GlobalId, Client, DisplayHandle},
},
wayland::{
dmabuf::{DmabufFeedbackBuilder, DmabufGlobal},
socket::ListeningSocketSource,
},
wayland::{dmabuf::DmabufGlobal, socket::ListeningSocketSource},
xwayland::XWaylandClientData,
};
use std::sync::Arc;
Expand Down Expand Up @@ -62,14 +59,10 @@ impl State {
false
};

let feedback = DmabufFeedbackBuilder::new(render_node.dev_id(), formats.clone())
.build()
.with_context(|| "Failed to create drm format shared memory table")?;

let dmabuf_global = self
.common
.dmabuf_state
.create_global_with_filter_and_default_feedback::<State, _>(dh, &feedback, filter);
.create_global_with_filter::<State, _>(dh, formats.clone(), filter);

let drm_global_id = self
.common
Expand Down
2 changes: 1 addition & 1 deletion src/backend/winit.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ impl WinitState {
self.screencopy.clear();
#[cfg(feature = "debug")]
self.fps.displayed();
state.send_frames(&self.output, &states, None);
state.send_frames(&self.output, &states);
if damage.is_some() {
let mut output_presentation_feedback =
state.take_presentation_feedback(&self.output, &states);
Expand Down
2 changes: 1 addition & 1 deletion src/backend/x11.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ impl Surface {
.with_context(|| "Failed to submit buffer for display")?;
#[cfg(feature = "debug")]
self.fps.displayed();
state.send_frames(&self.output, &states, None);
state.send_frames(&self.output, &states);
if damage.is_some() {
let mut output_presentation_feedback =
state.take_presentation_feedback(&self.output, &states);
Expand Down
55 changes: 4 additions & 51 deletions src/shell/element/surface.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,13 @@ use std::time::Duration;

use smithay::{
backend::renderer::{
element::{
surface::WaylandSurfaceRenderElement, utils::select_dmabuf_feedback, AsRenderElements,
RenderElementStates,
},
element::{surface::WaylandSurfaceRenderElement, AsRenderElements},
ImportAll, Renderer,
},
desktop::{
utils::{
send_dmabuf_feedback_surface_tree, send_frames_surface_tree,
take_presentation_feedback_surface_tree, with_surfaces_surface_tree,
OutputPresentationFeedback,
send_frames_surface_tree, take_presentation_feedback_surface_tree,
with_surfaces_surface_tree, OutputPresentationFeedback,
},
Window,
},
Expand All @@ -38,8 +34,6 @@ use smithay::{
xwayland::{xwm::X11Relatable, X11Surface},
};

use crate::state::SurfaceDmabufFeedback;

space_elements! {
#[derive(Debug, Clone, PartialEq)]
pub CosmicSurface;
Expand Down Expand Up @@ -375,7 +369,7 @@ impl CosmicSurface {
{
match self {
CosmicSurface::Wayland(window) => {
window.send_frame(output, time, throttle, primary_scan_out_output);
window.send_frame(output, time, throttle, primary_scan_out_output)
}
CosmicSurface::X11(surface) => {
if let Some(wl_surface) = surface.wl_surface() {
Expand All @@ -392,47 +386,6 @@ impl CosmicSurface {
}
}

pub fn send_dmabuf_feedback<F1>(
&self,
output: &Output,
feedback: &SurfaceDmabufFeedback,
render_element_states: &RenderElementStates,
primary_scan_out_output: F1,
) where
F1: FnMut(&WlSurface, &SurfaceData) -> Option<Output> + Copy,
{
match self {
CosmicSurface::Wayland(window) => {
window.send_dmabuf_feedback(output, primary_scan_out_output, |surface, _| {
select_dmabuf_feedback(
surface,
render_element_states,
&feedback.render_feedback,
&feedback.scanout_feedback,
)
})
}
CosmicSurface::X11(surface) => {
if let Some(wl_surface) = surface.wl_surface() {
send_dmabuf_feedback_surface_tree(
&wl_surface,
output,
primary_scan_out_output,
|surface, _| {
select_dmabuf_feedback(
surface,
render_element_states,
&feedback.render_feedback,
&feedback.scanout_feedback,
)
},
)
}
}
_ => unreachable!(),
}
}

pub fn take_presentation_feedback<F1, F2>(
&self,
output_feedback: &mut OutputPresentationFeedback,
Expand Down
18 changes: 1 addition & 17 deletions src/shell/layout/floating/grabs/moving.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,12 @@ use crate::{
element::{window::CosmicWindowRenderElement, CosmicMapped, CosmicMappedRenderElement},
focus::target::{KeyboardFocusTarget, PointerFocusTarget},
},
state::SurfaceDmabufFeedback,
utils::prelude::*,
};

use smithay::{
backend::renderer::{
element::{AsRenderElements, RenderElement, RenderElementStates},
element::{AsRenderElements, RenderElement},
ImportAll, ImportMem, Renderer,
},
desktop::space::SpaceElement,
Expand Down Expand Up @@ -92,21 +91,6 @@ impl MoveGrabState {
.active_window()
.send_frame(output, time, throttle, primary_scan_out_output)
}

pub fn send_dmabuf_feedback(
&self,
output: &Output,
feedback: &SurfaceDmabufFeedback,
render_element_states: &RenderElementStates,
primary_scan_out_output: impl FnMut(&WlSurface, &SurfaceData) -> Option<Output> + Copy,
) {
self.window.active_window().send_dmabuf_feedback(
output,
feedback,
render_element_states,
primary_scan_out_output,
)
}
}

pub struct MoveSurfaceGrab {
Expand Down
Loading

0 comments on commit 7ad3794

Please sign in to comment.