Piteball/android_kernel_google_msm
1
0
Fork 0
mirror of https://github.com/followmsi/android_kernel_google_msm.git synced 2024-11-06 23:17:41 +00:00
Code Issues Projects Releases Wiki Activity

drm/radeon: update line buffer allocation for dce6

Browse source 
commit 290d24576c upstream.

We need to allocate line buffer to each display when
setting up the watermarks.  Failure to do so can lead
to a blank screen.  This fixes blank screen problems
on dce6 asics.

Fixes:
https://bugs.freedesktop.org/show_bug.cgi?id=64850

Based on an initial fix from:
Jay Cornwall <jay.cornwall@amd.com>

Signed-off-by: Alex Deucher <alexander.deucher@amd.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alex Deucher 2013-08-19 11:15:43 -04:00 committed by Greg Kroah-Hartman
parent be70f1f28e
commit da2f15e84f
2 changed files with 23 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/gpu/drm/radeon/si.c
View file

@ -411,7 +411,8 @@ static u32 dce6_line_buffer_adjust(struct radeon_device *rdev,
struct drm_display_mode *mode, struct drm_display_mode *mode,
struct drm_display_mode *other_mode) struct drm_display_mode *other_mode)
{ {
u32 tmp; u32 tmp, buffer_alloc, i;
u32 pipe_offset = radeon_crtc->crtc_id * 0x20;
/* /*
* Line Buffer Setup * Line Buffer Setup
* There are 3 line buffers, each one shared by 2 display controllers. * There are 3 line buffers, each one shared by 2 display controllers.
@ -426,16 +427,30 @@ static u32 dce6_line_buffer_adjust(struct radeon_device *rdev,
* non-linked crtcs for maximum line buffer allocation. * non-linked crtcs for maximum line buffer allocation.
*/ */
if (radeon_crtc->base.enabled && mode) { if (radeon_crtc->base.enabled && mode) {
if (other_mode) if (other_mode) {
tmp = 0; /* 1/2 */ tmp = 0; /* 1/2 */
else buffer_alloc = 1;
} else {
tmp = 2; /* whole */ tmp = 2; /* whole */
} else buffer_alloc = 2;
}
} else {
tmp = 0; tmp = 0;
buffer_alloc = 0;
}
WREG32(DC_LB_MEMORY_SPLIT + radeon_crtc->crtc_offset, WREG32(DC_LB_MEMORY_SPLIT + radeon_crtc->crtc_offset,
DC_LB_MEMORY_CONFIG(tmp)); DC_LB_MEMORY_CONFIG(tmp));
WREG32(PIPE0_DMIF_BUFFER_CONTROL + pipe_offset,
DMIF_BUFFERS_ALLOCATED(buffer_alloc));
for (i = 0; i < rdev->usec_timeout; i++) {
if (RREG32(PIPE0_DMIF_BUFFER_CONTROL + pipe_offset) &
DMIF_BUFFERS_ALLOCATED_COMPLETED)
break;
udelay(1);
}
if (radeon_crtc->base.enabled && mode) { if (radeon_crtc->base.enabled && mode) {
switch (tmp) { switch (tmp) {
case 0: case 0:

4
drivers/gpu/drm/radeon/sid.h
View file

@ -57,6 +57,10 @@
#define DMIF_ADDR_CALC 0xC00 #define DMIF_ADDR_CALC 0xC00
#define PIPE0_DMIF_BUFFER_CONTROL 0x0ca0
# define DMIF_BUFFERS_ALLOCATED(x) ((x) << 0)
# define DMIF_BUFFERS_ALLOCATED_COMPLETED (1 << 4)
#define SRBM_STATUS 0xE50 #define SRBM_STATUS 0xE50
#define CC_SYS_RB_BACKEND_DISABLE 0xe80 #define CC_SYS_RB_BACKEND_DISABLE 0xe80