[PATCH v2 2/9] drm/amdgpu: Do not set struct drm_driver.lastclose

[Alex Deucher]

On Mon, Aug 12, 2024 at 3:05 PM Alex Deucher <alexdeucher at gmail.com> wrote:
>
> On Mon, Aug 12, 2024 at 4:30 AM Thomas Zimmermann <tzimmermann at suse.de> wrote:
> >
> > Remove the implementation of struct drm_driver.lastclose. The hook
> > was only necessary before in-kernel DRM clients existed, but is now
> > obsolete. The code in amdgpu_driver_lastclose_kms() is performed by
> > drm_lastclose().
> >
> > v2:
> > - update commit message
> >
> > Signed-off-by: Thomas Zimmermann <tzimmermann at suse.de>
>
> Reviewed-by: Alex Deucher <alexander.deucher at amd.com>

Feel free to take these through drm-misc.

Alex

>
> > ---
> >  drivers/gpu/drm/amd/amdgpu/amdgpu.h     |  1 -
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c |  2 --
> >  drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 17 -----------------
> >  3 files changed, 20 deletions(-)
> >
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > index 137a88b8de45..4baeb6519fda 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> > @@ -1484,7 +1484,6 @@ extern const int amdgpu_max_kms_ioctl;
> >
> >  int amdgpu_driver_load_kms(struct amdgpu_device *adev, unsigned long flags);
> >  void amdgpu_driver_unload_kms(struct drm_device *dev);
> > -void amdgpu_driver_lastclose_kms(struct drm_device *dev);
> >  int amdgpu_driver_open_kms(struct drm_device *dev, struct drm_file *file_priv);
> >  void amdgpu_driver_postclose_kms(struct drm_device *dev,
> >                                  struct drm_file *file_priv);
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > index 094498a0964b..5dd39e6c6223 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> > @@ -2953,7 +2953,6 @@ static const struct drm_driver amdgpu_kms_driver = {
> >             DRIVER_SYNCOBJ_TIMELINE,
> >         .open = amdgpu_driver_open_kms,
> >         .postclose = amdgpu_driver_postclose_kms,
> > -       .lastclose = amdgpu_driver_lastclose_kms,
> >         .ioctls = amdgpu_ioctls_kms,
> >         .num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms),
> >         .dumb_create = amdgpu_mode_dumb_create,
> > @@ -2980,7 +2979,6 @@ const struct drm_driver amdgpu_partition_driver = {
> >             DRIVER_SYNCOBJ_TIMELINE,
> >         .open = amdgpu_driver_open_kms,
> >         .postclose = amdgpu_driver_postclose_kms,
> > -       .lastclose = amdgpu_driver_lastclose_kms,
> >         .ioctls = amdgpu_ioctls_kms,
> >         .num_ioctls = ARRAY_SIZE(amdgpu_ioctls_kms),
> >         .dumb_create = amdgpu_mode_dumb_create,
> > diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > index 66782be5917b..0a799942343d 100644
> > --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> > @@ -1269,23 +1269,6 @@ int amdgpu_info_ioctl(struct drm_device *dev, void *data, struct drm_file *filp)
> >         return 0;
> >  }
> >
> > -
> > -/*
> > - * Outdated mess for old drm with Xorg being in charge (void function now).
> > - */
> > -/**
> > - * amdgpu_driver_lastclose_kms - drm callback for last close
> > - *
> > - * @dev: drm dev pointer
> > - *
> > - * Switch vga_switcheroo state after last close (all asics).
> > - */
> > -void amdgpu_driver_lastclose_kms(struct drm_device *dev)
> > -{
> > -       drm_fb_helper_lastclose(dev);
> > -       vga_switcheroo_process_delayed_switch();
> > -}
> > -
> >  /**
> >   * amdgpu_driver_open_kms - drm callback for open
> >   *
> > --
> > 2.46.0
> >