From 997895b3c783a8ae40da2765bb382d43b3d0cad2 Mon Sep 17 00:00:00 2001
From: Victor Brekenfeld <github@drakulix.de>
Date: Mon, 18 May 2020 20:16:32 +0200
Subject: [PATCH] drm: allow crate internal impls to access crtc and plane

---
 src/backend/drm/atomic/mod.rs     |  2 +-
 src/backend/drm/atomic/surface.rs | 10 ++++++----
 src/backend/drm/legacy/surface.rs |  8 +++++---
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/backend/drm/atomic/mod.rs b/src/backend/drm/atomic/mod.rs
index fa0911b..13d7c45 100644
--- a/src/backend/drm/atomic/mod.rs
+++ b/src/backend/drm/atomic/mod.rs
@@ -61,7 +61,7 @@ type Mapping = (
     HashMap<plane::Handle, HashMap<String, property::Handle>>,
 );
 
-struct Dev<A: AsRawFd + 'static> {
+pub(in crate::backend::drm) struct Dev<A: AsRawFd + 'static> {
     fd: A,
     privileged: bool,
     active: Arc<AtomicBool>,
diff --git a/src/backend/drm/atomic/surface.rs b/src/backend/drm/atomic/surface.rs
index 347a0ea..4dd2710 100644
--- a/src/backend/drm/atomic/surface.rs
+++ b/src/backend/drm/atomic/surface.rs
@@ -38,11 +38,11 @@ pub struct Planes {
     pub cursor: plane::Handle,
 }
 
-pub(super) struct AtomicDrmSurfaceInternal<A: AsRawFd + 'static> {
+pub(in crate::backend::drm) struct AtomicDrmSurfaceInternal<A: AsRawFd + 'static> {
     pub(super) dev: Rc<Dev<A>>,
     pub(super) crtc: crtc::Handle,
     pub(super) cursor: CursorState,
-    pub(super) planes: Planes,
+    pub(in crate::backend::drm) planes: Planes,
     pub(super) state: RwLock<State>,
     pub(super) pending: RwLock<State>,
     pub(super) logger: ::slog::Logger,
@@ -918,7 +918,7 @@ impl<A: AsRawFd + 'static> AtomicDrmSurfaceInternal<A> {
         ))
     }
 
-    pub(crate) fn clear_plane(&self, plane: plane::Handle) -> Result<(), Error> {
+    pub(super) fn clear_plane(&self, plane: plane::Handle) -> Result<(), Error> {
         let mut req = AtomicModeReq::new();
 
         req.add_property(
@@ -948,7 +948,9 @@ impl<A: AsRawFd + 'static> AtomicDrmSurfaceInternal<A> {
 }
 
 /// Open raw crtc utilizing atomic mode-setting
-pub struct AtomicDrmSurface<A: AsRawFd + 'static>(pub(super) Rc<AtomicDrmSurfaceInternal<A>>);
+pub struct AtomicDrmSurface<A: AsRawFd + 'static>(
+    pub(in crate::backend::drm) Rc<AtomicDrmSurfaceInternal<A>>,
+);
 
 impl<A: AsRawFd + 'static> AsRawFd for AtomicDrmSurface<A> {
     fn as_raw_fd(&self) -> RawFd {
diff --git a/src/backend/drm/legacy/surface.rs b/src/backend/drm/legacy/surface.rs
index be2f6f9..035a88c 100644
--- a/src/backend/drm/legacy/surface.rs
+++ b/src/backend/drm/legacy/surface.rs
@@ -23,9 +23,9 @@ pub struct State {
     pub connectors: HashSet<connector::Handle>,
 }
 
-pub(super) struct LegacyDrmSurfaceInternal<A: AsRawFd + 'static> {
+pub(in crate::backend::drm) struct LegacyDrmSurfaceInternal<A: AsRawFd + 'static> {
     pub(super) dev: Rc<Dev<A>>,
-    pub(super) crtc: crtc::Handle,
+    pub(in crate::backend::drm) crtc: crtc::Handle,
     pub(super) state: RwLock<State>,
     pub(super) pending: RwLock<State>,
     pub(super) logger: ::slog::Logger,
@@ -454,7 +454,9 @@ impl<A: AsRawFd + 'static> Drop for LegacyDrmSurfaceInternal<A> {
 }
 
 /// Open raw crtc utilizing legacy mode-setting
-pub struct LegacyDrmSurface<A: AsRawFd + 'static>(pub(super) Rc<LegacyDrmSurfaceInternal<A>>);
+pub struct LegacyDrmSurface<A: AsRawFd + 'static>(
+    pub(in crate::backend::drm) Rc<LegacyDrmSurfaceInternal<A>>,
+);
 
 impl<A: AsRawFd + 'static> AsRawFd for LegacyDrmSurface<A> {
     fn as_raw_fd(&self) -> RawFd {