[PATCH] Revert "drm/amdgpu: fix vblank_time when displays are off"

[PATCH] Revert "drm/amdgpu: fix vblank_time when displays are off"

[Alex Deucher]

This reverts commit 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7.

Fixes a suspend and resume regression.

bug: https://bugzilla.kernel.org/show_bug.cgi?id=196615
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Cc: <stable@vger.kernel.org> # 4.12.x
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
index c0a8062..f4a4efe 100644
--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -839,8 +839,6 @@ static int amdgpu_cgs_get_active_displays_info(struct cgs_device *cgs_device,
 
 	mode_info = info->mode_info;
 	if (mode_info) {
-		/* if the displays are off, vblank time is max */
-		mode_info->vblank_time_us = 0xffffffff;
 		/* always set the reference clock */
 		mode_info->ref_clock = adev->clock.spll.reference_freq;
 	}
-- 
2.5.5

Re: [PATCH] Revert "drm/amdgpu: fix vblank_time when displays are off"

[Greg KH]

On Thu, Aug 17, 2017 at 04:36:51PM -0400, Alex Deucher wrote:
> This reverts commit 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7.
> 
> Fixes a suspend and resume regression.
> 
> bug: https://bugzilla.kernel.org/show_bug.cgi?id=196615
> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> Cc: <stable@vger.kernel.org> # 4.12.x
> ---
>  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 --
>  1 file changed, 2 deletions(-)

What is the git commit id of this patch in Linus's tree?

thanks,

greg k-h

Re: [PATCH] Revert "drm/amdgpu: fix vblank_time when displays are off"

[Alex Deucher]

On Fri, Aug 18, 2017 at 12:16 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> On Thu, Aug 17, 2017 at 04:36:51PM -0400, Alex Deucher wrote:
>> This reverts commit 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7.
>>
>> Fixes a suspend and resume regression.
>>
>> bug: https://bugzilla.kernel.org/show_bug.cgi?id=196615
>> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
>> Cc: <stable@vger.kernel.org> # 4.12.x
>> ---
>>  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 --
>>  1 file changed, 2 deletions(-)
>
> What is the git commit id of this patch in Linus's tree?

This patch was not reverted from Linus' tree. This is just a revert of
this patch from the 4.12 stable tree.  The patch works fine in Linus
tree, but causes a regression in 4.12.  The original patch in Linus'
tree was:
beb3777682d5c296cc15a2a424f5a7a98476def0
which was backported to 4.12 as:
2dc1889ebf8501b0edf125e89a30e1cf3744a2a7
and I'd now like to revert just the backport.

Thanks,

Alex

>
> thanks,
>
> greg k-h

Re: [PATCH] Revert "drm/amdgpu: fix vblank_time when displays are off"

[Greg KH]

On Fri, Aug 18, 2017 at 12:22:53PM -0400, Alex Deucher wrote:
> On Fri, Aug 18, 2017 at 12:16 PM, Greg KH <gregkh@linuxfoundation.org> wrote:
> > On Thu, Aug 17, 2017 at 04:36:51PM -0400, Alex Deucher wrote:
> >> This reverts commit 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7.
> >>
> >> Fixes a suspend and resume regression.
> >>
> >> bug: https://bugzilla.kernel.org/show_bug.cgi?id=196615
> >> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> >> Cc: <stable@vger.kernel.org> # 4.12.x
> >> ---
> >>  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 --
> >>  1 file changed, 2 deletions(-)
> >
> > What is the git commit id of this patch in Linus's tree?
> 
> This patch was not reverted from Linus' tree. This is just a revert of
> this patch from the 4.12 stable tree.  The patch works fine in Linus
> tree, but causes a regression in 4.12.  The original patch in Linus'
> tree was:
> beb3777682d5c296cc15a2a424f5a7a98476def0
> which was backported to 4.12 as:
> 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7
> and I'd now like to revert just the backport.

Why does the backport need to be reverted as it works properly in
Linus's tree?  Are we missing something else in 4.12-stable?  This seems
very odd...

thanks,

greg k-h

Re: [PATCH] Revert "drm/amdgpu: fix vblank_time when displays are off"

['Greg KH']

On Fri, Aug 18, 2017 at 04:41:55PM +0000, Deucher, Alexander wrote:
> > -----Original Message-----
> > From: Greg KH [mailto:gregkh@linuxfoundation.org]
> > Sent: Friday, August 18, 2017 12:31 PM
> > To: Alex Deucher
> > Cc: for 3.8; Deucher, Alexander
> > Subject: Re: [PATCH] Revert "drm/amdgpu: fix vblank_time when displays
> > are off"
> > 
> > On Fri, Aug 18, 2017 at 12:22:53PM -0400, Alex Deucher wrote:
> > > On Fri, Aug 18, 2017 at 12:16 PM, Greg KH <gregkh@linuxfoundation.org>
> > wrote:
> > > > On Thu, Aug 17, 2017 at 04:36:51PM -0400, Alex Deucher wrote:
> > > >> This reverts commit 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7.
> > > >>
> > > >> Fixes a suspend and resume regression.
> > > >>
> > > >> bug: https://bugzilla.kernel.org/show_bug.cgi?id=196615
> > > >> Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
> > > >> Cc: <stable@vger.kernel.org> # 4.12.x
> > > >> ---
> > > >>  drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 --
> > > >>  1 file changed, 2 deletions(-)
> > > >
> > > > What is the git commit id of this patch in Linus's tree?
> > >
> > > This patch was not reverted from Linus' tree. This is just a revert of
> > > this patch from the 4.12 stable tree.  The patch works fine in Linus
> > > tree, but causes a regression in 4.12.  The original patch in Linus'
> > > tree was:
> > > beb3777682d5c296cc15a2a424f5a7a98476def0
> > > which was backported to 4.12 as:
> > > 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7
> > > and I'd now like to revert just the backport.
> > 
> > Why does the backport need to be reverted as it works properly in
> > Linus's tree?  Are we missing something else in 4.12-stable?  This seems
> > very odd...
> 
> Presumably we are missing some other patch from master that is not in
> stable.  I haven't had time to dig further.

Hm, ok, I guess I can just drop this...

Patch "Revert "drm/amdgpu: fix vblank_time when displays are off"" has been added to the 4.12-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    Revert "drm/amdgpu: fix vblank_time when displays are off"

to the 4.12-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     revert-drm-amdgpu-fix-vblank_time-when-displays-are-off.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From alexdeucher@gmail.com  Sun Aug 27 14:19:36 2017
From: Alex Deucher <alexdeucher@gmail.com>
Date: Thu, 17 Aug 2017 16:36:51 -0400
Subject: Revert "drm/amdgpu: fix vblank_time when displays are off"
To: gregkh@linuxfoundation.org, stable@vger.kernel.org
Cc: Alex Deucher <alexander.deucher@amd.com>
Message-ID: <1503002211-2813-1-git-send-email-alexander.deucher@amd.com>

From: Alex Deucher <alexdeucher@gmail.com>

This reverts commit 2dc1889ebf8501b0edf125e89a30e1cf3744a2a7.

Fixes a suspend and resume regression.

bug: https://bugzilla.kernel.org/show_bug.cgi?id=196615
Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---
 drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c |    2 --
 1 file changed, 2 deletions(-)

--- a/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
+++ b/drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c
@@ -839,8 +839,6 @@ static int amdgpu_cgs_get_active_display
 
 	mode_info = info->mode_info;
 	if (mode_info) {
-		/* if the displays are off, vblank time is max */
-		mode_info->vblank_time_us = 0xffffffff;
 		/* always set the reference clock */
 		mode_info->ref_clock = adev->clock.spll.reference_freq;
 	}


Patches currently in stable-queue which might be from alexdeucher@gmail.com are

queue-4.12/revert-drm-amdgpu-fix-vblank_time-when-displays-are-off.patch