From 0d414a5336d09283d4d731fb9a65ea32f6cf9bf3 Mon Sep 17 00:00:00 2001
From: Julian Orth <ju.orth@gmail.com>
Date: Thu, 21 Apr 2022 17:40:28 +0200
Subject: [PATCH] autocommit 2022-04-21 17:40:28 CEST

---
 src/video/drm.rs     | 4 +++-
 src/video/drm/sys.rs | 6 +++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/video/drm.rs b/src/video/drm.rs
index 18d9455e..0b2f9bfb 100644
--- a/src/video/drm.rs
+++ b/src/video/drm.rs
@@ -272,11 +272,13 @@ impl DrmMaster {
         }
         let mut strides = [0; 4];
         let mut offsets = [0; 4];
+        let mut modifiers = [0; 4];
         let mut handles = [0; 4];
         let mut handles_ = vec![];
         for (idx, plane) in dma.planes.iter().enumerate() {
             strides[idx] = plane.stride;
             offsets[idx] = plane.offset;
+            modifiers[idx] = modifier;
             let handle = self.gem_handle(plane.fd.raw())?;
             handles[idx] = handle.handle();
             handles_.push(handle);
@@ -290,7 +292,7 @@ impl DrmMaster {
             handles,
             strides,
             offsets,
-            modifier,
+            modifiers,
         ) {
             Ok(fb) => Ok(DrmFramebuffer {
                 master: self.clone(),
diff --git a/src/video/drm/sys.rs b/src/video/drm/sys.rs
index 0c82793d..4c508b9e 100644
--- a/src/video/drm/sys.rs
+++ b/src/video/drm/sys.rs
@@ -935,7 +935,7 @@ struct drm_mode_fb_cmd2 {
     handles: [u32; 4],
     pitches: [u32; 4],
     offsets: [u32; 4],
-    modifier: [u64; 4],
+    modifiers: [u64; 4],
 }
 
 #[allow(dead_code)]
@@ -953,7 +953,7 @@ pub fn mode_addfb2(
     handles: [u32; 4],
     strides: [u32; 4],
     offsets: [u32; 4],
-    modifier: u64,
+    modifiers: [u64; 4],
 ) -> Result<DrmFb, OsError> {
     let mut res = drm_mode_fb_cmd2 {
         fb_id: 0,
@@ -964,7 +964,7 @@ pub fn mode_addfb2(
         handles,
         pitches: strides,
         offsets,
-        modifier: [modifier; 4],
+        modifiers,
     };
     log::info!("{:#?}", res);