dri-devel June 2011

dri-devel@lists.freedesktop.org

101 participants
499 discussions

[PATCH] bugfix and cleanup patches in the TTM code for 3.1.
by Konrad Rzeszutek Wilk 08 Jun '11

08 Jun '11

The bug-fix "ttm: Do not increment the amount of pages in a pool by the current amount" I never observed, but found while looking at the code. The cleanup patch: "ttm: Fix spelling mistakes and remove unused #ifdef", I had posted earlier and Randy Dunlap graciously added some extra cleanups - which I have rolled in.

3 5

[PATCH] drm/radeon/kms: check modes against max pixel clock
by Alex Deucher 08 Jun '11

08 Jun '11

Filter out modes that are higher than the max pixel clock. Signed-off-by: Alex Deucher <alexdeucher(a)gmail.com> --- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_atombios.c | 4 ++++ drivers/gpu/drm/radeon/radeon_clocks.c | 8 +++++--- drivers/gpu/drm/radeon/radeon_combios.c | 5 +++++ drivers/gpu/drm/radeon/radeon_connectors.c | 13 ++++++++++++- 5 files changed, 27 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/… [View More]radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 625f1af..bbcb00a 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -165,6 +165,7 @@ struct radeon_clock { uint32_t default_sclk; uint32_t default_dispclk; uint32_t dp_extclk; + uint32_t max_pixel_clock; }; /* diff --git a/drivers/gpu/drm/radeon/radeon_atombios.c b/drivers/gpu/drm/radeon/radeon_atombios.c index 90dfb2b..fa62a50 100644 --- a/drivers/gpu/drm/radeon/radeon_atombios.c +++ b/drivers/gpu/drm/radeon/radeon_atombios.c @@ -1246,6 +1246,10 @@ bool radeon_atom_get_clock_info(struct drm_device *dev) } *dcpll = *p1pll; + rdev->clock.max_pixel_clock = le16_to_cpu(firmware_info->info.usMaxPixelClock); + if (rdev->clock.max_pixel_clock == 0) + rdev->clock.max_pixel_clock = 40000; + return true; } diff --git a/drivers/gpu/drm/radeon/radeon_clocks.c b/drivers/gpu/drm/radeon/radeon_clocks.c index 5249af8..2d48e7a 100644 --- a/drivers/gpu/drm/radeon/radeon_clocks.c +++ b/drivers/gpu/drm/radeon/radeon_clocks.c @@ -117,7 +117,7 @@ static bool __devinit radeon_read_clocks_OF(struct drm_device *dev) p1pll->reference_div = RREG32_PLL(RADEON_PPLL_REF_DIV) & 0x3ff; if (p1pll->reference_div < 2) p1pll->reference_div = 12; - p2pll->reference_div = p1pll->reference_div; + p2pll->reference_div = p1pll->reference_div; /* These aren't in the device-tree */ if (rdev->family >= CHIP_R420) { @@ -139,6 +139,8 @@ static bool __devinit radeon_read_clocks_OF(struct drm_device *dev) p2pll->pll_out_min = 12500; p2pll->pll_out_max = 35000; } + /* not sure what the max should be in all cases */ + rdev->clock.max_pixel_clock = 35000; spll->reference_freq = mpll->reference_freq = p1pll->reference_freq; spll->reference_div = mpll->reference_div = @@ -151,7 +153,7 @@ static bool __devinit radeon_read_clocks_OF(struct drm_device *dev) else rdev->clock.default_sclk = radeon_legacy_get_engine_clock(rdev); - + val = of_get_property(dp, "ATY,MCLK", NULL); if (val && *val) rdev->clock.default_mclk = (*val) / 10; @@ -160,7 +162,7 @@ static bool __devinit radeon_read_clocks_OF(struct drm_device *dev) radeon_legacy_get_memory_clock(rdev); DRM_INFO("Using device-tree clock info\n"); - + return true; } #else diff --git a/drivers/gpu/drm/radeon/radeon_combios.c b/drivers/gpu/drm/radeon/radeon_combios.c index 19b10cf..797c8bc 100644 --- a/drivers/gpu/drm/radeon/radeon_combios.c +++ b/drivers/gpu/drm/radeon/radeon_combios.c @@ -866,6 +866,11 @@ bool radeon_combios_get_clock_info(struct drm_device *dev) rdev->clock.default_sclk = sclk; rdev->clock.default_mclk = mclk; + if (RBIOS32(pll_info + 0x16)) + rdev->clock.max_pixel_clock = RBIOS32(pll_info + 0x16); + else + rdev->clock.max_pixel_clock = 35000; /* might need something asic specific */ + return true; } return false; diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c index 9dc8684..1d1504b 100644 --- a/drivers/gpu/drm/radeon/radeon_connectors.c +++ b/drivers/gpu/drm/radeon/radeon_connectors.c @@ -628,8 +628,14 @@ static int radeon_vga_get_modes(struct drm_connector *connector) static int radeon_vga_mode_valid(struct drm_connector *connector, struct drm_display_mode *mode) { + struct drm_device *dev = connector->dev; + struct radeon_device *rdev = dev->dev_private; + /* XXX check mode bandwidth */ - /* XXX verify against max DAC output frequency */ + + if ((mode->clock / 10) > rdev->clock.max_pixel_clock) + return MODE_CLOCK_HIGH; + return MODE_OK; } @@ -1017,6 +1023,11 @@ static int radeon_dvi_mode_valid(struct drm_connector *connector, } else return MODE_CLOCK_HIGH; } + + /* check against the max pixel clock */ + if ((mode->clock / 10) > rdev->clock.max_pixel_clock) + return MODE_CLOCK_HIGH; + return MODE_OK; } -- 1.7.1.1 [View Less]

1 0

[Bug 36609] 45920d2ecb38b14fdda5253fecce996570c22863 breaks sauerbraten on r300g
by bugzilla-daemon＠freedesktop.org 08 Jun '11

08 Jun '11

https://bugs.freedesktop.org/show_bug.cgi?id=36609 --- Comment #4 from Fabio Pedretti <fabio.ped(a)libero.it> 2011-06-08 08:41:15 PDT --- (In reply to comment #3) > Unfortunately, commit 51095f74cf92d3cada7366ce898ade7693570b48 doesn't fix the > missing triangles in ut2004. Is this still an issue? If yes is 45920d2ecb38b14fdda5253fecce996570c22863 the first bad commit? Maybe this should be moved to a new bug since my original problem is fixed. -- Configure bugmail: https://bugs.… [View More]

1 0

[git pull] drm radeon urgent fixes
by Dave Airlie 08 Jun '11

08 Jun '11

Hi Linus, I'm blaming 3.0 for me not seeing this breakage, I'm having trouble persuading my USB disk to boot 3.0, on an F15 userspace looks like LVM or something systemd related. 1 is really urgent but the other two fixes some machines + blank screens. Dave. The following changes since commit cb0a02ecf95e5f47d92e7d4c513cc1f7aeb40cda: Merge branch 'irq-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip (2011-06-07 19:21:11 -0700) are available in the … [View More]

1 1

[Bug 37470] New: OpenGL ES2 test, black screen and test crashes
by bugzilla-daemon＠freedesktop.org 07 Jun '11

07 Jun '11

https://bugs.freedesktop.org/show_bug.cgi?id=37470 Summary: OpenGL ES2 test, black screen and test crashes Product: Mesa Version: unspecified Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/r300 AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: apfelmausmail(a)googlemail.com Today i want to try out a OGL … [View More]ES2 test to see whats possible later with the new kwin backend in 4.7. after a little session in the packagemanager i find "glmark2-es2" after the start, the window is all black and the terminal output is: $ glmark2-es2 Unable to find target for this triple (no targets are registered) ======================================================= glmark2 11.01 ======================================================= OpenGL Information GL_VENDOR: X.Org R300 Project GL_RENDERER: Gallium 0.4 on ATI RV515 GL_VERSION: OpenGL ES 2.0 Mesa 7.11-devel ======================================================= [Suite] Precompilation [Benchmark] Vertex array FPS: 354 [Benchmark] Vertex buffer object FPS: 357 [Suite] Texture filtering [Benchmark] Nearest FPS: 359 [Benchmark] Linear FPS: 353 [Benchmark] Mipmapped FPS: 349 [Suite] Shading [Benchmark] GLSL per vertex lighting FPS: 362 [Benchmark] GLSL per pixel lighting FPS: 352 ======================================================= glmark2 Score: 1064 ======================================================= *** glibc detected *** glmark2-es2: double free or corruption (!prev): 0x00000000027a8c10 *** ======= Backtrace: ========= /lib/x86_64-linux-gnu/libc.so.6[0x3c1c078a8f] /lib/x86_64-linux-gnu/libc.so.6(cfree+0x73)[0x3c1c07c8e3] /lib/x86_64-linux-gnu/libc.so.6(__cxa_finalize+0x9d)[0x3c1c039d3d] /usr/lib/egl/pipe_r300.so(+0x157a06)[0x7f952cedca06] ======= Memory map: ======== 00400000-0040a000 r-xp 00000000 08:03 918600 /usr/bin/glmark2-es2 00609000-0060a000 r--p 00009000 08:03 918600 /usr/bin/glmark2-es2 0060a000-0060d000 rw-p 0000a000 08:03 918600 /usr/bin/glmark2-es2 025ae000-02a5d000 rw-p 00000000 00:00 0 [heap] 3247800000-3247802000 r-xp 00000000 08:03 916567 /usr/lib/x86_64-linux-gnu/libxcb-dri2.so.0.0.0 3247802000-3247a02000 ---p 00002000 08:03 916567 /usr/lib/x86_64-linux-gnu/libxcb-dri2.so.0.0.0 3247a02000-3247a03000 r--p 00002000 08:03 916567 /usr/lib/x86_64-linux-gnu/libxcb-dri2.so.0.0.0 3247a03000-3247a04000 rw-p 00003000 08:03 916567 /usr/lib/x86_64-linux-gnu/libxcb-dri2.so.0.0.0 3248400000-3248405000 r-xp 00000000 08:03 916717 /usr/lib/x86_64-linux-gnu/libxcb-xfixes.so.0.0.0 3248405000-3248604000 ---p 00005000 08:03 916717 /usr/lib/x86_64-linux-gnu/libxcb-xfixes.so.0.0.0 3248604000-3248605000 r--p 00004000 08:03 916717 /usr/lib/x86_64-linux-gnu/libxcb-xfixes.so.0.0.0 3248605000-3248606000 rw-p 00005000 08:03 916717 /usr/lib/x86_64-linux-gnu/libxcb-xfixes.so.0.0.0 34c9400000-34c940a000 r-xp 00000000 08:03 654165 /lib/x86_64-linux-gnu/libdrm.so.2.4.0 34c940a000-34c9609000 ---p 0000a000 08:03 654165 /lib/x86_64-linux-gnu/libdrm.so.2.4.0 34c9609000-34c960a000 r--p 00009000 08:03 654165 /lib/x86_64-linux-gnu/libdrm.so.2.4.0 34c960a000-34c960b000 rw-p 0000a000 08:03 654165 /lib/x86_64-linux-gnu/libdrm.so.2.4.0 3c1aa00000-3c1aa21000 r-xp 00000000 08:03 655661 /lib/x86_64-linux-gnu/ld-2.13.so 3c1ac20000-3c1ac21000 r--p 00020000 08:03 655661 /lib/x86_64-linux-gnu/ld-2.13.so 3c1ac21000-3c1ac23000 rw-p 00021000 08:03 655661 /lib/x86_64-linux-gnu/ld-2.13.so 3c1ae00000-3c1ae02000 r-xp 00000000 08:03 928233 /usr/lib/x86_64-linux-gnu/libxcb-shape.so.0.0.0 3c1ae02000-3c1b001000 ---p 00002000 08:03 928233 /usr/lib/x86_64-linux-gnu/libxcb-shape.so.0.0.0 3c1b001000-3c1b002000 r--p 00001000 08:03 928233 /usr/lib/x86_64-linux-gnu/libxcb-shape.so.0.0.0 3c1b002000-3c1b003000 rw-p 00002000 08:03 928233 /usr/lib/x86_64-linux-gnu/libxcb-shape.so.0.0.0 3c1b800000-3c1b866000 r-xp 00000000 08:03 916113 /usr/lib/libSDL-1.2.so.0.11.3 3c1b866000-3c1ba66000 ---p 00066000 08:03 916113 /usr/lib/libSDL-1.2.so.0.11.3 3c1ba66000-3c1ba67000 r--p 00066000 08:03 916113 /usr/lib/libSDL-1.2.so.0.11.3 3c1ba67000-3c1ba68000 rw-p 00067000 08:03 916113 /usr/lib/libSDL-1.2.so.0.11.3 3c1ba68000-3c1ba94000 rw-p 00000000 00:00 0 3c1c000000-3c1c18a000 r-xp 00000000 08:03 655670 /lib/x86_64-linux-gnu/libc-2.13.so 3c1c18a000-3c1c389000 ---p 0018a000 08:03 655670 /lib/x86_64-linux-gnu/libc-2.13.so 3c1c389000-3c1c38d000 r--p 00189000 08:03 655670 /lib/x86_64-linux-gnu/libc-2.13.so 3c1c38d000-3c1c38e000 rw-p 0018d000 08:03 655670 /lib/x86_64-linux-gnu/libc-2.13.so 3c1c38e000-3c1c394000 rw-p 00000000 00:00 0 3c1c400000-3c1c402000 r-xp 00000000 08:03 655672 /lib/x86_64-linux-gnu/libdl-2.13.so 3c1c402000-3c1c602000 ---p 00002000 08:03 655672 /lib/x86_64-linux-gnu/libdl-2.13.so 3c1c602000-3c1c603000 r--p 00002000 08:03 655672 /lib/x86_64-linux-gnu/libdl-2.13.so 3c1c603000-3c1c604000 rw-p 00003000 08:03 655672 /lib/x86_64-linux-gnu/libdl-2.13.so 3c1c800000-3c1c818000 r-xp 00000000 08:03 655674 /lib/x86_64-linux-gnu/libpthread-2.13.so 3c1c818000-3c1ca18000 ---p 00018000 08:03 655674 /lib/x86_64-linux-gnu/libpthread-2.13.so 3c1ca18000-3c1ca19000 r--p 00018000 08:03 655674 /lib/x86_64-linux-gnu/libpthread-2.13.so 3c1ca19000-3c1ca1a000 rw-p 00019000 08:03 655674 /lib/x86_64-linux-gnu/libpthread-2.13.so 3c1ca1a000-3c1ca1e000 rw-p 00000000 00:00 0 3c1cc00000-3c1cc84000 r-xp 00000000 08:03 655683 /lib/x86_64-linux-gnu/libm-2.13.so 3c1cc84000-3c1ce83000 ---p 00084000 08:03 655683 /lib/x86_64-linux-gnu/libm-2.13.so 3c1ce83000-3c1ce84000 r--p 00083000 08:03 655683 /lib/x86_64-linux-gnu/libm-2.13.so 3c1ce84000-3c1ce85000 rw-p 00084000 08:03 655683 /lib/x86_64-linux-gnu/libm-2.13.so 3c1d000000-3c1d007000 r-xp 00000000 08:03 655676 /lib/x86_64-linux-gnu/librt-2.13.so 3c1d007000-3c1d206000 ---p 00007000 08:03 655676 /lib/x86_64-linux-gnu/librt-2.13.so 3c1d206000-3c1d207000 r--p 00006000 08:03 655676 /lib/x86_64-linux-gnu/librt-2.13.so 3c1d207000-3c1d208000 rw-p 00007000 08:03 655676 /lib/x86_64-linux-gnu/librt-2.13.so 3c1e000000-3c1e015000 r-xp 00000000 08:03 655693 /lib/x86_64-linux-gnu/libgcc_s.so.1 3c1e015000-3c1e214000 ---p 00015000 08:03 655693 /lib/x86_64-linux-gnu/libgcc_s.so.1 3c1e214000-3c1e215000 r--p 00014000 08:03 655693 /lib/x86_64-linux-gnu/libgcc_s.so.1 3c1e215000-3c1e216000 rw-p 00015000 08:03 655693 /lib/x86_64-linux-gnu/libgcc_s.so.1 3c1e400000-3c1e4e8000 r-xp 00000000 08:03 928167 /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.14 3c1e4e8000-3c1e6e7000 ---p 000e8000 08:03 928167 /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.14 3c1e6e7000-3c1e6ef000 r--p 000e7000 08:03 928167 /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.14 3c1e6ef000-3c1e6f1000 rw-p 000ef000 08:03 928167 /usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.14 3c1e6f1000-3c1e706000 rw-p 00000000 00:00 0 after that i tried out a dev-version of kwin in 4.7 with opengl es2 backend and.. the screen is black too. now my question: is my graphicscard (radeon X1400 mobile) not ready for ES2? is it a bug? or something else? -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug. [View Less]

1 1

[Bug 37911] New: supertuxkart crashes with r300g
by bugzilla-daemon＠freedesktop.org 07 Jun '11

07 Jun '11

https://bugs.freedesktop.org/show_bug.cgi?id=37911 Summary: supertuxkart crashes with r300g Product: Mesa Version: git Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/r300 AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: pawlerson(a)gmail.com When I want to start a race in Supertuxkart it crashes: … [View More]

1 1

[Bug 37028] New: Amnesia/HPL2 Demo: Strange graphical bugs on r600g
by bugzilla-daemon＠freedesktop.org 07 Jun '11

07 Jun '11

https://bugs.freedesktop.org/show_bug.cgi?id=37028 Summary: Amnesia/HPL2 Demo: Strange graphical bugs on r600g Product: Mesa Version: git Platform: x86-64 (AMD64) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: Drivers/Gallium/r600 AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: hayarms(a)gmail.com Created an attachment (id=46492) --> (… [View More]

1 25

[PATCH] fix spelling mistakes and clear up some wording.
by Konrad Rzeszutek Wilk 07 Jun '11

07 Jun '11

While working on the DMA pool concept in the TTM code I re-read everything once more to make sure I was not missing anything. Whilst doing that I found some spelling mistakes and some wording that could be improved a bit. So fixed it up and please consider this patch for 3.1.

2 2

[PATCH] drm/radeon: fix GUI idle IH debug statements
by Ilija Hadzic 07 Jun '11

07 Jun '11

debug statement for GUI idle interrupt is wrong and incorrectly reports CP EOP interrupt; trivial issue, but confusing for someone trying to distinguish interrupt sources while debugging ... fixed Signed-off-by: Ilija Hadzic <ihadzic(a)research.bell-labs.com> --- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c … [View More]

2 1

[PATCH] drm/radeon/kms: correctness fixes for evergreen/cayman tiling
by Alex Deucher 07 Jun '11

07 Jun '11

We don't actually use the tiling setup in the CS checker for evergreen/cayman yet, but we might as well set it up properly in case we ever enable it. Signed-off-by: Alex Deucher <alexdeucher(a)gmail.com> --- drivers/gpu/drm/radeon/evergreen.c | 15 ++++++++++++--- drivers/gpu/drm/radeon/evergreen_cs.c | 12 +++++++++--- drivers/gpu/drm/radeon/ni.c | 12 +++++++++++- drivers/gpu/drm/radeon/radeon.h | 3 +++ 4 files changed, 35 insertions(+), 7 deletions(-) … [View More]diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 9c81b25..76d507c 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2006,14 +2006,23 @@ static void evergreen_gpu_init(struct radeon_device *rdev) rdev->config.evergreen.tile_config |= (3 << 0); break; } + rdev->config.evergreen.tiling_npipes = rdev->config.evergreen.max_tile_pipes; /* num banks is 8 on all fusion asics */ if (rdev->flags & RADEON_IS_IGP) - rdev->config.evergreen.tile_config |= 8 << 4; + rdev->config.evergreen.tiling_nbanks = 8; else - rdev->config.evergreen.tile_config |= - ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4; + rdev->config.evergreen.tiling_nbanks = + ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT); + rdev->config.evergreen.tile_config |= + rdev->config.evergreen.tiling_nbanks << 4; + /* group size */ rdev->config.evergreen.tile_config |= ((mc_arb_ramcfg & BURSTLENGTH_MASK) >> BURSTLENGTH_SHIFT) << 8; + if (mc_arb_ramcfg & BURSTLENGTH_MASK) + rdev->config.evergreen.tiling_group_size = 512; + else + rdev->config.evergreen.tiling_group_size = 256; + /* row size */ rdev->config.evergreen.tile_config |= ((gb_addr_config & 0x30000000) >> 28) << 12; diff --git a/drivers/gpu/drm/radeon/evergreen_cs.c b/drivers/gpu/drm/radeon/evergreen_cs.c index 7a833dc..7bdaf41 100644 --- a/drivers/gpu/drm/radeon/evergreen_cs.c +++ b/drivers/gpu/drm/radeon/evergreen_cs.c @@ -1410,9 +1410,15 @@ int evergreen_cs_parse(struct radeon_cs_parser *p) if (track == NULL) return -ENOMEM; evergreen_cs_track_init(track); - track->npipes = p->rdev->config.evergreen.tiling_npipes; - track->nbanks = p->rdev->config.evergreen.tiling_nbanks; - track->group_size = p->rdev->config.evergreen.tiling_group_size; + if (p->rdev->family >= CHIP_CAYMAN) { + track->npipes = p->rdev->config.cayman.tiling_npipes; + track->nbanks = p->rdev->config.cayman.tiling_nbanks; + track->group_size = p->rdev->config.cayman.tiling_group_size; + } else { + track->npipes = p->rdev->config.evergreen.tiling_npipes; + track->nbanks = p->rdev->config.evergreen.tiling_nbanks; + track->group_size = p->rdev->config.evergreen.tiling_group_size; + } p->track = track; } do { diff --git a/drivers/gpu/drm/radeon/ni.c b/drivers/gpu/drm/radeon/ni.c index 16caafe..05ab6f9 100644 --- a/drivers/gpu/drm/radeon/ni.c +++ b/drivers/gpu/drm/radeon/ni.c @@ -826,10 +826,20 @@ static void cayman_gpu_init(struct radeon_device *rdev) rdev->config.cayman.tile_config |= (3 << 0); break; } + rdev->config.cayman.tiling_npipes = rdev->config.cayman.max_tile_pipes; + /* num banks */ + rdev->config.cayman.tiling_nbanks = + ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT); rdev->config.cayman.tile_config |= - ((mc_arb_ramcfg & NOOFBANK_MASK) >> NOOFBANK_SHIFT) << 4; + rdev->config.cayman.tiling_nbanks << 4; + /* group size */ rdev->config.cayman.tile_config |= ((gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) >> PIPE_INTERLEAVE_SIZE_SHIFT) << 8; + if (gb_addr_config & PIPE_INTERLEAVE_SIZE_MASK) + rdev->config.cayman.tiling_group_size = 512; + else + rdev->config.cayman.tiling_group_size = 256; + /* row size */ rdev->config.cayman.tile_config |= ((gb_addr_config & ROW_SIZE_MASK) >> ROW_SIZE_SHIFT) << 12; diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 90dc53b..625f1af 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -1141,6 +1141,9 @@ struct cayman_asic { unsigned num_gpus; unsigned multi_gpu_tile_size; + unsigned tiling_nbanks; + unsigned tiling_npipes; + unsigned tiling_group_size; unsigned tile_config; struct r100_gpu_lockup lockup; }; -- 1.7.1.1 [View Less]

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel June 2011