dri-devel July 2012

dri-devel@lists.freedesktop.org

115 participants
688 discussions

[PATCH 2/2] drm/radeon: Make sure the correct TA bit is used for R700
by Lauri Kasanen 07 Jul '12

07 Jul '12

The declarations were moved around because of a GCC warning, "ISO C90 forbids mixed declarations and code". (why so strict?) Signed-off-by: Lauri Kasanen <cand(a)gmx.com> --- drivers/gpu/drm/radeon/r600.c | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600.c b/drivers/gpu/drm/radeon/r600.c index bff6272..c77cdba 100644 --- a/drivers/gpu/drm/radeon/r600.c +++ b/drivers/gpu/drm/radeon/r600.c @@ -1278,15 +1278,24 @@ void r600_vram_scratch_fini(struct radeon_device *rdev) int r600_gpu_soft_reset(struct radeon_device *rdev) { struct rv515_mc_save save; - u32 grbm_busy_mask = S_008010_VC_BUSY(1) | S_008010_VGT_BUSY_NO_DMA(1) | - S_008010_VGT_BUSY(1) | S_008010_TA03_BUSY(1) | + u32 grbm_busy_mask; + u32 grbm2_busy_mask; + u32 tmp; + + u32 ta_busy = S_008010_TA03_BUSY(1); + + if (rdev->family >= CHIP_RV770) + ta_busy = S_008010_R700_TA03_BUSY(1); + + grbm_busy_mask = S_008010_VC_BUSY(1) | S_008010_VGT_BUSY_NO_DMA(1) | + S_008010_VGT_BUSY(1) | ta_busy | S_008010_TC_BUSY(1) | S_008010_SX_BUSY(1) | S_008010_SH_BUSY(1) | S_008010_SPI03_BUSY(1) | S_008010_SMX_BUSY(1) | S_008010_SC_BUSY(1) | S_008010_PA_BUSY(1) | S_008010_DB03_BUSY(1) | S_008010_CR_BUSY(1) | S_008010_CB03_BUSY(1) | S_008010_GUI_ACTIVE(1); - u32 grbm2_busy_mask = S_008014_SPI0_BUSY(1) | S_008014_SPI1_BUSY(1) | + grbm2_busy_mask = S_008014_SPI0_BUSY(1) | S_008014_SPI1_BUSY(1) | S_008014_SPI2_BUSY(1) | S_008014_SPI3_BUSY(1) | S_008014_TA0_BUSY(1) | S_008014_TA1_BUSY(1) | S_008014_TA2_BUSY(1) | S_008014_TA3_BUSY(1) | @@ -1294,7 +1303,6 @@ int r600_gpu_soft_reset(struct radeon_device *rdev) S_008014_DB2_BUSY(1) | S_008014_DB3_BUSY(1) | S_008014_CB0_BUSY(1) | S_008014_CB1_BUSY(1) | S_008014_CB2_BUSY(1) | S_008014_CB3_BUSY(1); - u32 tmp; if (!(RREG32(GRBM_STATUS) & GUI_ACTIVE)) return 0; -- 1.7.2.1

1 0

[PATCH 1/2] drm/radeon: Document that R700 has a different TA status bit than R600
by Lauri Kasanen 07 Jul '12

07 Jul '12

Hi This info comes from r600_demo, and was confirmed correct on a RV710. Signed-off-by: Lauri Kasanen <cand(a)gmx.com> --- drivers/gpu/drm/radeon/r600d.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/radeon/r600d.h b/drivers/gpu/drm/radeon/r600d.h index 025fd5b..b818a5c 100644 --- a/drivers/gpu/drm/radeon/r600d.h +++ b/drivers/gpu/drm/radeon/r600d.h @@ -1192,6 +1192,7 @@ #define S_008010_VC_BUSY(x) (((x) & 1) << 11) #define S_008010_DB03_CLEAN(x) (((x) & 1) << 12) #define S_008010_CB03_CLEAN(x) (((x) & 1) << 13) +#define S_008010_R700_TA03_BUSY(x) (((x) & 1) << 14) #define S_008010_VGT_BUSY_NO_DMA(x) (((x) & 1) << 16) #define S_008010_VGT_BUSY(x) (((x) & 1) << 17) #define S_008010_TA03_BUSY(x) (((x) & 1) << 18) -- 1.7.2.1

1 0

[PATCH] drm/mgag200: fix null pointer dereference
by Devendra Naga 07 Jul '12

07 Jul '12

we are referencing the pointer after doing alloc_apertures, as alloc_apertures kzallocs, the kzalloc may fail and we get a NULL. so we need to check for NULL before we dereference this pointer Signed-off-by: Devendra Naga <devendra.aaru(a)gmail.com> --- drivers/gpu/drm/mgag200/mgag200_drv.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/gpu/drm/mgag200/mgag200_drv.c b/drivers/gpu/drm/mgag200/mgag200_drv.c index 93e832d..ea1024d 100644 --- a/drivers/gpu/drm/mgag200/mgag200_drv.c +++ b/drivers/gpu/drm/mgag200/mgag200_drv.c @@ -47,6 +47,9 @@ static void mgag200_kick_out_firmware_fb(struct pci_dev *pdev) bool primary = false; ap = alloc_apertures(1); + if (!ap) + return; + ap->ranges[0].base = pci_resource_start(pdev, 0); ap->ranges[0].size = pci_resource_len(pdev, 0); -- 1.7.9.5

1 0

[PATCH] gma500: move the ASLE enable
by Alan Cox 07 Jul '12

07 Jul '12

From: Alan Cox <alan(a)linux.intel.com> Otherwise we end up getting the masks wrong, can get events before we are doing power control and other ungood things. Signed-off-by: Alan Cox <alan(a)linux.intel.com> --- drivers/gpu/drm/gma500/opregion.c | 8 +++----- drivers/gpu/drm/gma500/opregion.h | 5 +++++ drivers/gpu/drm/gma500/psb_drv.c | 1 + 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/gma500/opregion.c b/drivers/gpu/drm/gma500/opregion.c index 4f186ec..c430bd4 100644 --- a/drivers/gpu/drm/gma500/opregion.c +++ b/drivers/gpu/drm/gma500/opregion.c @@ -144,6 +144,8 @@ struct opregion_asle { #define ASLE_CBLV_VALID (1<<31) +static struct psb_intel_opregion *system_opregion; + static u32 asle_set_backlight(struct drm_device *dev, u32 bclp) { struct drm_psb_private *dev_priv = dev->dev_private; @@ -205,7 +207,7 @@ void psb_intel_opregion_enable_asle(struct drm_device *dev) struct drm_psb_private *dev_priv = dev->dev_private; struct opregion_asle *asle = dev_priv->opregion.asle; - if (asle) { + if (asle && system_opregion ) { /* Don't do this on Medfield or other non PC like devices, they use the bit for something different altogether */ psb_enable_pipestat(dev_priv, 0, PIPE_LEGACY_BLC_EVENT_ENABLE); @@ -221,7 +223,6 @@ void psb_intel_opregion_enable_asle(struct drm_device *dev) #define ACPI_EV_LID (1<<1) #define ACPI_EV_DOCK (1<<2) -static struct psb_intel_opregion *system_opregion; static int psb_intel_opregion_video_event(struct notifier_block *nb, unsigned long val, void *data) @@ -266,9 +267,6 @@ void psb_intel_opregion_init(struct drm_device *dev) system_opregion = opregion; register_acpi_notifier(&psb_intel_opregion_notifier); } - - if (opregion->asle) - psb_intel_opregion_enable_asle(dev); } void psb_intel_opregion_fini(struct drm_device *dev) diff --git a/drivers/gpu/drm/gma500/opregion.h b/drivers/gpu/drm/gma500/opregion.h index 72dc6b9..4a90f8b 100644 --- a/drivers/gpu/drm/gma500/opregion.h +++ b/drivers/gpu/drm/gma500/opregion.h @@ -27,6 +27,7 @@ extern void psb_intel_opregion_asle_intr(struct drm_device *dev); extern void psb_intel_opregion_init(struct drm_device *dev); extern void psb_intel_opregion_fini(struct drm_device *dev); extern int psb_intel_opregion_setup(struct drm_device *dev); +extern void psb_intel_opregion_enable_asle(struct drm_device *dev); #else @@ -46,4 +47,8 @@ extern inline int psb_intel_opregion_setup(struct drm_device *dev) { return 0; } + +extern inline void psb_intel_opregion_enable_asle(struct drm_device *dev) +{ +} #endif diff --git a/drivers/gpu/drm/gma500/psb_drv.c b/drivers/gpu/drm/gma500/psb_drv.c index caba6e0..a8858a9 100644 --- a/drivers/gpu/drm/gma500/psb_drv.c +++ b/drivers/gpu/drm/gma500/psb_drv.c @@ -374,6 +374,7 @@ static int psb_driver_load(struct drm_device *dev, unsigned long chipset) if (ret) return ret; + psb_intel_opregion_enable_asle(dev); #if 0 /*enable runtime pm at last*/ pm_runtime_enable(&dev->pdev->dev);

1 0

Suspend/resume/suspend broken in Linux 3.5-rc5
by Sven Joachim 06 Jul '12

06 Jul '12

Hi, I'm sorry having to report that I'm only able to suspend once with Linux 3.5-rc5; any subsequent attempts fail. This is a regression from 3.4 where suspend/resume worked flawlessly and arbitrarily often on my machine. Bisection show that the problem was introduced in commit c420b2dc8dc: ,---- | commit c420b2dc8dc3cdd507214f4df5c5f96f08812cbe | Author: Ben Skeggs <bskeggs(a)redhat.com> | Date: Tue May 1 20:48:08 2012 +1000 | | drm/nouveau/fifo: turn all fifo modules into engine modules | | Been tested on each major revision that's relevant here, but I'm sure there | are still bugs waiting to be ironed out. | | This is a *very* invasive change. | | There's a couple of pieces left that I don't like much (eg. other engines | using fifo_priv for the channel count), but that's an artefact of there | being a master channel list still. This is changing, slowly. | | Signed-off-by: Ben Skeggs <bskeggs(a)redhat.com> `---- My graphics cards is the following: VGA compatible controller: NVIDIA Corporation G86 [GeForce 8500 GT] (rev a1) Any advice would be appreciated. Cheers, Sven

1 0

[RFC 0/2] Add DRM SoC framework
by Thierry Reding 06 Jul '12

06 Jul '12

This series adds an initial framework that allows to register a graphics complex as found on many SoCs with the DRM/KMS subsystem. Patch 1 adds the actual framework and patch 2 implements a very rudimentary skeleton driver on top of it. It's really just to show off how to use the DRM/SoC API and of no use otherwise. The reason for implementing this is that the approach currently used by many SoC DRM drivers is to instantiate a dummy platform device for the DRM driver to bind against, which is somewhat of a kludge. The proposal in this series takes care of this implicitly and instantiates only what is really needed to make the DRM core happy. I fully realize that this may not be that much of an improvement over using the drm_platform_init()/drm_platform_exit() functions, but I'm still interested in what people think about it. Thierry Thierry Reding (2): drm: Add SoC framework drm: Add SoC skeleton driver drivers/gpu/drm/Kconfig | 6 ++ drivers/gpu/drm/Makefile | 3 + drivers/gpu/drm/drm_soc.c | 151 ++++++++++++++++++++++++++++++++++++++ drivers/gpu/drm/soc/Kconfig | 13 ++++ drivers/gpu/drm/soc/Makefile | 6 ++ drivers/gpu/drm/soc/soc-drv.c | 166 ++++++++++++++++++++++++++++++++++++++++++ include/drm/drmP.h | 5 ++ 7 files changed, 350 insertions(+) create mode 100644 drivers/gpu/drm/drm_soc.c create mode 100644 drivers/gpu/drm/soc/Kconfig create mode 100644 drivers/gpu/drm/soc/Makefile create mode 100644 drivers/gpu/drm/soc/soc-drv.c -- 1.7.11.1

1 2

[Bug 44121] New: Reproducible GPU lockup CP stall on Radeon HD 6450
by bugzilla-daemon＠bugzilla.kernel.org 06 Jul '12

06 Jul '12

https://bugzilla.kernel.org/show_bug.cgi?id=44121 Summary: Reproducible GPU lockup CP stall on Radeon HD 6450 Product: Drivers Version: 2.5 Kernel Version: 3.5-rc5 Platform: All OS/Version: Linux Tree: Mainline Status: NEW Severity: normal Priority: P1 Component: Video(DRI - non Intel) AssignedTo: drivers_video-dri(a)kernel-bugs.osdl.org ReportedBy: khali(a)linux-fr.org CC: alexdeucher(a)gmail.com Regression: Yes With kernels 3.5-rc3 to 3.5-rc5, I hit a GPU lockup CP stall issue whenever I do some actions in Firefox: if I need to authenticate to access a given site, or when the download target selection window pops up. I'm running Gnome 3.2 on openSUSE 12.1. When this happens, the whole Gnome interface freezes, with gnome-shell stuck at 100% CPU. In the kernel logs I see the following: radeon 0000:08:00.0: GPU lockup CP stall for more than 10000msec radeon 0000:08:00.0: GPU lockup (waiting for 0x00000000000113f3 last fence id 0x00000000000113f0) radeon 0000:08:00.0: GPU softreset radeon 0000:08:00.0: GRBM_STATUS=0xE55008A0 radeon 0000:08:00.0: GRBM_STATUS_SE0=0xEC000001 radeon 0000:08:00.0: GRBM_STATUS_SE1=0x00000007 radeon 0000:08:00.0: SRBM_STATUS=0x200000C0 radeon 0000:08:00.0: GRBM_SOFT_RESET=0x00007F6B radeon 0000:08:00.0: GRBM_STATUS=0x00003828 radeon 0000:08:00.0: GRBM_STATUS_SE0=0x00000007 radeon 0000:08:00.0: GRBM_STATUS_SE1=0x00000007 radeon 0000:08:00.0: SRBM_STATUS=0x200000C0 radeon 0000:08:00.0: GPU reset succeed [drm] PCIE GART of 512M enabled (table at 0x0000000000040000). radeon 0000:08:00.0: WB enabled radeon 0000:08:00.0: fence driver on ring 0 use gpu addr 0x0000000020000c00 and cpu addr 0xffff88013557bc00 [drm] ring test on 0 succeeded in 0 usecs [drm] ib test on ring 0 succeeded in 0 usecs I have more samples if needed. No problem when doing the same with kernel 3.4.4. I ran "git bisect" and found that reverting the following commit fixes the problem: commit 416a2bd274566a6f607a271f524b2dc0b84d9106 Author: Alex Deucher <alexander.deucher(a)amd.com> Date: Thu May 31 19:00:25 2012 -0400 drm/radeon: fixup tiling group size and backendmap on r6xx-r9xx (v4) Tiling group size is always 256bits on r6xx/r7xx/r8xx/9xx. Also fix and simplify render backend map. This now properly sets up the backend map on r6xx-9xx which should improve 3D performance. Vadim benchmarked also: Some benchmarks on juniper (5750), fullscreen 1920x1080, first result - kernel 3.4.0+ (fb21affa), second - with these patches: Lightsmark: 91 fps => 123 fps +35% Doom3: 74 fps => 101 fps +36% Signed-off-by: Alex Deucher <alexander.deucher(a)amd.com> Signed-off-by: Jerome Glisse <jglisse(a)redhat.com> Signed-off-by: Dave Airlie <airlied(a)redhat.com> Let me know if you need more debugging information, I'll do whatever I can to help. -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug.

1 16

[PATCH] drm/radeon: add an exclusive lock for GPU reset v2
by j.glisse＠gmail.com 06 Jul '12

06 Jul '12

From: Jerome Glisse <jglisse(a)redhat.com> GPU reset need to be exclusive, one happening at a time. For this add a rw semaphore so that any path that trigger GPU activities have to take the semaphore as a reader thus allowing concurency. The GPU reset path take the semaphore as a writer ensuring that no concurrent reset take place. v2: init rw semaphore Signed-off-by: Jerome Glisse <jglisse(a)redhat.com> --- drivers/gpu/drm/radeon/radeon.h | 1 + drivers/gpu/drm/radeon/radeon_cs.c | 5 +++++ drivers/gpu/drm/radeon/radeon_device.c | 3 +++ drivers/gpu/drm/radeon/radeon_gem.c | 8 ++++++++ 4 files changed, 17 insertions(+) diff --git a/drivers/gpu/drm/radeon/radeon.h b/drivers/gpu/drm/radeon/radeon.h index 77b4519b..29d6986 100644 --- a/drivers/gpu/drm/radeon/radeon.h +++ b/drivers/gpu/drm/radeon/radeon.h @@ -1446,6 +1446,7 @@ struct radeon_device { struct device *dev; struct drm_device *ddev; struct pci_dev *pdev; + struct rw_semaphore exclusive_lock; /* ASIC */ union radeon_asic_config config; enum radeon_family family; diff --git a/drivers/gpu/drm/radeon/radeon_cs.c b/drivers/gpu/drm/radeon/radeon_cs.c index f1b7527..7ee6491 100644 --- a/drivers/gpu/drm/radeon/radeon_cs.c +++ b/drivers/gpu/drm/radeon/radeon_cs.c @@ -499,7 +499,9 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) struct radeon_cs_parser parser; int r; + down_read(&rdev->exclusive_lock); if (!rdev->accel_working) { + up_read(&rdev->exclusive_lock); return -EBUSY; } /* initialize parser */ @@ -512,6 +514,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) if (r) { DRM_ERROR("Failed to initialize parser !\n"); radeon_cs_parser_fini(&parser, r); + up_read(&rdev->exclusive_lock); r = radeon_cs_handle_lockup(rdev, r); return r; } @@ -520,6 +523,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) if (r != -ERESTARTSYS) DRM_ERROR("Failed to parse relocation %d!\n", r); radeon_cs_parser_fini(&parser, r); + up_read(&rdev->exclusive_lock); r = radeon_cs_handle_lockup(rdev, r); return r; } @@ -533,6 +537,7 @@ int radeon_cs_ioctl(struct drm_device *dev, void *data, struct drm_file *filp) } out: radeon_cs_parser_fini(&parser, r); + up_read(&rdev->exclusive_lock); r = radeon_cs_handle_lockup(rdev, r); return r; } diff --git a/drivers/gpu/drm/radeon/radeon_device.c b/drivers/gpu/drm/radeon/radeon_device.c index f654ba8..254fdb4 100644 --- a/drivers/gpu/drm/radeon/radeon_device.c +++ b/drivers/gpu/drm/radeon/radeon_device.c @@ -734,6 +734,7 @@ int radeon_device_init(struct radeon_device *rdev, mutex_init(&rdev->gem.mutex); mutex_init(&rdev->pm.mutex); init_rwsem(&rdev->pm.mclk_lock); + init_rwsem(&rdev->exclusive_lock); init_waitqueue_head(&rdev->irq.vblank_queue); init_waitqueue_head(&rdev->irq.idle_queue); r = radeon_gem_init(rdev); @@ -988,6 +989,7 @@ int radeon_gpu_reset(struct radeon_device *rdev) int r; int resched; + down_write(&rdev->exclusive_lock); radeon_save_bios_scratch_regs(rdev); /* block TTM */ resched = ttm_bo_lock_delayed_workqueue(&rdev->mman.bdev); @@ -1007,6 +1009,7 @@ int radeon_gpu_reset(struct radeon_device *rdev) dev_info(rdev->dev, "GPU reset failed\n"); } + up_write(&rdev->exclusive_lock); return r; } diff --git a/drivers/gpu/drm/radeon/radeon_gem.c b/drivers/gpu/drm/radeon/radeon_gem.c index d9b0809..b0be9c4 100644 --- a/drivers/gpu/drm/radeon/radeon_gem.c +++ b/drivers/gpu/drm/radeon/radeon_gem.c @@ -215,12 +215,14 @@ int radeon_gem_create_ioctl(struct drm_device *dev, void *data, uint32_t handle; int r; + down_read(&rdev->exclusive_lock); /* create a gem object to contain this object in */ args->size = roundup(args->size, PAGE_SIZE); r = radeon_gem_object_create(rdev, args->size, args->alignment, args->initial_domain, false, false, &gobj); if (r) { + up_read(&rdev->exclusive_lock); r = radeon_gem_handle_lockup(rdev, r); return r; } @@ -228,10 +230,12 @@ int radeon_gem_create_ioctl(struct drm_device *dev, void *data, /* drop reference from allocate - handle holds it now */ drm_gem_object_unreference_unlocked(gobj); if (r) { + up_read(&rdev->exclusive_lock); r = radeon_gem_handle_lockup(rdev, r); return r; } args->handle = handle; + up_read(&rdev->exclusive_lock); return 0; } @@ -240,6 +244,7 @@ int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data, { /* transition the BO to a domain - * just validate the BO into a certain domain */ + struct radeon_device *rdev = dev->dev_private; struct drm_radeon_gem_set_domain *args = data; struct drm_gem_object *gobj; struct radeon_bo *robj; @@ -247,10 +252,12 @@ int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data, /* for now if someone requests domain CPU - * just make sure the buffer is finished with */ + down_read(&rdev->exclusive_lock); /* just do a BO wait for now */ gobj = drm_gem_object_lookup(dev, filp, args->handle); if (gobj == NULL) { + up_read(&rdev->exclusive_lock); return -ENOENT; } robj = gem_to_radeon_bo(gobj); @@ -258,6 +265,7 @@ int radeon_gem_set_domain_ioctl(struct drm_device *dev, void *data, r = radeon_gem_set_domain(gobj, args->read_domains, args->write_domain); drm_gem_object_unreference_unlocked(gobj); + up_read(&rdev->exclusive_lock); r = radeon_gem_handle_lockup(robj->rdev, r); return r; } -- 1.7.10.2

2 1

[Bug 15486] amd_adac error
by bugzilla-daemon＠bugzilla.kernel.org 05 Jul '12

05 Jul '12

https://bugzilla.kernel.org/show_bug.cgi?id=15486 Alex Deucher <alexdeucher(a)gmail.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |alexdeucher(a)gmail.com --- Comment #1 from Alex Deucher <alexdeucher(a)gmail.com> 2012-07-05 16:16:35 --- Is this still an issue with a newer kernel? -- Configure bugmail: https://bugzilla.kernel.org/userprefs.cgi?tab=email ------- You are receiving this mail because: ------- You are watching the assignee of the bug.

1 0

[Bug 15486] amd_adac error
by bugzilla-daemon＠bugzilla.kernel.org 05 Jul '12

05 Jul '12

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel July 2012