Hi Lyude,
> On 30 Sep 2024, at 20:09, Lyude Paul <lyude@xxxxxxxxxx> wrote:
>
> A simple binding for drm_add_modes_noedid() using the ConnectorGuard type
> we just added.
>
> Signed-off-by: Lyude Paul <lyude@xxxxxxxxxx>
> ---
> rust/bindings/bindings_helper.h | 2 ++
> rust/kernel/drm/kms/connector.rs | 11 +++++++++++
> 2 files changed, 13 insertions(+)
>
> diff --git a/rust/bindings/bindings_helper.h b/rust/bindings/bindings_helper.h
> index ba1871b05b7fa..7695f11f4363c 100644
> --- a/rust/bindings/bindings_helper.h
> +++ b/rust/bindings/bindings_helper.h
> @@ -10,6 +10,7 @@
> #include <drm/drm_atomic_helper.h>
> #include <drm/drm_device.h>
> #include <drm/drm_drv.h>
> +#include <drm/drm_edid.h>
> #include <drm/drm_file.h>
> #include <drm/drm_fourcc.h>
> #include <drm/drm_fbdev_dma.h>
> @@ -19,6 +20,7 @@
> #include <drm/drm_gem_shmem_helper.h>
> #include <drm/drm_mode_object.h>
> #include <drm/drm_ioctl.h>
> +#include <drm/drm_probe_helper.h>
> #include <kunit/test.h>
> #include <linux/blk-mq.h>
> #include <linux/blk_types.h>
> diff --git a/rust/kernel/drm/kms/connector.rs b/rust/kernel/drm/kms/connector.rs
> index 57ab29473c344..7d0f67c3bdaf8 100644
> --- a/rust/kernel/drm/kms/connector.rs
> +++ b/rust/kernel/drm/kms/connector.rs
> @@ -378,6 +378,17 @@ fn deref(&self) -> &Self::Target {
> }
> }
>
> +impl<'a, T: DriverConnector> ConnectorGuard<'a, T> {
> + /// Add modes for a [`ConnectorGuard`] without an EDID.
> + ///
> + /// Add the specified modes to the connector's mode list up to the given maximum resultion.
> + /// Returns how many modes were added.
> + pub fn add_modes_noedid(&self, (max_h, max_v): (i32, i32)) -> i32 {
> + // SAFETY: We hold the locks required to call this via our type invariants.
> + unsafe { bindings::drm_add_modes_noedid(self.as_raw(), max_h, max_v) }
> + }
> +}
> +
> // SAFETY: DRM expects this struct to be zero-initialized
> unsafe impl Zeroable for bindings::drm_connector_state {}
>
> --
> 2.46.1
>
LGTM.
— Daniel
