dri-devel April 2010

dri-devel@lists.freedesktop.org

42 participants
138 discussions

[PATCH] drm/radeon/kms: fix legacy LVDS mode computation
by Jerome Glisse 30 Apr '10

30 Apr '10

Compute downscaled mode timing like DDX does on legacy hw. With this patch it's now possible to use non native laptop panel resolution. Tested on M7 (7500) laptop. Cc: <stable(a)kernel.org> Signed-off-by: Jerome Glisse <jglisse(a)redhat.com> --- drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 23 ++++++++++++++++++++++- 1 files changed, 22 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c index 2441cca..0d78f5b 100644 --- a/drivers/gpu/drm/radeon/radeon_legacy_encoders.c +++ b/drivers/gpu/drm/radeon/radeon_legacy_encoders.c @@ -219,6 +219,8 @@ static bool radeon_legacy_mode_fixup(struct drm_encoder *encoder, struct radeon_encoder *radeon_encoder = to_radeon_encoder(encoder); struct drm_device *dev = encoder->dev; struct radeon_device *rdev = dev->dev_private; + unsigned hsync_width, vsync_width; + unsigned hover, vover, hblank, vblank; /* adjust pm to upcoming mode change */ radeon_pm_compute_clocks(rdev); @@ -237,8 +239,27 @@ static bool radeon_legacy_mode_fixup(struct drm_encoder *encoder, adjusted_mode->crtc_hdisplay = mode->hdisplay; adjusted_mode->crtc_vdisplay = mode->vdisplay; adjusted_mode->base.id = mode_id; + hblank = native_mode->htotal - native_mode->hdisplay; + vblank = native_mode->vtotal - native_mode->vdisplay; + hover = native_mode->hsync_start - native_mode->hdisplay; + vover = native_mode->vsync_start - native_mode->vdisplay; + hsync_width = native_mode->hsync_end - native_mode->hsync_start; + vsync_width = native_mode->vsync_end - native_mode->vsync_start; + adjusted_mode->crtc_hsync_start = mode->hdisplay + hover; + adjusted_mode->crtc_hsync_end = adjusted_mode->crtc_hsync_start + hsync_width; + adjusted_mode->crtc_htotal = mode->hdisplay + hblank; + adjusted_mode->crtc_vsync_start = mode->vdisplay + vover; + adjusted_mode->crtc_vsync_end = adjusted_mode->crtc_vsync_start + vsync_width; + adjusted_mode->crtc_vtotal = mode->vdisplay + vblank; + adjusted_mode->crtc_hblank_start = mode->hdisplay; + adjusted_mode->crtc_vblank_start = mode->vdisplay; + adjusted_mode->hsync_start = adjusted_mode->crtc_hsync_start; + adjusted_mode->hsync_end = adjusted_mode->crtc_hsync_end; + adjusted_mode->htotal = adjusted_mode->crtc_htotal; + adjusted_mode->vsync_start = adjusted_mode->crtc_vsync_start; + adjusted_mode->vsync_end = adjusted_mode->crtc_vsync_end; + adjusted_mode->vtotal = adjusted_mode->crtc_vtotal; } - return true; } -- 1.7.0.1

1 0

[Bug 26570] [r6xx DRI] KMS enabled: GLSL white washing corruption (seen in Second Life)
by bugzilla-daemon＠freedesktop.org 30 Apr '10

30 Apr '10

https://bugs.freedesktop.org/show_bug.cgi?id=26570 --- Comment #7 from Shawn Starr <shawn.starr(a)rogers.com> 2010-04-29 20:05:33 PDT --- 2.6.34-rc5 + airlied drm branches, libdrm git master, mesa git master, ati DDX git master -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 0

[Bug 26570] [r6xx DRI] KMS enabled: GLSL white washing corruption (seen in Second Life)
by bugzilla-daemon＠freedesktop.org 30 Apr '10

30 Apr '10

https://bugs.freedesktop.org/show_bug.cgi?id=26570 --- Comment #6 from Shawn Starr <shawn.starr(a)rogers.com> 2010-04-29 20:05:07 PDT --- Still happening, its not compiling the GLSL shader programs. If it is it seems to take a very, very long time. It shows pretty much all white in game. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 0

[PATCH 00/11] various cleanups and dead coode removals in drm core
by Daniel Vetter 29 Apr '10

29 Apr '10

Hi all, [Dave, this is the patch series I've talked about on irc a few days ago.] This patch series kills various things I've stumbled over while reading through the drm core code. It mostly removes unnecessary stuff on the drm core <-> driver interface. Tested on my i845, i945 and agp rv570. All drm drivers compile-tested. Please review and merge what you like for -next. Save patch 9 which depends upon patch 8 (mucks around in the same place), they should be all independent. So you can mix&match what you like. Thanks, Daniel Daniel Vetter (11): drm: don't export drm_sg_alloc drm: kill kernel_context_switch callbacks drm: kill dma_ready callbacks drm: kill procfs callbacks drm: kill drm_map_ofs callbacks drm: kill get_reg_ofs callback drm: kill context_ctor callback drm: don't export drm_get_drawable_info drm: replace drawable ioctl by noops drm: kill dev->timer drm: kill gem_free_object_unlocked driver callback drivers/gpu/drm/Makefile | 2 +- drivers/gpu/drm/drm_context.c | 8 -- drivers/gpu/drm/drm_drawable.c | 198 --------------------------------- drivers/gpu/drm/drm_drv.c | 10 +- drivers/gpu/drm/drm_gem.c | 4 +- drivers/gpu/drm/drm_lock.c | 21 ---- drivers/gpu/drm/drm_proc.c | 13 -- drivers/gpu/drm/drm_scatter.c | 2 - drivers/gpu/drm/drm_stub.c | 4 - drivers/gpu/drm/drm_vm.c | 13 +-- drivers/gpu/drm/i810/i810_drv.c | 2 - drivers/gpu/drm/i830/i830_drv.c | 2 - drivers/gpu/drm/i915/i915_drv.c | 2 - drivers/gpu/drm/mga/mga_drv.c | 2 - drivers/gpu/drm/nouveau/nouveau_drv.c | 2 - drivers/gpu/drm/r128/r128_drv.c | 2 - drivers/gpu/drm/radeon/radeon_drv.c | 4 - drivers/gpu/drm/savage/savage_drv.c | 2 - drivers/gpu/drm/sis/sis_drv.c | 3 - drivers/gpu/drm/tdfx/tdfx_drv.c | 2 - drivers/gpu/drm/via/via_drv.c | 2 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 2 - include/drm/drmP.h | 30 ----- 23 files changed, 7 insertions(+), 325 deletions(-) delete mode 100644 drivers/gpu/drm/drm_drawable.c

4 15

[PATCH] drm/radeon/kms: R3XX-R4XX fix GPU reset code
by Jerome Glisse 29 Apr '10

29 Apr '10

Previous reset code leaded to computer hard lockup (need to unplug the power too reboot the computer) on various configuration. This patch change the reset code to avoid hard lockup. The GPU reset is failing most of the time but at least user can log in remotely or properly shutdown the computer. Two issues were leading to hard lockup : - Writting to the scratch register lead to hard lockup most likely because the write back mecanism is in fuzy state after GPU lockup. - Resetting the GPU memory controller and not reinitializing it after leaded to hard lockup. We did only reinitialize in case of successfull reset thus unsuccessfull reset quickly leaded to hard lockup. Signed-off-by: Jerome Glisse <jglisse(a)redhat.com> --- drivers/gpu/drm/radeon/r300.c | 8 -------- drivers/gpu/drm/radeon/radeon_fence.c | 2 +- 2 files changed, 1 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index bb005bf..5d622cb 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -445,14 +445,6 @@ int r300_asic_reset(struct radeon_device *rdev) mdelay(1); status = RREG32(R_000E40_RBBM_STATUS); dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status); - /* reset MC */ - WREG32(R_0000F0_RBBM_SOFT_RESET, S_0000F0_SOFT_RESET_MC(1)); - RREG32(R_0000F0_RBBM_SOFT_RESET); - mdelay(500); - WREG32(R_0000F0_RBBM_SOFT_RESET, 0); - mdelay(1); - status = RREG32(R_000E40_RBBM_STATUS); - dev_info(rdev->dev, "(%s:%d) RBBM_STATUS=0x%08X\n", __func__, __LINE__, status); /* restore PCI & busmastering */ pci_restore_state(rdev->pdev); r100_enable_bm(rdev); diff --git a/drivers/gpu/drm/radeon/radeon_fence.c b/drivers/gpu/drm/radeon/radeon_fence.c index 1b8b9cc..b1f9a81 100644 --- a/drivers/gpu/drm/radeon/radeon_fence.c +++ b/drivers/gpu/drm/radeon/radeon_fence.c @@ -237,10 +237,10 @@ retry: * as signaled for now */ rdev->gpu_lockup = true; - WREG32(rdev->fence_drv.scratch_reg, fence->seq); r = radeon_gpu_reset(rdev); if (r) return r; + WREG32(rdev->fence_drv.scratch_reg, fence->seq); rdev->gpu_lockup = false; } timeout = RADEON_FENCE_JIFFIES_TIMEOUT; -- 1.7.0.1

2 1

[Bug 27576] NWN text is only partially rendered (KMS only)
by bugzilla-daemon＠freedesktop.org 28 Apr '10

28 Apr '10

https://bugs.freedesktop.org/show_bug.cgi?id=27576 Stephen E. Baker <cycoone(a)hotmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Summary|NWN text is only partially |NWN text is only partially |rendered |rendered (KMS only) --- Comment #2 from Stephen E. Baker <cycoone(a)hotmail.com> 2010-04-28 06:25:59 PDT --- I neglected to note that under UMS (radeon.modeset=0) everything is rendered fine. This is a KMS issue. -- Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are the assignee for the bug.

1 0

Re: [PATCH] drm/radeon/bo: add some fallback placements for VRAM only objects. (v2)
by Michel Dänzer 28 Apr '10

28 Apr '10

On Die, 2010-04-27 at 10:31 +0200, Michel Dänzer wrote: > On Die, 2010-04-27 at 12:34 +1000, Dave Airlie wrote: > > From: Dave Airlie <airlied(a)redhat.com> > > > > On constrained r100 systems compiz would fail to start due to a lack > > of memory, we can just fallback place the objects rather than completely > > failing it works a lot better. > > > > v2: > > fixes issue identified by Michel when pinning could happen in a busy placement domain. > > [...] > > How about something like the below (completely untested) instead? This > should try to respect the userspace request first and only allow falling > back from VRAM to GTT if that failed. (Maybe the new bool parameter > shouldn't be called 'pinned' then but something like > 'allow_vram_fallback' and its sense inverted) The alternative patch below is tested to not regress for me, but of course I'm not affected by the failure to put things in VRAM. Uwe / 'Chicken Shack', does this fix your problem with compiz? This doesn't cover radeon_bo_fault_reserve_notify() because my tree doesn't have the invisible VRAM stuff yet, but it'll be easy to extend this approach to there as well, and it shouldn't affect the immediate problem we're trying to solve. From c3009dd4df63a65fd15a485265fbdabfb1360c97 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <daenzer(a)vmware.com> Date: Wed, 28 Apr 2010 09:24:38 +0200 Subject: [PATCH] drm/radeon/kms: Fall back to GTT if BO creation in / validation to VRAM failed. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Michel Dänzer <daenzer(a)vmware.com> --- drivers/gpu/drm/radeon/radeon_object.c | 31 ++++++++++++++++++++----------- 1 files changed, 20 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/radeon/radeon_object.c b/drivers/gpu/drm/radeon/radeon_object.c index d10f246..1dfb056 100644 --- a/drivers/gpu/drm/radeon/radeon_object.c +++ b/drivers/gpu/drm/radeon/radeon_object.c @@ -109,16 +109,22 @@ int radeon_bo_create(struct radeon_device *rdev, struct drm_gem_object *gobj, bo->surface_reg = -1; INIT_LIST_HEAD(&bo->list); +retry: radeon_ttm_placement_from_domain(bo, domain); /* Kernel allocation are uninterruptible */ r = ttm_bo_init(&rdev->mman.bdev, &bo->tbo, size, type, &bo->placement, 0, 0, !kernel, NULL, size, &radeon_ttm_bo_destroy); if (unlikely(r != 0)) { - if (r != -ERESTARTSYS) + if (r != -ERESTARTSYS) { + if (domain == RADEON_GEM_DOMAIN_VRAM) { + domain |= RADEON_GEM_DOMAIN_GTT; + goto retry; + } dev_err(rdev->dev, "object_init failed for (%lu, 0x%08X)\n", size, domain); + } return r; } *bo_ptr = bo; @@ -313,6 +319,7 @@ int radeon_bo_list_validate(struct list_head *head) { struct radeon_bo_list *lobj; struct radeon_bo *bo; + u32 domain; int r; r = radeon_bo_list_reserve(head); @@ -322,17 +329,19 @@ int radeon_bo_list_validate(struct list_head *head) list_for_each_entry(lobj, head, list) { bo = lobj->bo; if (!bo->pin_count) { - if (lobj->wdomain) { - radeon_ttm_placement_from_domain(bo, - lobj->wdomain); - } else { - radeon_ttm_placement_from_domain(bo, - lobj->rdomain); - } - r = ttm_bo_validate(&bo->tbo, &bo->placement, - true, false); - if (unlikely(r)) + domain = lobj->wdomain ? lobj->wdomain : lobj->rdomain; + +retry: + radeon_ttm_placement_from_domain(bo, domain); + r = ttm_bo_validate(&bo->tbo, &bo->placement, true, false); + if (unlikely(r)) { + if (r != -ERESTARTSYS && + domain == RADEON_GEM_DOMAIN_VRAM) { + domain |= RADEON_GEM_DOMAIN_GTT; + goto retry; + } return r; + } } lobj->gpu_offset = radeon_bo_gpu_offset(bo); lobj->tiling_flags = bo->tiling_flags; -- 1.7.0.5 -- Earthling Michel Dänzer | http://www.vmware.com Libre software enthusiast | Debian, X and DRI developer

1 0

[PATCH 0/13] vmwgfx update
by Thomas Hellstrom 28 Apr '10

28 Apr '10

This patch series basically brings vmwgfx up to date with the standalone repo. Mostly bug-fixes but some new features as well. Most notably the in-kernel time-based throttling support which is advertized by a minor version bump.

2 14

[PATCH] drm/radeon/kms: add accel parameter
by Alex Deucher 28 Apr '10

28 Apr '10

>From 114f3491a411f50a0de1d59475fc267efd5afa6a Mon Sep 17 00:00:00 2001 From: Alex Deucher <alexdeucher(a)gmail.com> Date: Fri, 23 Apr 2010 17:12:46 -0400 Subject: [PATCH] drm/radeon/kms: add accel parameter passing accel=0 will disable acceleration. This is useful for debugging. Signed-off-by: Alex Deucher <alexdeucher(a)gmail.com> --- drivers/gpu/drm/radeon/evergreen.c | 2 +- drivers/gpu/drm/radeon/r100.c | 2 +- drivers/gpu/drm/radeon/r300.c | 2 +- drivers/gpu/drm/radeon/r420.c | 2 +- drivers/gpu/drm/radeon/r520.c | 2 +- drivers/gpu/drm/radeon/r600.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_drv.c | 4 ++++ drivers/gpu/drm/radeon/rs400.c | 2 +- drivers/gpu/drm/radeon/rs600.c | 2 +- drivers/gpu/drm/radeon/rs690.c | 2 +- drivers/gpu/drm/radeon/rv515.c | 2 +- drivers/gpu/drm/radeon/rv770.c | 2 +- 13 files changed, 16 insertions(+), 11 deletions(-) diff --git a/drivers/gpu/drm/radeon/evergreen.c b/drivers/gpu/drm/radeon/evergreen.c index 0137a4c..af19080 100644 --- a/drivers/gpu/drm/radeon/evergreen.c +++ b/drivers/gpu/drm/radeon/evergreen.c @@ -2111,7 +2111,7 @@ int evergreen_init(struct radeon_device *rdev) rdev->accel_working = false; r = evergreen_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { dev_err(rdev->dev, "disabling GPU acceleration\n"); r700_cp_fini(rdev); r600_wb_fini(rdev); diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 6443d9e..0441e80 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -3738,7 +3738,7 @@ int r100_init(struct radeon_device *rdev) r100_set_safe_registers(rdev); rdev->accel_working = true; r = r100_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { /* Somethings want wront with the accel init stop accel */ dev_err(rdev->dev, "Disabling GPU acceleration\n"); r100_cp_fini(rdev); diff --git a/drivers/gpu/drm/radeon/r300.c b/drivers/gpu/drm/radeon/r300.c index 590f6a8..30a9112 100644 --- a/drivers/gpu/drm/radeon/r300.c +++ b/drivers/gpu/drm/radeon/r300.c @@ -1443,7 +1443,7 @@ int r300_init(struct radeon_device *rdev) r300_set_reg_safe(rdev); rdev->accel_working = true; r = r300_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { /* Somethings want wront with the accel init stop accel */ dev_err(rdev->dev, "Disabling GPU acceleration\n"); r100_cp_fini(rdev); diff --git a/drivers/gpu/drm/radeon/r420.c b/drivers/gpu/drm/radeon/r420.c index be092d2..ebb9017 100644 --- a/drivers/gpu/drm/radeon/r420.c +++ b/drivers/gpu/drm/radeon/r420.c @@ -376,7 +376,7 @@ int r420_init(struct radeon_device *rdev) r420_set_reg_safe(rdev); rdev->accel_working = true; r = r420_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { /* Somethings want wront with the accel init stop accel */ dev_err(rdev->dev, "Disabling GPU acceleration\n"); r100_cp_fini(rdev); diff --git a/drivers/gpu/drm/radeon/r520.c b/drivers/gpu/drm/radeon/r520.c index 870111e..38caca5 100644 --- a/drivers/gpu/drm/radeon/r520.c +++ b/drivers/gpu/drm/radeon/r520.c @@ -290,7 +290,7 @@ int r520_init(struct radeon_device *rdev) rv515_set_safe_registers(rdev); rdev->accel_working = true; r = r520_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { /* Somethings want wront with the accel init stop accel */ dev_err(rdev->dev, "Disabling GPU acceleration\n"); r100_cp_fini(rdev); diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index 4a35c54..d11632f 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -2324,7 +2324,7 @@ int r600_init(struct radeon_device *rdev) rdev->accel_working = true; r = r600_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { dev_err(rdev->dev, "disabling GPU acceleration\n"); r600_cp_fini(rdev); r600_wb_fini(rdev); diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index d284270..fc0574c 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -93,6 +93,7 @@ extern int radeon_dynpm; extern int radeon_audio; extern int radeon_disp_priority; extern int radeon_hw_i2c; +extern int radeon_accel; /* * Copy from radeon_drv.h so we don't have to include both and have conflicting diff --git a/drivers/gpu/drm/radeon/radeon_drv.c b/drivers/gpu/drm/radeon/radeon_drv.c index 4b05563..cfe5cd8 100644 --- a/drivers/gpu/drm/radeon/radeon_drv.c +++ b/drivers/gpu/drm/radeon/radeon_drv.c @@ -95,6 +95,7 @@ int radeon_dynpm = -1; int radeon_audio = 1; int radeon_disp_priority = 0; int radeon_hw_i2c = 0; +int radeon_accel = 1; MODULE_PARM_DESC(no_wb, "Disable AGP writeback for scratch registers"); module_param_named(no_wb, radeon_no_wb, int, 0444); @@ -144,6 +145,9 @@ module_param_named(disp_priority, radeon_disp_priority, int, 0444); MODULE_PARM_DESC(hw_i2c, "hw i2c engine enable (0 = disable)"); module_param_named(hw_i2c, radeon_hw_i2c, int, 0444); +MODULE_PARM_DESC(accel, "acceleration (0 = disable)"); +module_param_named(accel, radeon_accel, int, 0444); + static int radeon_suspend(struct drm_device *dev, pm_message_t state) { drm_radeon_private_t *dev_priv = dev->dev_private; diff --git a/drivers/gpu/drm/radeon/rs400.c b/drivers/gpu/drm/radeon/rs400.c index dc76fe7..e36f193 100644 --- a/drivers/gpu/drm/radeon/rs400.c +++ b/drivers/gpu/drm/radeon/rs400.c @@ -528,7 +528,7 @@ int rs400_init(struct radeon_device *rdev) r300_set_reg_safe(rdev); rdev->accel_working = true; r = rs400_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { /* Somethings want wront with the accel init stop accel */ dev_err(rdev->dev, "Disabling GPU acceleration\n"); r100_cp_fini(rdev); diff --git a/drivers/gpu/drm/radeon/rs600.c b/drivers/gpu/drm/radeon/rs600.c index b312b72..fbdc6be 100644 --- a/drivers/gpu/drm/radeon/rs600.c +++ b/drivers/gpu/drm/radeon/rs600.c @@ -789,7 +789,7 @@ int rs600_init(struct radeon_device *rdev) rs600_set_safe_registers(rdev); rdev->accel_working = true; r = rs600_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { /* Somethings want wront with the accel init stop accel */ dev_err(rdev->dev, "Disabling GPU acceleration\n"); r100_cp_fini(rdev); diff --git a/drivers/gpu/drm/radeon/rs690.c b/drivers/gpu/drm/radeon/rs690.c index 56a0aec..1a38699 100644 --- a/drivers/gpu/drm/radeon/rs690.c +++ b/drivers/gpu/drm/radeon/rs690.c @@ -749,7 +749,7 @@ int rs690_init(struct radeon_device *rdev) rs600_set_safe_registers(rdev); rdev->accel_working = true; r = rs690_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { /* Somethings want wront with the accel init stop accel */ dev_err(rdev->dev, "Disabling GPU acceleration\n"); r100_cp_fini(rdev); diff --git a/drivers/gpu/drm/radeon/rv515.c b/drivers/gpu/drm/radeon/rv515.c index c513473..104e285 100644 --- a/drivers/gpu/drm/radeon/rv515.c +++ b/drivers/gpu/drm/radeon/rv515.c @@ -523,7 +523,7 @@ int rv515_init(struct radeon_device *rdev) rv515_set_safe_registers(rdev); rdev->accel_working = true; r = rv515_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { /* Somethings want wront with the accel init stop accel */ dev_err(rdev->dev, "Disabling GPU acceleration\n"); r100_cp_fini(rdev); diff --git a/drivers/gpu/drm/radeon/rv770.c b/drivers/gpu/drm/radeon/rv770.c index a74683e..779a89e 100644 --- a/drivers/gpu/drm/radeon/rv770.c +++ b/drivers/gpu/drm/radeon/rv770.c @@ -1123,7 +1123,7 @@ int rv770_init(struct radeon_device *rdev) rdev->accel_working = true; r = rv770_startup(rdev); - if (r) { + if (r || (radeon_accel == 0)) { dev_err(rdev->dev, "disabling GPU acceleration\n"); r700_cp_fini(rdev); r600_wb_fini(rdev); -- 1.5.6.3

1 1

[PATCH 1/2] drm/edid: Make EDID header fixup threshold configurable
by Adam Jackson 27 Apr '10

27 Apr '10

Signed-off-by: Adam Jackson <ajax(a)redhat.com> --- Documentation/kernel-parameters.txt | 4 ++++ drivers/gpu/drm/drm_edid.c | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index e2202e9..17d50d2 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -713,6 +713,10 @@ and is between 256 and 4096 characters. It is defined in the file edd= [EDD] Format: {"off" | "on" | "skip[mbr]"} + edid_threshold=<int> [DRM] + Set the minimum number of bytes of an EDID header + that must be valid, out of 8. The default is 6. + eisa_irq_edge= [PARISC,HW] See header of drivers/parisc/eisa.c. diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c index 7188674..6a1b5a3 100644 --- a/drivers/gpu/drm/drm_edid.c +++ b/drivers/gpu/drm/drm_edid.c @@ -62,6 +62,9 @@ /* use +hsync +vsync for detailed mode */ #define EDID_QUIRK_DETAILED_SYNC_PP (1 << 6) +static unsigned int edid_threshold = 6; +MODULE_PARM_DESC(edid_threshold, "EDID header fixup threshold (default: 6)"); +module_param_named(edid_threshold, edid_threshold, int, 0600); #define LEVEL_DMT 0 #define LEVEL_GTF 1 @@ -135,7 +138,7 @@ drm_edid_block_valid(u8 *raw_edid) score++; if (score == 8) ; - else if (score >= 6) { + else if (score >= edid_threshold) { DRM_DEBUG("Fixing EDID header, your hardware may be failing\n"); memcpy(raw_edid, edid_header, sizeof(edid_header)); } else { -- 1.7.0.1

3 5

← Newer
1
2
3
4
5
6
7
...
14
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel April 2010