| Message ID | 1376585722-2469-1-git-send-email-zajec5@gmail.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Thu, Aug 15, 2013 at 12:55 PM, Rafa? Mi?ecki <zajec5@gmail.com> wrote: > This bug (introduced in 3.10) in WREG32_OR made > commit d3418eacad403033e95e49dc14afa37c2112c134 > "drm/radeon/evergreen: setup HDMI before enabling it" > cause a regression. Sometimes audio over HDMI wasn't working, sometimes > display was corrupted. > > This fixes: > https://bugzilla.kernel.org/show_bug.cgi?id=60687 > https://bugzilla.kernel.org/show_bug.cgi?id=60709 > https://bugs.freedesktop.org/show_bug.cgi?id=67767 > > Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> > Cc: stable@vger.kernel.org Added to my -fixes queue. Thanks! Alex > --- > drivers/gpu/drm/radeon/radeon.h | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h > index 9fc9e71..289047e 100644 > --- a/drivers/gpu/drm/radeon/radeon.h > +++ b/drivers/gpu/drm/radeon/radeon.h > @@ -2259,7 +2259,7 @@ void cik_mm_wdoorbell(struct radeon_device *rdev, u32 offset, u32 v); > WREG32(reg, tmp_); \ > } while (0) > #define WREG32_AND(reg, and) WREG32_P(reg, 0, and) > -#define WREG32_OR(reg, or) WREG32_P(reg, or, ~or) > +#define WREG32_OR(reg, or) WREG32_P(reg, or, ~(or)) > #define WREG32_PLL_P(reg, val, mask) \ > do { \ > uint32_t tmp_ = RREG32_PLL(reg); \ > -- > 1.7.10.4 > > _______________________________________________ > dri-devel mailing list > dri-devel@lists.freedesktop.org > http://lists.freedesktop.org/mailman/listinfo/dri-devel
diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 9fc9e71..289047e 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -2259,7 +2259,7 @@ void cik_mm_wdoorbell(struct radeon_device *rdev, u32 offset, u32 v); WREG32(reg, tmp_); \ } while (0) #define WREG32_AND(reg, and) WREG32_P(reg, 0, and) -#define WREG32_OR(reg, or) WREG32_P(reg, or, ~or) +#define WREG32_OR(reg, or) WREG32_P(reg, or, ~(or)) #define WREG32_PLL_P(reg, val, mask) \ do { \ uint32_t tmp_ = RREG32_PLL(reg); \
This bug (introduced in 3.10) in WREG32_OR made commit d3418eacad403033e95e49dc14afa37c2112c134 "drm/radeon/evergreen: setup HDMI before enabling it" cause a regression. Sometimes audio over HDMI wasn't working, sometimes display was corrupted. This fixes: https://bugzilla.kernel.org/show_bug.cgi?id=60687 https://bugzilla.kernel.org/show_bug.cgi?id=60709 https://bugs.freedesktop.org/show_bug.cgi?id=67767 Signed-off-by: Rafa? Mi?ecki <zajec5@gmail.com> Cc: stable@vger.kernel.org --- drivers/gpu/drm/radeon/radeon.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)