| Message ID | 1352133298-19666-1-git-send-email-alexdeucher@gmail.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On Mon, 2012-11-05 at 11:34 -0500, alexdeucher@gmail.com wrote: > From: Alex Deucher <alexander.deucher@amd.com> > > Add missing index that may have led us to enabling > more crtcs than necessary. > > May also fix: > https://bugs.freedesktop.org/show_bug.cgi?id=56139 > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
On Mon, Nov 5, 2012 at 11:34 AM, <alexdeucher@gmail.com> wrote: > From: Alex Deucher <alexander.deucher@amd.com> > > Add missing index that may have led us to enabling > more crtcs than necessary. > > May also fix: > https://bugs.freedesktop.org/show_bug.cgi?id=56139 > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > Cc: stable@vger.kernel.org Looks like the stable cc got dropped when this patch got pulled. The original patch was backported to older kernels. Alex > --- > drivers/gpu/drm/radeon/evergreen.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c > index 14313ad..af31f82 100644 > --- a/drivers/gpu/drm/radeon/evergreen.c > +++ b/drivers/gpu/drm/radeon/evergreen.c > @@ -1372,7 +1372,7 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s > WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN); > > for (i = 0; i < rdev->num_crtc; i++) { > - if (save->crtc_enabled) { > + if (save->crtc_enabled[i]) { > if (ASIC_IS_DCE6(rdev)) { > tmp = RREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]); > tmp |= EVERGREEN_CRTC_BLANK_DATA_EN; > -- > 1.7.7.5 >
On Wed, Nov 07, 2012 at 09:32:38AM -0500, Alex Deucher wrote: > On Mon, Nov 5, 2012 at 11:34 AM, <alexdeucher@gmail.com> wrote: > > From: Alex Deucher <alexander.deucher@amd.com> > > > > Add missing index that may have led us to enabling > > more crtcs than necessary. > > > > May also fix: > > https://bugs.freedesktop.org/show_bug.cgi?id=56139 > > > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > > Cc: stable@vger.kernel.org > > Looks like the stable cc got dropped when this patch got pulled. The > original patch was backported to older kernels. It was? What do you mean by this? What is the git commit id of this in Linus's tree? confused, greg k-h
On Wed, Nov 7, 2012 at 9:38 AM, Greg KH <gregkh@linuxfoundation.org> wrote: > On Wed, Nov 07, 2012 at 09:32:38AM -0500, Alex Deucher wrote: >> On Mon, Nov 5, 2012 at 11:34 AM, <alexdeucher@gmail.com> wrote: >> > From: Alex Deucher <alexander.deucher@amd.com> >> > >> > Add missing index that may have led us to enabling >> > more crtcs than necessary. >> > >> > May also fix: >> > https://bugs.freedesktop.org/show_bug.cgi?id=56139 >> > >> > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> >> > Cc: stable@vger.kernel.org >> >> Looks like the stable cc got dropped when this patch got pulled. The >> original patch was backported to older kernels. > > It was? What do you mean by this? What is the git commit id of this in > Linus's tree? Ben Hutchings ported the original patch to older kernels. I can't find the email thread at the moment, but here's the patch for 3.2: https://lkml.org/lkml/2012/10/14/192 http://lwn.net/Articles/520411/ Alex > > confused, > > greg k-h
On Thu, Nov 8, 2012 at 12:54 AM, Alex Deucher <alexdeucher@gmail.com> wrote: > On Wed, Nov 7, 2012 at 9:38 AM, Greg KH <gregkh@linuxfoundation.org> wrote: >> On Wed, Nov 07, 2012 at 09:32:38AM -0500, Alex Deucher wrote: >>> On Mon, Nov 5, 2012 at 11:34 AM, <alexdeucher@gmail.com> wrote: >>> > From: Alex Deucher <alexander.deucher@amd.com> >>> > >>> > Add missing index that may have led us to enabling >>> > more crtcs than necessary. >>> > >>> > May also fix: >>> > https://bugs.freedesktop.org/show_bug.cgi?id=56139 >>> > >>> > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> >>> > Cc: stable@vger.kernel.org >>> >>> Looks like the stable cc got dropped when this patch got pulled. The >>> original patch was backported to older kernels. >> >> It was? What do you mean by this? What is the git commit id of this in >> Linus's tree? > > Ben Hutchings ported the original patch to older kernels. I can't > find the email thread at the moment, but here's the patch for 3.2: > https://lkml.org/lkml/2012/10/14/192 > http://lwn.net/Articles/520411/ Oh I couldn't find it so I didn't bother with the cc. Sorry, Dave.
On Wed, 2012-11-07 at 09:32 -0500, Alex Deucher wrote: > On Mon, Nov 5, 2012 at 11:34 AM, <alexdeucher@gmail.com> wrote: > > From: Alex Deucher <alexander.deucher@amd.com> > > > > Add missing index that may have led us to enabling > > more crtcs than necessary. > > > > May also fix: > > https://bugs.freedesktop.org/show_bug.cgi?id=56139 > > > > Signed-off-by: Alex Deucher <alexander.deucher@amd.com> > > Cc: stable@vger.kernel.org > > Looks like the stable cc got dropped when this patch got pulled. The > original patch was backported to older kernels. [...] Queued up for 3.2, thanks. Ben.
diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 14313ad..af31f82 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -1372,7 +1372,7 @@ void evergreen_mc_resume(struct radeon_device *rdev, struct evergreen_mc_save *s WREG32(BIF_FB_EN, FB_READ_EN | FB_WRITE_EN); for (i = 0; i < rdev->num_crtc; i++) { - if (save->crtc_enabled) { + if (save->crtc_enabled[i]) { if (ASIC_IS_DCE6(rdev)) { tmp = RREG32(EVERGREEN_CRTC_BLANK_CONTROL + crtc_offsets[i]); tmp |= EVERGREEN_CRTC_BLANK_DATA_EN;