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 02/23] drm/amdgpu: Convert to struct drm_crtc_helper_funcs.get_scanout_position()
Date: Mon, 13 Jan 2020 13:52:21 -0500 [thread overview]
Message-ID: <CADnq5_OCsQQ0=Yr6xinWWCursZc0ZGBrNj1=0667kbqE1BorVw@mail.gmail.com> (raw)
In-Reply-To: <20200110092127.27847-3-tzimmermann@suse.de>
On Fri, Jan 10, 2020 at 4:21 AM Thomas Zimmermann <tzimmermann@suse.de> wrote:
>
> The callback struct drm_driver.get_scanout_position() is deprecated in
> favor of struct drm_crtc_helper_funcs.get_scanout_position(). Convert
> amdgpu over.
>
I would prefer to just change the signature of
amdgpu_display_get_crtc_scanoutpos() to match the new API rather than
wrapping it again.
Alex
> Signed-off-by: Thomas Zimmermann <tzimmermann@suse.de>
> ---
> drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 12 ++++++++++++
> drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 11 -----------
> drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 5 +++++
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 1 +
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 +
> drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 +
> drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 +
> drivers/gpu/drm/amd/amdgpu/dce_virtual.c | 1 +
> drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 3 ++-
> 9 files changed, 24 insertions(+), 12 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> index 4e699071d144..a1e769d4417d 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_display.c
> @@ -914,3 +914,15 @@ int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc)
> return AMDGPU_CRTC_IRQ_NONE;
> }
> }
> +
> +bool amdgpu_crtc_get_scanout_position(struct drm_crtc *crtc,
> + bool in_vblank_irq, int *vpos,
> + int *hpos, ktime_t *stime, ktime_t *etime,
> + const struct drm_display_mode *mode)
> +{
> + struct drm_device *dev = crtc->dev;
> + unsigned int pipe = crtc->index;
> +
> + return amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
> + stime, etime, mode);
> +}
> diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> index 3f6f14ce1511..0749285dd1c7 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
> @@ -1367,16 +1367,6 @@ int amdgpu_file_to_fpriv(struct file *filp, struct amdgpu_fpriv **fpriv)
> return 0;
> }
>
> -static bool
> -amdgpu_get_crtc_scanout_position(struct drm_device *dev, unsigned int pipe,
> - bool in_vblank_irq, int *vpos, int *hpos,
> - ktime_t *stime, ktime_t *etime,
> - const struct drm_display_mode *mode)
> -{
> - return amdgpu_display_get_crtc_scanoutpos(dev, pipe, 0, vpos, hpos,
> - stime, etime, mode);
> -}
> -
> static struct drm_driver kms_driver = {
> .driver_features =
> DRIVER_USE_AGP | DRIVER_ATOMIC |
> @@ -1391,7 +1381,6 @@ static struct drm_driver kms_driver = {
> .enable_vblank = amdgpu_enable_vblank_kms,
> .disable_vblank = amdgpu_disable_vblank_kms,
> .get_vblank_timestamp = drm_calc_vbltimestamp_from_scanoutpos,
> - .get_scanout_position = amdgpu_get_crtc_scanout_position,
> .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_mode.h b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> index eb9975f4decb..37ba07e2feb5 100644
> --- a/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> +++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h
> @@ -612,6 +612,11 @@ void amdgpu_panel_mode_fixup(struct drm_encoder *encoder,
> struct drm_display_mode *adjusted_mode);
> int amdgpu_display_crtc_idx_to_irq_type(struct amdgpu_device *adev, int crtc);
>
> +bool amdgpu_crtc_get_scanout_position(struct drm_crtc *crtc,
> + bool in_vblank_irq, int *vpos,
> + int *hpos, ktime_t *stime, ktime_t *etime,
> + const struct drm_display_mode *mode);
> +
> /* fbdev layer */
> int amdgpu_fbdev_init(struct amdgpu_device *adev);
> void amdgpu_fbdev_fini(struct amdgpu_device *adev);
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index 40d2ac723dd6..bdc1e0f036d4 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -2685,6 +2685,7 @@ static const struct drm_crtc_helper_funcs dce_v10_0_crtc_helper_funcs = {
> .prepare = dce_v10_0_crtc_prepare,
> .commit = dce_v10_0_crtc_commit,
> .disable = dce_v10_0_crtc_disable,
> + .get_scanout_position = amdgpu_crtc_get_scanout_position,
> };
>
> static int dce_v10_0_crtc_init(struct amdgpu_device *adev, int index)
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 898ef72d423c..0319da5f7bf9 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -2793,6 +2793,7 @@ static const struct drm_crtc_helper_funcs dce_v11_0_crtc_helper_funcs = {
> .prepare = dce_v11_0_crtc_prepare,
> .commit = dce_v11_0_crtc_commit,
> .disable = dce_v11_0_crtc_disable,
> + .get_scanout_position = amdgpu_crtc_get_scanout_position,
> };
>
> static int dce_v11_0_crtc_init(struct amdgpu_device *adev, int index)
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> index db15a112becc..78642c3b14fc 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
> @@ -2575,6 +2575,7 @@ static const struct drm_crtc_helper_funcs dce_v6_0_crtc_helper_funcs = {
> .prepare = dce_v6_0_crtc_prepare,
> .commit = dce_v6_0_crtc_commit,
> .disable = dce_v6_0_crtc_disable,
> + .get_scanout_position = amdgpu_crtc_get_scanout_position,
> };
>
> static int dce_v6_0_crtc_init(struct amdgpu_device *adev, int index)
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> index f06c9022c1fd..1e8d4975435a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
> @@ -2593,6 +2593,7 @@ static const struct drm_crtc_helper_funcs dce_v8_0_crtc_helper_funcs = {
> .prepare = dce_v8_0_crtc_prepare,
> .commit = dce_v8_0_crtc_commit,
> .disable = dce_v8_0_crtc_disable,
> + .get_scanout_position = amdgpu_crtc_get_scanout_position,
> };
>
> static int dce_v8_0_crtc_init(struct amdgpu_device *adev, int index)
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> index e4f94863332c..4b2f915aba47 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_virtual.c
> @@ -218,6 +218,7 @@ static const struct drm_crtc_helper_funcs dce_virtual_crtc_helper_funcs = {
> .prepare = dce_virtual_crtc_prepare,
> .commit = dce_virtual_crtc_commit,
> .disable = dce_virtual_crtc_disable,
> + .get_scanout_position = amdgpu_crtc_get_scanout_position,
> };
>
> static int dce_virtual_crtc_init(struct amdgpu_device *adev, int index)
> 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 f2db400a3920..39c5cf242c1b 100644
> --- a/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> +++ b/drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
> @@ -4821,7 +4821,8 @@ static bool dm_crtc_helper_mode_fixup(struct drm_crtc *crtc,
> static const struct drm_crtc_helper_funcs amdgpu_dm_crtc_helper_funcs = {
> .disable = dm_crtc_helper_disable,
> .atomic_check = dm_crtc_helper_atomic_check,
> - .mode_fixup = dm_crtc_helper_mode_fixup
> + .mode_fixup = dm_crtc_helper_mode_fixup,
> + .get_scanout_position = amdgpu_crtc_get_scanout_position,
> };
>
> static void dm_encoder_helper_disable(struct drm_encoder *encoder)
> --
> 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 18:52 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 [this message]
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
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_OCsQQ0=Yr6xinWWCursZc0ZGBrNj1=0667kbqE1BorVw@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).