From: "Michel Dänzer" <michel@daenzer.net>
To: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Daniel Vetter <daniel.vetter@intel.com>,
DRI Development <dri-devel@lists.freedesktop.org>
Subject: Re: [PATCH 3/3] drm/amdgpu: Switch to drm_vblank_on/off
Date: Fri, 22 Jan 2016 12:23:28 +0900 [thread overview]
Message-ID: <56A1A0B0.30901@daenzer.net> (raw)
In-Reply-To: <1453370938-5464-3-git-send-email-daniel.vetter@ffwll.ch>
On 21.01.2016 19:08, Daniel Vetter wrote:
> Equivalent change to the radeon driver.
>
> Note that with radeon this caught a bug in the dri3 DDX
> implementation, which asked for vblank interrupts when the pipe is
> off. That bug needs to be fixed before we can merge this patch (if
> amdgpu is affected too). Michel discovered this one.
This is fixed in xf86-video-amdgpu as well.
> Cc: Michel Dänzer <michel.daenzer@amd.com>
> Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
> ---
> drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 ++--
> drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 ++--
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> index 093599aba64b..d3926d193018 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
> @@ -2701,13 +2701,13 @@ static void dce_v10_0_crtc_dpms(struct drm_crtc *crtc, int mode)
> type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
> amdgpu_irq_update(adev, &adev->crtc_irq, type);
> amdgpu_irq_update(adev, &adev->pageflip_irq, type);
> - drm_vblank_post_modeset(dev, amdgpu_crtc->crtc_id);
> + drm_vblank_on(dev, amdgpu_crtc->crtc_id);
> dce_v10_0_crtc_load_lut(crtc);
> break;
> case DRM_MODE_DPMS_STANDBY:
> case DRM_MODE_DPMS_SUSPEND:
> case DRM_MODE_DPMS_OFF:
> - drm_vblank_pre_modeset(dev, amdgpu_crtc->crtc_id);
> + drm_vblank_off(dev, amdgpu_crtc->crtc_id);
> if (amdgpu_crtc->enabled) {
> dce_v10_0_vga_enable(crtc, true);
> amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);
> diff --git a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> index 8e67249d4367..789c7f9f623a 100644
> --- a/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> +++ b/drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
> @@ -2692,13 +2692,13 @@ static void dce_v11_0_crtc_dpms(struct drm_crtc *crtc, int mode)
> type = amdgpu_crtc_idx_to_irq_type(adev, amdgpu_crtc->crtc_id);
> amdgpu_irq_update(adev, &adev->crtc_irq, type);
> amdgpu_irq_update(adev, &adev->pageflip_irq, type);
> - drm_vblank_post_modeset(dev, amdgpu_crtc->crtc_id);
> + drm_vblank_on(dev, amdgpu_crtc->crtc_id);
> dce_v11_0_crtc_load_lut(crtc);
> break;
> case DRM_MODE_DPMS_STANDBY:
> case DRM_MODE_DPMS_SUSPEND:
> case DRM_MODE_DPMS_OFF:
> - drm_vblank_pre_modeset(dev, amdgpu_crtc->crtc_id);
> + drm_vblank_off(dev, amdgpu_crtc->crtc_id);
> if (amdgpu_crtc->enabled) {
> dce_v11_0_vga_enable(crtc, true);
> amdgpu_atombios_crtc_blank(crtc, ATOM_ENABLE);
>
You missed dce_v8_0.c. With that fixed,
Acked-by: Michel Dänzer <michel.daenzer@amd.com>
--
Earthling Michel Dänzer | http://www.amd.com
Libre software enthusiast | Mesa and X developer
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/dri-devel
next prev parent reply other threads:[~2016-01-22 3:23 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-21 10:08 [PATCH 1/3] drm/nouveau: Use drm_vblank_on/off consistently Daniel Vetter
2016-01-21 10:08 ` [PATCH 2/3] drm/radeon: Switch to drm_vblank_on/off Daniel Vetter
2016-01-22 3:20 ` Michel Dänzer
2016-01-21 10:08 ` [PATCH 3/3] drm/amdgpu: " Daniel Vetter
2016-01-22 3:23 ` Michel Dänzer [this message]
2016-01-22 2:14 ` [PATCH 1/3] drm/nouveau: Use drm_vblank_on/off consistently Michel Dänzer
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=56A1A0B0.30901@daenzer.net \
--to=michel@daenzer.net \
--cc=daniel.vetter@ffwll.ch \
--cc=daniel.vetter@intel.com \
--cc=dri-devel@lists.freedesktop.org \
/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