| Message ID | 1395831896-32278-1-git-send-email-deathsimple@vodafone.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Wed, Mar 26, 2014 at 7:04 AM, Christian König <deathsimple@vodafone.de> wrote: > From: Christian König <christian.koenig@amd.com> > > If the IB test fails we don't want to reset the card over > and over again, just accept that it isn't working. > > Signed-off-by: Christian König <christian.koenig@amd.com> > Cc: stable@vger.kernel.org You might want to add the link to the bug. Other than that: Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > --- > drivers/gpu/drm/radeon/radeon_ring.c | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c > index 15e44a7..8391fca 100644 > --- a/drivers/gpu/drm/radeon/radeon_ring.c > +++ b/drivers/gpu/drm/radeon/radeon_ring.c > @@ -257,6 +257,7 @@ int radeon_ib_ring_tests(struct radeon_device *rdev) > r = radeon_ib_test(rdev, i, ring); > if (r) { > ring->ready = false; > + rdev->needs_reset = false; > > if (i == RADEON_RING_TYPE_GFX_INDEX) { > /* oh, oh, that's really bad */ > -- > 1.9.1 >
Am 26.03.2014 14:03, schrieb Alex Deucher: > On Wed, Mar 26, 2014 at 7:04 AM, Christian König > <deathsimple@vodafone.de> wrote: >> From: Christian König <christian.koenig@amd.com> >> >> If the IB test fails we don't want to reset the card over >> and over again, just accept that it isn't working. >> >> Signed-off-by: Christian König <christian.koenig@amd.com> >> Cc: stable@vger.kernel.org > You might want to add the link to the bug. Good point. > Other than that: > > Reviewed-by: Alex Deucher <alexander.deucher@amd.com> Do you think there will be another drm-fixes-3.14 this patch might become part of or should we pull it in through drm-next-3.15? Christian. > >> --- >> drivers/gpu/drm/radeon/radeon_ring.c | 1 + >> 1 file changed, 1 insertion(+) >> >> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c >> index 15e44a7..8391fca 100644 >> --- a/drivers/gpu/drm/radeon/radeon_ring.c >> +++ b/drivers/gpu/drm/radeon/radeon_ring.c >> @@ -257,6 +257,7 @@ int radeon_ib_ring_tests(struct radeon_device *rdev) >> r = radeon_ib_test(rdev, i, ring); >> if (r) { >> ring->ready = false; >> + rdev->needs_reset = false; >> >> if (i == RADEON_RING_TYPE_GFX_INDEX) { >> /* oh, oh, that's really bad */ >> -- >> 1.9.1 >>
On Wed, Mar 26, 2014 at 9:50 AM, Christian König <deathsimple@vodafone.de> wrote: > Am 26.03.2014 14:03, schrieb Alex Deucher: > >> On Wed, Mar 26, 2014 at 7:04 AM, Christian König >> <deathsimple@vodafone.de> wrote: >>> >>> From: Christian König <christian.koenig@amd.com> >>> >>> If the IB test fails we don't want to reset the card over >>> and over again, just accept that it isn't working. >>> >>> Signed-off-by: Christian König <christian.koenig@amd.com> >>> Cc: stable@vger.kernel.org >> >> You might want to add the link to the bug. > > > Good point. > > >> Other than that: >> >> Reviewed-by: Alex Deucher <alexander.deucher@amd.com> > > > Do you think there will be another drm-fixes-3.14 this patch might become > part of or should we pull it in through drm-next-3.15? > Probably 3.15 at this point. Alex > Christian. > > >> >>> --- >>> drivers/gpu/drm/radeon/radeon_ring.c | 1 + >>> 1 file changed, 1 insertion(+) >>> >>> diff --git a/drivers/gpu/drm/radeon/radeon_ring.c >>> b/drivers/gpu/drm/radeon/radeon_ring.c >>> index 15e44a7..8391fca 100644 >>> --- a/drivers/gpu/drm/radeon/radeon_ring.c >>> +++ b/drivers/gpu/drm/radeon/radeon_ring.c >>> @@ -257,6 +257,7 @@ int radeon_ib_ring_tests(struct radeon_device *rdev) >>> r = radeon_ib_test(rdev, i, ring); >>> if (r) { >>> ring->ready = false; >>> + rdev->needs_reset = false; >>> >>> if (i == RADEON_RING_TYPE_GFX_INDEX) { >>> /* oh, oh, that's really bad */ >>> -- >>> 1.9.1 >>> >
diff --git a/drivers/gpu/drm/radeon/radeon_ring.c b/drivers/gpu/drm/radeon/radeon_ring.c index 15e44a7..8391fca 100644 --- a/drivers/gpu/drm/radeon/radeon_ring.c +++ b/drivers/gpu/drm/radeon/radeon_ring.c @@ -257,6 +257,7 @@ int radeon_ib_ring_tests(struct radeon_device *rdev) r = radeon_ib_test(rdev, i, ring); if (r) { ring->ready = false; + rdev->needs_reset = false; if (i == RADEON_RING_TYPE_GFX_INDEX) { /* oh, oh, that's really bad */