[zircon] Remove unused zx_framebuffer_set_range syscall

Support for this syscall was dropped early last year and there are no
remaining userspace clients. It should be safe to remove it.

Change-Id: Id70921a3424c9dc25959147141e3d98564b3f2b6
Reviewed-on: https://fuchsia-review.googlesource.com/c/fuchsia/+/1191016
Reviewed-by: Roland McGrath <[email protected]>
Reviewed-by: Nick Maniscalco <[email protected]>
Reviewed-by: Victor Costan <[email protected]>
Commit-Queue: Auto-Submit <[email protected]>
API-Review: Roland McGrath <[email protected]>
Fuchsia-Auto-Submit: Suraj Malhotra <[email protected]>
Reviewed-by: Clayton Wilkinson <[email protected]>
Reviewed-by: Travis Geiselbrecht <[email protected]>

Author: surajrmal

src/zircon/lib/zircon/libzircon.json

@@ -34,7 +34,6 @@
     "zx_fifo_read",
     "zx_fifo_write",
     "zx_framebuffer_get_info",
-    "zx_framebuffer_set_range",
     "zx_futex_get_owner",
     "zx_futex_requeue",
     "zx_futex_requeue_single_owner",

src/zircon/lib/zircon/zircon.ifs

@@ -37,7 +37,6 @@ Symbols:
   - { Name: _zx_fifo_read, Type: Func }
   - { Name: _zx_fifo_write, Type: Func }
   - { Name: _zx_framebuffer_get_info, Type: Func }
-  - { Name: _zx_framebuffer_set_range, Type: Func }
   - { Name: _zx_futex_get_owner, Type: Func }
   - { Name: _zx_futex_requeue, Type: Func }
   - { Name: _zx_futex_requeue_single_owner, Type: Func }
@@ -246,7 +245,6 @@ Symbols:
   - { Name: zx_fifo_read, Type: Func, Weak: true }
   - { Name: zx_fifo_write, Type: Func, Weak: true }
   - { Name: zx_framebuffer_get_info, Type: Func, Weak: true }
-  - { Name: zx_framebuffer_set_range, Type: Func, Weak: true }
   - { Name: zx_futex_get_owner, Type: Func, Weak: true }
   - { Name: zx_futex_requeue, Type: Func, Weak: true }
   - { Name: zx_futex_requeue_single_owner, Type: Func, Weak: true }

tools/fidlcat/interception_tests/framebuffer_test.cc

@@ -23,15 +23,14 @@ std::unique_ptr<SystemCallTest> ZxFramebufferGetInfo(int64_t result, std::string
   return value;
 }
 
-#define FRAMEBUFFER_GET_INFO_DISPLAY_TEST_CONTENT(result, expected)                      \
-  uint32_t format = 1;                                                                   \
-  uint32_t width = 1080;                                                                 \
-  uint32_t height = 64;                                                                  \
-  uint32_t stride = 0;                                                                   \
-  PerformDisplayTest(                                                                    \
-      "$plt(zx_framebuffer_get_info)",                                                   \
-      ZxFramebufferGetInfo(result, #result, kHandle, &format, &width, &height, &stride), \
-      expected)
+#define FRAMEBUFFER_GET_INFO_DISPLAY_TEST_CONTENT(result, expected) \
+  uint32_t format = 1;                                              \
+  uint32_t width = 1080;                                            \
+  uint32_t height = 64;                                             \
+  uint32_t stride = 0;                                              \
+  PerformDisplayTest(                                               \
+      "$plt(zx_framebuffer_get_info)",                              \
+      ZxFramebufferGetInfo(result, #result, kHandle, &format, &width, &height, &stride), expected)
 
 #define FRAMEBUFFER_GET_INFO_DISPLAY_TEST(name, errno, expected) \
   TEST_F(InterceptionWorkflowTestX64, name) {                    \
@@ -54,49 +53,4 @@ FRAMEBUFFER_GET_INFO_DISPLAY_TEST(
     "height: \x1B[32muint32\x1B[0m = \x1B[34m64\x1B[0m, "
     "stride: \x1B[32muint32\x1B[0m = \x1B[34m0\x1B[0m)\n")
 
-// zx_framebuffer_set_range tests.
-
-std::unique_ptr<SystemCallTest> ZxFramebufferSetRange(int64_t result, std::string_view result_name,
-                                                      zx_handle_t resource, zx_handle_t vmo,
-                                                      uint32_t len, uint32_t format, uint32_t width,
-                                                      uint32_t height, uint32_t stride) {
-  auto value = std::make_unique<SystemCallTest>("zx_framebuffer_set_range", result, result_name);
-  value->AddInput(resource);
-  value->AddInput(vmo);
-  value->AddInput(len);
-  value->AddInput(format);
-  value->AddInput(width);
-  value->AddInput(height);
-  value->AddInput(stride);
-  return value;
-}
-
-#define FRAMEBUFFER_SET_RANGE_DISPLAY_TEST_CONTENT(result, expected) \
-  PerformDisplayTest(                                                \
-      "$plt(zx_framebuffer_set_range)",                              \
-      ZxFramebufferSetRange(result, #result, kHandle, kHandle2, 2000, 1, 1080, 64, 0), expected)
-
-#define FRAMEBUFFER_SET_RANGE_DISPLAY_TEST(name, errno, expected) \
-  TEST_F(InterceptionWorkflowTestX64, name) {                     \
-    FRAMEBUFFER_SET_RANGE_DISPLAY_TEST_CONTENT(errno, expected);  \
-  }                                                               \
-  TEST_F(InterceptionWorkflowTestArm, name) {                     \
-    FRAMEBUFFER_SET_RANGE_DISPLAY_TEST_CONTENT(errno, expected);  \
-  }
-
-FRAMEBUFFER_SET_RANGE_DISPLAY_TEST(ZxFramebufferSetRange, ZX_OK,
-                                   "\n"
-                                   "\x1B[32m0.000000\x1B[0m "
-                                   "test_3141 \x1B[31m3141\x1B[0m:\x1B[31m8764\x1B[0m "
-                                   "zx_framebuffer_set_range("
-                                   "resource: \x1B[32mhandle\x1B[0m = \x1B[31mcefa1db0\x1B[0m, "
-                                   "vmo: \x1B[32mhandle\x1B[0m = \x1B[31mcefa1222\x1B[0m, "
-                                   "len: \x1B[32muint32\x1B[0m = \x1B[34m2000\x1B[0m, "
-                                   "format: \x1B[32muint32\x1B[0m = \x1B[34m1\x1B[0m, "
-                                   "width: \x1B[32muint32\x1B[0m = \x1B[34m1080\x1B[0m, "
-                                   "height: \x1B[32muint32\x1B[0m = \x1B[34m64\x1B[0m, "
-                                   "stride: \x1B[32muint32\x1B[0m = \x1B[34m0\x1B[0m)\n"
-                                   "\x1B[32m0.000000\x1B[0m "
-                                   "  -> \x1B[32mZX_OK\x1B[0m\n")
-
 }  // namespace fidlcat

tools/fidlcat/interception_tests/interception_workflow_test.cc

@@ -419,7 +419,8 @@ void ProcessController::Initialize(zxdb::Session& session,
   initialized_ = true;
   global_dispatcher = dispatcher.get();
   std::vector<std::string> blank;
-  workflow_.Initialize(blank, blank, blank, blank, std::nullopt, blank, blank, std::move(dispatcher));
+  workflow_.Initialize(blank, blank, blank, blank, std::nullopt, blank, blank,
+                       std::move(dispatcher));
 
   // Create fake processes and threads.
   InjectProcesses(session);
@@ -552,7 +553,6 @@ TEST_F(InterceptionWorkflowTestX64, SyscallsAutomated) {
       "zx_fifo_read not automated\n"
       "zx_fifo_write not automated\n"
       "zx_framebuffer_get_info fully automated\n"
-      "zx_framebuffer_set_range doesn't need automation\n"
       "zx_futex_get_owner fully automated\n"
       "zx_futex_requeue doesn't need automation\n"
       "zx_futex_requeue_single_owner doesn't need automation\n"
@@ -672,7 +672,7 @@ TEST_F(InterceptionWorkflowTestX64, SyscallsAutomated) {
       "zx_vmo_set_size doesn't need automation\n"
       "zx_vmo_write fully automated\n";
   uint32_t expected_fully_automated = 64;
-  uint32_t expected_cant_be_automated = 59;
+  uint32_t expected_cant_be_automated = 58;
   uint32_t expected_partially_automated = 17;
   uint32_t expected_not_automated = 12;
   EXPECT_EQ(actual_fully_automated, expected_fully_automated);

tools/fidlcat/lib/syscall_definition.cc

@@ -5533,33 +5533,6 @@ void SyscallDecoderDispatcher::Populate() {
                                               std::make_unique<ArgumentAccess<uint32_t>>(stride));
   }
 
-  {
-    Syscall* zx_framebuffer_set_range = Add("zx_framebuffer_set_range", SyscallReturnType::kStatus);
-    // Arguments
-    auto resource = zx_framebuffer_set_range->Argument<zx_handle_t>(SyscallType::kHandle);
-    auto vmo = zx_framebuffer_set_range->Argument<zx_handle_t>(SyscallType::kHandle);
-    auto len = zx_framebuffer_set_range->Argument<uint32_t>(SyscallType::kUint32);
-    auto format = zx_framebuffer_set_range->Argument<uint32_t>(SyscallType::kUint32);
-    auto width = zx_framebuffer_set_range->Argument<uint32_t>(SyscallType::kUint32);
-    auto height = zx_framebuffer_set_range->Argument<uint32_t>(SyscallType::kUint32);
-    auto stride = zx_framebuffer_set_range->Argument<uint32_t>(SyscallType::kUint32);
-    // Inputs
-    zx_framebuffer_set_range->Input<zx_handle_t>(
-        "resource", std::make_unique<ArgumentAccess<zx_handle_t>>(resource));
-    zx_framebuffer_set_range->Input<zx_handle_t>(
-        "vmo", std::make_unique<ArgumentAccess<zx_handle_t>>(vmo));
-    zx_framebuffer_set_range->Input<uint32_t>("len",
-                                              std::make_unique<ArgumentAccess<uint32_t>>(len));
-    zx_framebuffer_set_range->Input<uint32_t>("format",
-                                              std::make_unique<ArgumentAccess<uint32_t>>(format));
-    zx_framebuffer_set_range->Input<uint32_t>("width",
-                                              std::make_unique<ArgumentAccess<uint32_t>>(width));
-    zx_framebuffer_set_range->Input<uint32_t>("height",
-                                              std::make_unique<ArgumentAccess<uint32_t>>(height));
-    zx_framebuffer_set_range->Input<uint32_t>("stride",
-                                              std::make_unique<ArgumentAccess<uint32_t>>(stride));
-  }
-
   {
     Syscall* zx_pci_get_nth_device = Add("zx_pci_get_nth_device", SyscallReturnType::kStatus);
     // Arguments

zircon/kernel/lib/syscalls/driver.cc

@@ -189,13 +189,6 @@ zx_status_t sys_framebuffer_get_info(zx_handle_t handle, user_out_ptr<uint32_t>
 #endif
 }
 
-// zx_status_t zx_framebuffer_set_range
-zx_status_t sys_framebuffer_set_range(zx_handle_t hrsrc, zx_handle_t vmo_handle, uint32_t len,
-                                      uint32_t format, uint32_t width, uint32_t height,
-                                      uint32_t stride) {
-  return ZX_ERR_NOT_SUPPORTED;
-}
-
 // zx_status_t zx_iommu_create
 zx_status_t sys_iommu_create(zx_handle_t resource, uint32_t type, user_in_ptr<const void> desc,
                              size_t desc_size, zx_handle_t* out) {

zircon/public/sysroot/sdk/sysroot.api

@@ -182,7 +182,7 @@
   "include/zircon/syscalls/debug.h": "637ad28699c3827990be02dca180ca38",
   "include/zircon/syscalls/exception.h": "334a353a8550a46173ee8b3d01b79a60",
   "include/zircon/syscalls/hypervisor.h": "2fde38fb441710b0e02c04dad4cbd42c",
-  "include/zircon/syscalls/internal/cdecls.inc": "baa75492a4a5d6e97fae9be93bd769ec",
+  "include/zircon/syscalls/internal/cdecls.inc": "10d9ebd824c8cf7a68625c45dbb9bb3b",
   "include/zircon/syscalls/iob.h": "222f568a237fabcdf20a3ae891ae19a8",
   "include/zircon/syscalls/iommu.h": "a6cc36174b0b1d5c34877f05d047bbc3",
   "include/zircon/syscalls/log.h": "1f6619faeaf65dd53f73cca4c107b4d2",

zircon/vdso/framebuffer.fidl

@@ -49,53 +49,4 @@ closed protocol Framebuffer {
         height uint32;
         stride uint32;
     }) error Status;
-
-    // TODO(https://fxbug.dev/42107929): vmo ZX_OBJ_TYPE_VMO; No rights required?
-    /// ## Summary
-    ///
-    /// TODO(https://fxbug.dev/42108078)
-    ///
-    /// ## Declaration
-    ///
-    /// ```c
-    /// #include <zircon/syscalls.h>
-    ///
-    /// zx_status_t zx_framebuffer_set_range(zx_handle_t resource,
-    ///                                      zx_handle_t vmo,
-    ///                                      uint32_t len,
-    ///                                      uint32_t format,
-    ///                                      uint32_t width,
-    ///                                      uint32_t height,
-    ///                                      uint32_t stride);
-    /// ```
-    ///
-    /// ## Description
-    ///
-    /// TODO(https://fxbug.dev/42108078)
-    ///
-    /// ## Rights
-    ///
-    /// *resource* must have resource kind `ZX_RSRC_KIND_SYSTEM` and resource
-    /// base `ZX_RSRC_SYSTEM_FRAMEBUFFER_BASE`.
-    ///
-    /// ## Return value
-    ///
-    /// TODO(https://fxbug.dev/42108078)
-    ///
-    /// ## Errors
-    ///
-    /// TODO(https://fxbug.dev/42108078)
-    ///
-    /// ## See also
-    ///
-    /// TODO(https://fxbug.dev/42108078)
-    strict SetRange(resource struct {
-        resource Handle:RESOURCE;
-        vmo Handle:VMO;
-        len uint32;
-        format uint32;
-        width uint32;
-        height uint32;
-        stride uint32;
-    }) -> () error Status;
 };