From: Alex Deucher <alexdeucher@gmail.com>
To: Thomas Zimmermann <tzimmermann@suse.de>
Cc: hamohammed.sa@gmail.com, Dave Airlie <airlied@linux.ie>,
nouveau <nouveau@lists.freedesktop.org>,
Maling list - DRI developers <dri-devel@lists.freedesktop.org>,
amd-gfx list <amd-gfx@lists.freedesktop.org>,
alexandre.torgue@st.com, Thomas Hellstrom <thellstrom@vmware.com>,
Sean Paul <sean@poorly.run>,
VMware Graphics <linux-graphics-maintainer@vmware.com>,
Ben Skeggs <bskeggs@redhat.com>,
mcoquelin.stm32@gmail.com,
"Leo \(Sunpeng\) Li" <sunpeng.li@amd.com>,
linux-arm-msm <linux-arm-msm@vger.kernel.org>,
Intel Graphics Development <intel-gfx@lists.freedesktop.org>,
Rodrigo Vivi <rodrigo.vivi@intel.com>,
Vincent Abriou <vincent.abriou@st.com>,
rodrigosiqueiramelo@gmail.com, philippe.cornu@st.com,
yannick.fertre@st.com, "Deucher,
Alexander" <alexander.deucher@amd.com>,
freedreno <freedreno@lists.freedesktop.org>,
Christian Koenig <christian.koenig@amd.com>
Subject: Re: [PATCH 12/23] drm/amdgpu: Convert to CRTC VBLANK callbacks
Date: Mon, 13 Jan 2020 14:00:53 -0500 [thread overview]
Message-ID: <CADnq5_OkU+kwE5P8SoTNrmXK2BSfh0crDq=r9NQCEL3vAsoRFA@mail.gmail.com> (raw)
In-Reply-To: <20200110092127.27847-13-tzimmermann@suse.de>
On Fri, Jan 10, 2020 at 4:22 AM Thomas Zimmermann <tzimmermann@suse.de> wrote:
>
> VBLANK callbacks in struct drm_driver are deprecated in favor of
> their equivalents in struct drm_crtc_funcs. Convert amdgpu over.
I think I'd prefer to just update the signatures of the relevant
functions rather than wrapping them.
Alex
>
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +++
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 ----
> drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 24 +++++++++++++++++++
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 ++++
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 ++++
> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 ++++
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 ++++
> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 4 ++++
> .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 2 ++
> 9 files changed, 49 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu.h b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> index 81a531b652aa..c1262ab588c9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu.h
> @@ -1197,6 +1197,9 @@ int amdgpu_device_resume(struct drm_device *dev, bool fbcon);
> u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe);
> int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe);
> void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe);
> +u32 amdgpu_crtc_get_vblank_counter(struct drm_crtc *crtc);
> +int amdgpu_crtc_enable_vblank(struct drm_crtc *crtc);
> +void amdgpu_crtc_disable_vblank(struct drm_crtc *crtc);
> long amdgpu_kms_compat_ioctl(struct file *filp, unsigned int cmd,
> unsigned long arg);
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 0749285dd1c7..9baa1ddf8693 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -1377,10 +1377,6 @@ static struct drm_driver kms_driver = {
> .postclose = amdgpu_driver_postclose_kms,
> .lastclose = amdgpu_driver_lastclose_kms,
> .unload = amdgpu_driver_unload_kms,
> - .get_vblank_counter = amdgpu_get_vblank_counter_kms,
> - .enable_vblank = amdgpu_enable_vblank_kms,
> - .disable_vblank = amdgpu_disable_vblank_kms,
> - .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,
> .irq_handler = amdgpu_irq_handler,
> .ioctls = amdgpu_ioctls_kms,
> .gem_free_object_unlocked = amdgpu_gem_object_free,
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> index 60591dbc2097..efe4671fb032 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c
> @@ -1174,6 +1174,14 @@ u32 amdgpu_get_vblank_counter_kms(struct drm_device *dev, unsigned int pipe)
> return count;
> }
>
> +u32 amdgpu_crtc_get_vblank_counter(struct drm_crtc *crtc)
> +{
> + struct drm_device *dev = crtc->dev;
> + unsigned int pipe = crtc->index;
> +
> + return amdgpu_get_vblank_counter_kms(dev, pipe);
> +}
> +
> /**
> * amdgpu_enable_vblank_kms - enable vblank interrupt
> *
> @@ -1191,6 +1199,14 @@ int amdgpu_enable_vblank_kms(struct drm_device *dev, unsigned int pipe)
> return amdgpu_irq_get(adev, &adev->crtc_irq, idx);
> }
>
> +int amdgpu_crtc_enable_vblank(struct drm_crtc *crtc)
> +{
> + struct drm_device *dev = crtc->dev;
> + unsigned int pipe = crtc->index;
> +
> + return amdgpu_enable_vblank_kms(dev, pipe);
> +}
> +
> /**
> * amdgpu_disable_vblank_kms - disable vblank interrupt
> *
> @@ -1207,6 +1223,14 @@ void amdgpu_disable_vblank_kms(struct drm_device *dev, unsigned int pipe)
> amdgpu_irq_put(adev, &adev->crtc_irq, idx);
> }
>
> +void amdgpu_crtc_disable_vblank(struct drm_crtc *crtc)
> +{
> + struct drm_device *dev = crtc->dev;
> + unsigned int pipe = crtc->index;
> +
> + amdgpu_disable_vblank_kms(dev, pipe);
> +}
> +
> const struct drm_ioctl_desc amdgpu_ioctls_kms[] = {
> DRM_IOCTL_DEF_DRV(AMDGPU_GEM_CREATE, amdgpu_gem_create_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),
> DRM_IOCTL_DEF_DRV(AMDGPU_CTX, amdgpu_ctx_ioctl, DRM_AUTH|DRM_RENDER_ALLOW),
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index bdc1e0f036d4..8e62f46f0bfd 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -2494,6 +2494,10 @@ static const struct drm_crtc_funcs dce_v10_0_crtc_funcs = {
> .set_config = amdgpu_display_crtc_set_config,
> .destroy = dce_v10_0_crtc_destroy,
> .page_flip_target = amdgpu_display_crtc_page_flip_target,
> + .get_vblank_counter = amdgpu_crtc_get_vblank_counter,
> + .enable_vblank = amdgpu_crtc_enable_vblank,
> + .disable_vblank = amdgpu_crtc_disable_vblank,
> + .get_vblank_timestamp = drm_crtc_calc_vbltimestamp_from_scanoutpos,
> };
>
> static void dce_v10_0_crtc_dpms(struct drm_crtc *crtc, int mode)
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 0319da5f7bf9..9e37e4a78403 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -2573,6 +2573,10 @@ static const struct drm_crtc_funcs dce_v11_0_crtc_funcs = {
> .set_config = amdgpu_display_crtc_set_config,
> .destroy = dce_v11_0_crtc_destroy,
> .page_flip_target = amdgpu_display_crtc_page_flip_target,
> + .get_vblank_counter = amdgpu_crtc_get_vblank_counter,
> + .enable_vblank = amdgpu_crtc_enable_vblank,
> + .disable_vblank = amdgpu_crtc_disable_vblank,
> + .get_vblank_timestamp = drm_crtc_calc_vbltimestamp_from_scanoutpos,
> };
>
> static void dce_v11_0_crtc_dpms(struct drm_crtc *crtc, int mode)
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index 78642c3b14fc..2d4c99d3b352 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -2388,6 +2388,10 @@ static const struct drm_crtc_funcs dce_v6_0_crtc_funcs = {
> .set_config = amdgpu_display_crtc_set_config,
> .destroy = dce_v6_0_crtc_destroy,
> .page_flip_target = amdgpu_display_crtc_page_flip_target,
> + .get_vblank_counter = amdgpu_crtc_get_vblank_counter,
> + .enable_vblank = amdgpu_crtc_enable_vblank,
> + .disable_vblank = amdgpu_crtc_disable_vblank,
> + .get_vblank_timestamp = drm_crtc_calc_vbltimestamp_from_scanoutpos,
> };
>
> static void dce_v6_0_crtc_dpms(struct drm_crtc *crtc, int mode)
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index 1e8d4975435a..cd51fd155349 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -2395,6 +2395,10 @@ static const struct drm_crtc_funcs dce_v8_0_crtc_funcs = {
> .set_config = amdgpu_display_crtc_set_config,
> .destroy = dce_v8_0_crtc_destroy,
> .page_flip_target = amdgpu_display_crtc_page_flip_target,
> + .get_vblank_counter = amdgpu_crtc_get_vblank_counter,
> + .enable_vblank = amdgpu_crtc_enable_vblank,
> + .disable_vblank = amdgpu_crtc_disable_vblank,
> + .get_vblank_timestamp = drm_crtc_calc_vbltimestamp_from_scanoutpos,
> };
>
> static void dce_v8_0_crtc_dpms(struct drm_crtc *crtc, int mode)
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index 4b2f915aba47..53c260deb384 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -123,6 +123,10 @@ static const struct drm_crtc_funcs dce_virtual_crtc_funcs = {
> .set_config = amdgpu_display_crtc_set_config,
> .destroy = dce_virtual_crtc_destroy,
> .page_flip_target = amdgpu_display_crtc_page_flip_target,
> + .get_vblank_counter = amdgpu_crtc_get_vblank_counter,
> + .enable_vblank = amdgpu_crtc_enable_vblank,
> + .disable_vblank = amdgpu_crtc_disable_vblank,
> + .get_vblank_timestamp = drm_crtc_calc_vbltimestamp_from_scanoutpos,
> };
>
> static void dce_virtual_crtc_dpms(struct drm_crtc *crtc, int mode)
> diff --git a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> index 39c5cf242c1b..0c51c4dd8c46 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -4214,8 +4214,10 @@ static const struct drm_crtc_funcs amdgpu_dm_crtc_funcs = {
> .set_crc_source = amdgpu_dm_crtc_set_crc_source,
> .verify_crc_source = amdgpu_dm_crtc_verify_crc_source,
> .get_crc_sources = amdgpu_dm_crtc_get_crc_sources,
> + .get_vblank_counter = amdgpu_crtc_get_vblank_counter,
> .enable_vblank = dm_enable_vblank,
> .disable_vblank = dm_disable_vblank,
> + .get_vblank_timestamp = drm_crtc_calc_vbltimestamp_from_scanoutpos,
> };
>
> static enum drm_connector_status
> --
> 2.24.1
>
> _______________________________________________
> amd-gfx mailing list
> amd-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/amd-gfx
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2020-01-13 19:01 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-10 9:21 [PATCH 00/23] drm: Clean up VBLANK callbacks in struct drm_driver Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 01/23] drm: Add get_scanout_position() to struct drm_crtc_helper_funcs Thomas Zimmermann
2020-01-10 10:24 ` Jani Nikula
2020-01-14 15:31 ` Yannick FERTRE
2020-01-15 7:31 ` Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 02/23] drm/amdgpu: Convert to struct drm_crtc_helper_funcs.get_scanout_position() Thomas Zimmermann
2020-01-13 18:52 ` Alex Deucher
2020-01-14 7:46 ` Thomas Zimmermann
2020-01-15 9:41 ` Thomas Zimmermann
2020-01-15 16:35 ` Alex Deucher
2020-01-10 9:21 ` [PATCH 03/23] drm/i915: Don't use struct drm_driver.get_scanout_position() Thomas Zimmermann
2020-01-10 11:59 ` Jani Nikula
2020-01-10 12:04 ` Thomas Zimmermann
2020-01-10 13:56 ` Jani Nikula
2020-01-10 15:25 ` Ville Syrjälä
2020-01-10 9:21 ` [PATCH 04/23] drm/nouveau: Convert to struct drm_crtc_helper_funcs.get_scanout_position() Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 05/23] drm/radeon: " Thomas Zimmermann
2020-01-13 18:53 ` Alex Deucher
2020-01-10 9:21 ` [PATCH 06/23] drm/msm: " Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 07/23] drm/vc4: " Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 08/23] drm/stm: " Thomas Zimmermann
2020-01-14 15:31 ` Yannick FERTRE
2020-01-10 9:21 ` [PATCH 09/23] drm: Remove struct drm_driver.get_scanout_position() Thomas Zimmermann
2020-01-14 15:32 ` Yannick FERTRE
2020-01-10 9:21 ` [PATCH 10/23] drm: Evaluate struct drm_device.vblank_disable_immediate on each use Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 11/23] drm: Add get_vblank_timestamp() to struct drm_crtc_funcs Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 12/23] drm/amdgpu: Convert to CRTC VBLANK callbacks Thomas Zimmermann
2020-01-13 19:00 ` Alex Deucher [this message]
2020-01-10 9:21 ` [PATCH 13/23] drm/gma500: " Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 14/23] drm/i915: " Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 15/23] drm/msm: " Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 16/23] drm/nouveau: " Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 17/23] drm/radeon: " Thomas Zimmermann
2020-01-13 19:02 ` Alex Deucher
2020-01-10 9:21 ` [PATCH 18/23] drm/sti: " Thomas Zimmermann
2020-01-10 13:38 ` Benjamin Gaignard
2020-01-10 9:21 ` [PATCH 19/23] drm/stm: " Thomas Zimmermann
2020-01-14 15:32 ` Yannick FERTRE
2020-01-10 9:21 ` [PATCH 20/23] drm/vc4: " Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 21/23] drm/vkms: " Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 22/23] drm/vmwgfx: " Thomas Zimmermann
2020-01-10 9:21 ` [PATCH 23/23] drm: Cleanup VBLANK callbacks in struct drm_driver Thomas Zimmermann
2020-01-12 22:53 ` Daniel Vetter
2020-01-12 22:54 ` Daniel Vetter
2020-01-14 13:48 ` Thomas Zimmermann
2020-01-14 15:32 ` Yannick FERTRE
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CADnq5_OkU+kwE5P8SoTNrmXK2BSfh0crDq=r9NQCEL3vAsoRFA@mail.gmail.com' \
--to=alexdeucher@gmail.com \
--cc=airlied@linux.ie \
--cc=alexander.deucher@amd.com \
--cc=alexandre.torgue@st.com \
--cc=amd-gfx@lists.freedesktop.org \
--cc=bskeggs@redhat.com \
--cc=christian.koenig@amd.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=freedreno@lists.freedesktop.org \
--cc=hamohammed.sa@gmail.com \
--cc=intel-gfx@lists.freedesktop.org \
--cc=linux-arm-msm@vger.kernel.org \
--cc=linux-graphics-maintainer@vmware.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=nouveau@lists.freedesktop.org \
--cc=philippe.cornu@st.com \
--cc=rodrigo.vivi@intel.com \
--cc=rodrigosiqueiramelo@gmail.com \
--cc=sean@poorly.run \
--cc=sunpeng.li@amd.com \
--cc=thellstrom@vmware.com \
--cc=tzimmermann@suse.de \
--cc=vincent.abriou@st.com \
--cc=yannick.fertre@st.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).