dri-devel November 2012

dri-devel@lists.freedesktop.org

126 participants
797 discussions

Re: [PATCH] ttm_get_pages() will OOPS with highmem allocation
by Jonathan Morton 16 Nov '12

16 Nov '12

Reposting from this kernel bug: https://bugzilla.kernel.org/show_bug.cgi?id=50241 I've tested the patch and it solves a highly repeatable OOPS with the CedarView driver that I'm porting. Reviewed-by: Thomas Hellstrom <thellstrom(a)vmware.com> From 3552913d3a1c2d3c4ce158e91dc18cd12b522cb2 Mon Sep 17 00:00:00 2001 From: Yakui Zhao <yakui.zhao(a)intel.com> Date: Tue, 7 Feb 2012 15:33:13 -0500 Subject: [PATCH] Clear the ttm page allocated from high memory zone correctly The TTM page can be allocated from high memory. In such case it is wrong to use the page_address(page) as the virtual address for the high memory page. Signed-off-by: Zhao Yakui <yakui.zhao(a)intel.com> --- drivers/gpu/drm/ttm/ttm_page_alloc.c | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/ttm/ttm_page_alloc.c b/drivers/gpu/drm/ttm/ttm_page_alloc.c index d948575..df976d9 100644 --- a/drivers/gpu/drm/ttm/ttm_page_alloc.c +++ b/drivers/gpu/drm/ttm/ttm_page_alloc.c @@ -708,7 +708,10 @@ int ttm_get_pages(struct list_head *pages, int flags, /* clear the pages coming from the pool if requested */ if (flags & TTM_PAGE_FLAG_ZERO_ALLOC) { list_for_each_entry(p, pages, lru) { - clear_page(page_address(p)); + if (PageHighMem(p)) + clear_highpage(p); + else + clear_page(page_address(p)); } } -- 1.7.7.6 -- From: Jonathan Morton jonathan.morton(a)movial.com

2 1

[PATCH] drm/nouveau: add missing pll_calc calls
by Maarten Lankhorst 16 Nov '12

16 Nov '12

Fixes a null pointer dereference when reclocking on my fermi. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- diff --git a/drivers/gpu/drm/nouveau/core/include/subdev/clock.h b/drivers/gpu/drm/nouveau/core/include/subdev/clock.h index 39e73b9..41b7a6a 100644 --- a/drivers/gpu/drm/nouveau/core/include/subdev/clock.h +++ b/drivers/gpu/drm/nouveau/core/include/subdev/clock.h @@ -54,6 +54,7 @@ int nv04_clock_pll_calc(struct nouveau_clock *, struct nvbios_pll *, int clk, struct nouveau_pll_vals *); int nv04_clock_pll_prog(struct nouveau_clock *, u32 reg1, struct nouveau_pll_vals *); - +int nva3_clock_pll_calc(struct nouveau_clock *, struct nvbios_pll *, + int clk, struct nouveau_pll_vals *); #endif diff --git a/drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c b/drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c index cc8d7d1..9068c98 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c +++ b/drivers/gpu/drm/nouveau/core/subdev/clock/nva3.c @@ -66,6 +66,24 @@ nva3_clock_pll_set(struct nouveau_clock *clk, u32 type, u32 freq) return ret; } +int +nva3_clock_pll_calc(struct nouveau_clock *clock, struct nvbios_pll *info, + int clk, struct nouveau_pll_vals *pv) +{ + int ret, N, M, P; + + ret = nva3_pll_calc(clock, info, clk, &N, NULL, &M, &P); + + if (ret > 0) { + pv->refclk = info->refclk; + pv->N1 = N; + pv->M1 = M; + pv->log2P = P; + } + return ret; +} + + static int nva3_clock_ctor(struct nouveau_object *parent, struct nouveau_object *engine, struct nouveau_oclass *oclass, void *data, u32 size, @@ -80,6 +98,7 @@ nva3_clock_ctor(struct nouveau_object *parent, struct nouveau_object *engine, return ret; priv->base.pll_set = nva3_clock_pll_set; + priv->base.pll_calc = nva3_clock_pll_calc; return 0; } diff --git a/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c b/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c index 5ccce0b..f6962c9 100644 --- a/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c +++ b/drivers/gpu/drm/nouveau/core/subdev/clock/nvc0.c @@ -79,6 +79,7 @@ nvc0_clock_ctor(struct nouveau_object *parent, struct nouveau_object *engine, return ret; priv->base.pll_set = nvc0_clock_pll_set; + priv->base.pll_calc = nva3_clock_pll_calc; return 0; }

1 0

[PATCH] drm/nouveau: add voltage workaround for buggy vbioses
by Maarten Lankhorst 16 Nov '12

16 Nov '12

Required to find all performance levels on my nvc0. Signed-off-by: Maarten Lankhorst <maarten.lankhorst(a)canonical.com> --- diff --git a/drivers/gpu/drm/nouveau/nouveau_perf.c b/drivers/gpu/drm/nouveau/nouveau_perf.c index 4fe883c..624cbd1 100644 --- a/drivers/gpu/drm/nouveau/nouveau_perf.c +++ b/drivers/gpu/drm/nouveau/nouveau_perf.c @@ -251,6 +251,7 @@ static void nouveau_perf_voltage(struct drm_device *dev, struct nouveau_pm_level *perflvl) { struct nouveau_drm *drm = nouveau_drm(dev); + struct nouveau_pm_voltage *volt = &nouveau_pm(dev)->voltage; struct bit_entry P; u8 *vmap; int id; @@ -287,6 +288,20 @@ nouveau_perf_voltage(struct drm_device *dev, struct nouveau_pm_level *perflvl) perflvl->volt_min = ROM32(vmap[0]); perflvl->volt_max = ROM32(vmap[4]); } + + /* Adjust for buggy bioses */ + if (!volt->step_uv || !volt->step_ofs) + return; + + if (perflvl->volt_min % volt->step_uv != volt->step_ofs) { + perflvl->volt_min -= perflvl->volt_min % volt->step_uv; + perflvl->volt_min += volt->step_ofs; + } + + if (perflvl->volt_max % volt->step_uv != volt->step_ofs) { + perflvl->volt_max -= perflvl->volt_max % volt->step_uv; + perflvl->volt_max += volt->step_ofs; + } } void diff --git a/drivers/gpu/drm/nouveau/nouveau_pm.h b/drivers/gpu/drm/nouveau/nouveau_pm.h index 73b789c..967c27c 100644 --- a/drivers/gpu/drm/nouveau/nouveau_pm.h +++ b/drivers/gpu/drm/nouveau/nouveau_pm.h @@ -40,6 +40,7 @@ struct nouveau_pm_voltage { struct nouveau_pm_voltage_level *level; int nr_level; + u16 step_uv, step_ofs; }; /* Exclusive upper limits */ diff --git a/drivers/gpu/drm/nouveau/nouveau_volt.c b/drivers/gpu/drm/nouveau/nouveau_volt.c index 9976414..c8d0c00 100644 --- a/drivers/gpu/drm/nouveau/nouveau_volt.c +++ b/drivers/gpu/drm/nouveau/nouveau_volt.c @@ -236,6 +236,9 @@ nouveau_volt_init(struct drm_device *dev) voltage->level[vid].vid = vid; volt_uv += step_uv; } + voltage->step_uv = step_uv >= 0 ? step_uv : -step_uv; + if (step_uv) + voltage->step_ofs = volt_uv % voltage->step_uv; } voltage->supported = true;

1 0

[PATCH v2] drm/exynos: add exynos drm specific fb_mmap function
by Prathyush K 16 Nov '12

16 Nov '12

This patch adds a exynos drm specific implementation of fb_mmap. The root framebuffer is allocated using dma_alloc_attrs which can allocate a contig or noncontig buffer depending on whether an iommu is attached to drm device or not. The default fb_mmap function always assumes the root fb to be contiguous thus failing in case of a non-contig buffer. The exynos drm specific implementation of fb_mmap extracts the private data from the fb_info and calls dma_mmap_attrs with the parameters used while allocating the buffer. Signed-off-by: Prathyush K <prathyush.k(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 30 +++++++++++++++++++++++++++++ 1 files changed, 30 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c index 67eb6ba..62314ca 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_fbdev.c +++ b/drivers/gpu/drm/exynos/exynos_drm_fbdev.c @@ -46,8 +46,38 @@ struct exynos_drm_fbdev { struct exynos_drm_gem_obj *exynos_gem_obj; }; +static int exynos_drm_fb_mmap(struct fb_info *info, + struct vm_area_struct *vma) +{ + struct drm_fb_helper *helper = info->par; + struct exynos_drm_fbdev *exynos_fbd = to_exynos_fbdev(helper); + struct exynos_drm_gem_obj *exynos_gem_obj = exynos_fbd->exynos_gem_obj; + struct exynos_drm_gem_buf *buffer = exynos_gem_obj->buffer; + unsigned long vm_size; + int ret; + + DRM_DEBUG_KMS("%s\n", __func__); + + vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; + + vm_size = vma->vm_end - vma->vm_start; + + if (vm_size > buffer->size) + return -EINVAL; + + ret = dma_mmap_attrs(helper->dev->dev, vma, buffer->kvaddr, + buffer->dma_addr, vm_size, &buffer->dma_attrs); + if (ret < 0) { + DRM_ERROR("failed to mmap.\n"); + return ret; + } + + return 0; +} + static struct fb_ops exynos_drm_fb_ops = { .owner = THIS_MODULE, + .fb_mmap = exynos_drm_fb_mmap, .fb_fillrect = cfb_fillrect, .fb_copyarea = cfb_copyarea, .fb_imageblit = cfb_imageblit, -- 1.7.0.4

2 1

[PATCH 00/13] drm/i915: Non-blocking GPU synchronization for atomic page flips (v2)
by ville.syrjala＠linux.intel.com 16 Nov '12

16 Nov '12

Here's my second attempt at making atomic page flips synchronize with the GPU in a non-blocking manner. What the code does by default is grap the last_write_seqno from the object, call intel_gem_check_olr() on it, perform the lazy coherency check, and if the seqno still hasn't passed it'll enable the irq and let that sort things out. Now, I'm not sure if the call to intel_gem_check_olr() is even necessary in practice, or can I just go on to checking the seqno directly. With some earlier patches I was seeing an occasional glitch on my screen, and so I tried out a few different variations (always adding a new request to the ring and forcing a GPU cache flush), and for now I left that code in there under a bunch of ifdefs. The glitch was probably caused by committing the wrong register values to the hardware, and patch 05/13 should fix that. I haven't seen any issues for a while now. The real meat is at the beginning of the patch set, and the second half contains just debugging aids. Oh, and I rebased the whole thing on top of drm-intel-nightly yesterday. The haswell changes gave me a bit of grief, but I think I managed to preserve all of them, and still make the atomic stuff work. But I haven't actually tried running it on hsw hardware. Besides my own tests, I also gave Ander's nuclear-pageflip branch of weston [1] a go on top of this stuff. Seems to be working quite nicely so far. Now I just need a working browser and sloppy focus, and I can ditch X ;) As usual my git tree [2] has the whole set for easier consumption. [1] https://github.com/anderco/weston/tree/nuclear-pageflip [2] https://gitorious.org/vsyrjala/linux/commits/drm_atomic_21

1 13

[Bug 50091] [BISECTED]GeForce 6150SE: system hangs on X-server start with garbled screen
by bugzilla-daemon＠bugzilla.kernel.org 16 Nov '12

16 Nov '12

https://bugzilla.kernel.org/show_bug.cgi?id=50091 --- Comment #13 from schaefer.frank(a)gmx.net 2012-11-16 12:10:49 --- Doesn't change anything. This is what happens with commit 70ee6f1cd6911098ddd4c11ee21b69dbe51fb3f9: ... [ 3.619558] [drm] Initialized drm 1.1.0 20060810 [ 3.680948] nouveau 0000:00:0d.0: setting latency timer to 64 [ 3.681173] ACPI: PCI Interrupt Link [AIGP] enabled at IRQ 23 [ 3.681447] nouveau [ DEVICE][0000:00:0d.0] BOOT0 : 0x04c000a2 [ 3.681449] nouveau [ DEVICE][0000:00:0d.0] Chipset: NV4C [ 3.681451] nouveau [ DEVICE][0000:00:0d.0] Family : NV40 [ 3.682383] nouveau [ VBIOS][0000:00:0d.0] checking PRAMIN for image... [ 3.719160] nouveau [ VBIOS][0000:00:0d.0] ... appears to be valid [ 3.719162] nouveau [ VBIOS][0000:00:0d.0] using image from PRAMIN [ 3.719293] nouveau [ VBIOS][0000:00:0d.0] BIT signature found [ 3.719297] nouveau [ VBIOS][0000:00:0d.0] version 05.61.32.14 [ 3.719433] nouveau [ PFB][0000:00:0d.0] RAM type: unknown [ 3.719435] nouveau [ PFB][0000:00:0d.0] RAM size: 256 MiB [ 3.719729] [drm] nouveau 0000:00:0d.0: Detected an NV40 generation card (0x04c000a2) [ 3.720676] [drm] nouveau 0000:00:0d.0: BIT BIOS found [ 3.720679] [drm] nouveau 0000:00:0d.0: Bios version 05.61.32.14 [ 3.720681] [drm] nouveau 0000:00:0d.0: TMDS table version 1.1 [ 3.720682] [drm] nouveau 0000:00:0d.0: TMDS table script pointers not stubbed [ 3.720684] [drm] nouveau 0000:00:0d.0: MXM: no VBIOS data, nothing to do [ 3.720686] [drm] nouveau 0000:00:0d.0: DCB version 3.0 [ 3.720688] [drm] nouveau 0000:00:0d.0: DCB outp 00: 01000310 00000023 [ 3.720690] [drm] nouveau 0000:00:0d.0: DCB outp 01: 00110204 974f0000 [ 2.718650] ACPI: Invalid Power Resource to register! [ 3.720692] [drm] nouveau 0000:00:0d.0: DCB conn 00: 0000 [ 3.721518] [TTM] Zone kernel: Available graphics memory: 418854 kiB [ 3.721520] [TTM] Zone highmem: Available graphics memory: 2691562 kiB [ 3.721521] [TTM] Initializing pool allocator [ 3.724190] [drm] nouveau 0000:00:0d.0: 512 MiB GART (aperture) [ 3.728066] [drm] nouveau 0000:00:0d.0: Saving VGA fonts [ 3.762935] [drm] nouveau 0000:00:0d.0: DCB type 4 not known [ 3.762937] [drm] nouveau 0000:00:0d.0: Unknown-1 has no encoders, removing [ 3.764808] [drm] Supports vblank timestamp caching Rev 1 (10.10.2010). [ 3.764809] [drm] No driver support for vblank timestamp query. [ 3.770228] [drm] nouveau 0000:00:0d.0: 1 available performance level(s) [ 3.770231] [drm] nouveau 0000:00:0d.0: 0: core 425MHz shader 425MHz fanspeed 100% [ 3.770233] [drm] nouveau 0000:00:0d.0: c: [ 3.770358] [drm] nouveau 0000:00:0d.0: Failed to idle channel 0. [ 3.770447] [drm] nouveau 0000:00:0d.0: Setting dpms mode 3 on vga encoder (output 0) [ 3.791615] [drm] nouveau 0000:00:0d.0: Restoring VGA fonts [ 3.794408] [drm:drm_mm_takedown] *ERROR* Memory manager not clean. Delaying takedown [ 3.794440] [drm:drm_mm_takedown] *ERROR* Memory manager not clean. Delaying takedown [ 3.794586] [TTM] Finalizing pool allocator [ 3.794619] [TTM] Zone kernel: Used memory at exit: 8 kiB [ 3.794621] [TTM] Zone highmem: Used memory at exit: 8 kiB [ 3.794885] [drm:drm_mm_takedown] *ERROR* Memory manager not clean. Delaying takedown [ 3.795205] ------------[ cut here ]------------ [ 3.795238] WARNING: at drivers/gpu/drm/nouveau/nouveau_gpuobj.c:241 nouveau_gpuobj_takedown+0x103/0x110 [nouveau]() [ 3.795239] Hardware name: System Product Name [ 3.795240] Modules linked in: nouveau(+) ttm drm_kms_helper drm i2c_algo_bit mxm_wmi video wmi fan thermal button processor thermal_sys scsi_dh_alua scsi_dh_hp_sw scsi_dh_emc scsi_dh_rdac scsi_dh ata_generic pata_amd pata_jmicron sata_nv [ 3.795257] Pid: 32, comm: kworker/0:1 Not tainted 3.6.0-2.10-desktop+ #4 [ 3.795258] Call Trace: [ 3.795266] [<c023726d>] warn_slowpath_common+0x6d/0xa0 [ 3.795290] [<f99b3ae3>] ? nouveau_gpuobj_takedown+0x103/0x110 [nouveau] [ 3.795312] [<f99b3ae3>] ? nouveau_gpuobj_takedown+0x103/0x110 [nouveau] [ 3.795316] [<c02372bd>] warn_slowpath_null+0x1d/0x20 [ 3.795339] [<f99b3ae3>] nouveau_gpuobj_takedown+0x103/0x110 [nouveau] [ 3.795359] [<f996ab64>] ? nv40_instmem_takedown+0x54/0x70 [nouveau] [ 3.795382] [<f99af4fe>] nouveau_card_init+0x68e/0xec0 [nouveau] [ 3.795386] [<c022d61a>] ? ioremap_nocache+0x1a/0x20 [ 3.795409] [<f99b02fd>] nouveau_load+0x49d/0x8f0 [nouveau] [ 3.795432] [<f99ac3aa>] nouveau_drm_load+0x21a/0x250 [nouveau] [ 3.795445] [<f7abd330>] ? drm_get_minor+0x1f0/0x2b0 [drm] [ 3.795455] [<f7abf6a3>] drm_get_pci_dev+0x133/0x250 [drm] [ 3.795460] [<c04a183e>] ? pcibios_set_master+0x7e/0xb0 [ 3.795483] [<f99f631c>] nouveau_pci_probe+0xd/0xf [nouveau] [ 3.795504] [<f99f62f8>] nouveau_drm_probe+0x95/0xac [nouveau] [ 3.795507] [<c04a367a>] local_pci_probe+0x5a/0xd0 [ 3.795511] [<c024f3ec>] work_for_cpu_fn+0xc/0x20 [ 3.795513] [<c0251095>] process_one_work+0x115/0x420 [ 3.795516] [<c024f6a0>] ? hweight_long+0x10/0x10 [ 3.795519] [<c024f3e0>] ? move_linked_works+0x80/0x80 [ 3.795521] [<c02516a1>] worker_thread+0x111/0x3b0 [ 3.795524] [<c0262239>] ? complete+0x49/0x60 [ 3.795527] [<c0251590>] ? rescuer_thread+0x1c0/0x1c0 [ 3.795530] [<c025678d>] kthread+0x6d/0x80 [ 3.795532] [<c0256720>] ? kthread_freezable_should_stop+0x50/0x50 [ 3.795536] [<c070caf6>] kernel_thread_helper+0x6/0xd [ 3.795538] ---[ end trace 7467d93187e1277b ]--- [ 3.795945] nouveau: probe of 0000:00:0d.0 failed with error -12 ... -- 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

[drm-intel:drm-intel-testing 256/269] drivers/gpu/drm/i915/i915_drv.h:1545:2: warning: '______f' is static but declared in inline function 'i915_gem_chipset_flush' which is not static
by kbuild test robot 16 Nov '12

16 Nov '12

tree: git://people.freedesktop.org/~danvet/drm-intel.git drm-intel-testing head: 4d8bd4f511f00cd7396736e3ebb9c1ffd939d341 commit: e76e9aebcdbfebae8f4cd147e3c0f800d36e97f3 [256/269] drm/i915: Stop using AGP layer for GEN6+ config: x86_64-randconfig-s283 (attached as .config) All warnings: In file included from drivers/gpu/drm/i915/i915_drv.c:33:0: drivers/gpu/drm/i915/i915_drv.h:1545:2: warning: '______f' is static but declared in inline function 'i915_gem_chipset_flush' which is not static [enabled by default] -- In file included from drivers/gpu/drm/i915/i915_gem_gtt.c:27:0: drivers/gpu/drm/i915/i915_drv.h:1545:2: warning: '______f' is static but declared in inline function 'i915_gem_chipset_flush' which is not static [enabled by default] drivers/gpu/drm/i915/i915_gem_gtt.c: In function 'i915_gem_gtt_bind_object': drivers/gpu/drm/i915/i915_gem_gtt.c:38:6: warning: 'addr' may be used uninitialized in this function [-Wmaybe-uninitialized] drivers/gpu/drm/i915/i915_gem_gtt.c:360:13: note: 'addr' was declared here -- In file included from drivers/gpu/drm/i915/intel_ddi.c:28:0: drivers/gpu/drm/i915/i915_drv.h:1545:2: warning: '______f' is static but declared in inline function 'i915_gem_chipset_flush' which is not static [enabled by default] drivers/gpu/drm/i915/intel_ddi.c: In function 'intel_ddi_setup_hw_pll_state': drivers/gpu/drm/i915/intel_ddi.c:1111:12: warning: 'port' may be used uninitialized in this function [-Wmaybe-uninitialized] vim +1545 drivers/gpu/drm/i915/i915_drv.h 7bddb01f Daniel Vetter 2012-02-09 1529 struct drm_i915_gem_object *obj); 1d2a314c Daniel Vetter 2012-02-09 1530 76aaf220 Daniel Vetter 2010-11-05 1531 void i915_gem_restore_gtt_mappings(struct drm_device *dev); 74163907 Daniel Vetter 2012-02-15 1532 int __must_check i915_gem_gtt_prepare_object(struct drm_i915_gem_object *obj); 74163907 Daniel Vetter 2012-02-15 1533 void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj, e4ffd173 Chris Wilson 2011-04-04 1534 enum i915_cache_level cache_level); 05394f39 Chris Wilson 2010-11-08 1535 void i915_gem_gtt_unbind_object(struct drm_i915_gem_object *obj); 74163907 Daniel Vetter 2012-02-15 1536 void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj); 644ec02b Daniel Vetter 2012-03-26 1537 void i915_gem_init_global_gtt(struct drm_device *dev, 644ec02b Daniel Vetter 2012-03-26 1538 unsigned long start, 644ec02b Daniel Vetter 2012-03-26 1539 unsigned long mappable_end, 644ec02b Daniel Vetter 2012-03-26 1540 unsigned long end); e76e9aeb Ben Widawsky 2012-11-04 1541 int i915_gem_gtt_init(struct drm_device *dev); e76e9aeb Ben Widawsky 2012-11-04 1542 void i915_gem_gtt_fini(struct drm_device *dev); e76e9aeb Ben Widawsky 2012-11-04 1543 extern inline void i915_gem_chipset_flush(struct drm_device *dev) e76e9aeb Ben Widawsky 2012-11-04 1544 { e76e9aeb Ben Widawsky 2012-11-04 @1545 if (INTEL_INFO(dev)->gen < 6) e76e9aeb Ben Widawsky 2012-11-04 1546 intel_gtt_chipset_flush(); e76e9aeb Ben Widawsky 2012-11-04 1547 } e76e9aeb Ben Widawsky 2012-11-04 1548 76aaf220 Daniel Vetter 2010-11-05 1549 b47eb4a2 Chris Wilson 2010-08-07 1550 /* i915_gem_evict.c */ 2021746e Chris Wilson 2010-11-23 1551 int __must_check i915_gem_evict_something(struct drm_device *dev, int min_size, 42d6ab48 Chris Wilson 2012-07-26 1552 unsigned alignment, 42d6ab48 Chris Wilson 2012-07-26 1553 unsigned cache_level, --- 0-DAY kernel build testing backend Open Source Technology Center Fengguang Wu, Yuanhan Liu Intel Corporation

3 2

[PATCH] drm/exynos: make sure that overlay data are updated
by Inki Dae 16 Nov '12

16 Nov '12

This patch removes wait_for_vblank call from exynos_drm_encoder_plane_disable function and move it to exynos_drm_encoder_plane_commit function. Disabling dma channel to each plane doens't need vblank signal to update data to real hardware. But updating overlay data to real hardware does need vblank signal. Signed-off-by: Inki Dae <inki.dae(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_encoder.c | 17 +++++++---------- 1 files changed, 7 insertions(+), 10 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_encoder.c b/drivers/gpu/drm/exynos/exynos_drm_encoder.c index 607231a..b284dea 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_encoder.c +++ b/drivers/gpu/drm/exynos/exynos_drm_encoder.c @@ -473,6 +473,13 @@ void exynos_drm_encoder_plane_commit(struct drm_encoder *encoder, void *data) if (overlay_ops && overlay_ops->commit) overlay_ops->commit(manager->dev, zpos); + + /* + * wait for vblank interrupt + * - this makes user that overlay data are updated to real hardware. + */ + if (overlay_ops->wait_for_vblank) + overlay_ops->wait_for_vblank(manager->dev); } void exynos_drm_encoder_plane_enable(struct drm_encoder *encoder, void *data) @@ -505,14 +512,4 @@ void exynos_drm_encoder_plane_disable(struct drm_encoder *encoder, void *data) if (overlay_ops && overlay_ops->disable) overlay_ops->disable(manager->dev, zpos); - - /* - * wait for vblank interrupt - * - this makes sure that hardware overlay is disabled to avoid - * for the dma accesses to memory after gem buffer was released - * because the setting for disabling the overlay will be updated - * at vsync. - */ - if (overlay_ops->wait_for_vblank) - overlay_ops->wait_for_vblank(manager->dev); } -- 1.7.4.1

1 1

[Bug 57173] New: sigsegv in Planeshift
by bugzilla-daemon＠freedesktop.org 16 Nov '12

16 Nov '12

https://bugs.freedesktop.org/show_bug.cgi?id=57173 Priority: medium Bug ID: 57173 Assignee: dri-devel(a)lists.freedesktop.org Summary: sigsegv in Planeshift Severity: major Classification: Unclassified OS: Linux (All) Reporter: freedesktop(a)skewray.com Hardware: x86-64 (AMD64) Status: NEW Version: XOrg CVS Component: DRM/Radeon Product: DRI Os: Ubuntu 12.10 with 3.5.0-18 kernel My card: 01:00.0 VGA compatible controller: Advanced Micro Devices [AMD] nee ATI RV730XT [Radeon HD 4670] Output from gdb: Program received signal SIGSEGV, Segmentation fault. 0x00007fffdad6d592 in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so (gdb) where #0 0x00007fffdad6d592 in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so #1 0x00007fffdad3eb10 in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so #2 0x00007fffdae03a1b in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so #3 0x00007fffdae009b7 in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so #4 0x00007fffdad3bddd in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so #5 0x00007fffdad3405a in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so #6 0x00007fffdad35034 in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so #7 0x00007fffdad3517c in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so #8 0x00007fffdad35260 in ?? () from /usr/lib/x86_64-linux-gnu/dri/swrast_dri.so #9 0x0000000000d82acf in ?? () #10 0x0000000000c88327 in ?? () #11 0x0000000000c88bfa in ?? () #12 0x0000000000c89189 in ?? () #13 0x0000000000c9756a in ?? () #14 0x00000000004b7d49 in ?? () #15 0x000000000047bd29 in ?? () #16 0x00000000013e54a7 in ?? () #17 0x00000000013e5910 in ?? () #18 0x00000000013de7d6 in ?? () #19 0x00000000012860a6 in ?? () #20 0x000000000047ad41 in ?? () #21 0x00007ffff4d9c76d in __libc_start_main (main=0x47acb0, argc=1, ubp_av=0x7fffffffe468, init=<optimized out>, fini=<optimized out>, rtld_fini=<optimized out>, stack_end=0x7fffffffe458) at libc-start.c:226 #22 0x000000000044a459 in ?? () #23 0x00007fffffffe458 in ?? () #24 0x000000000000001c in ?? () #25 0x0000000000000001 in ?? () #26 0x00007fffffffe7e3 in ?? () #27 0x0000000000000000 in ?? () I'd be happy to install the debugging symbols version and try again if I knew how to install it...synaptic won't let me do it directly. -- You are receiving this mail because: You are the assignee for the bug.

1 2

[PATCH] drm/exynos: add vm_ops to specific gem mmaper
by Inki Dae 16 Nov '12

16 Nov '12

This patch makes it takes a reference to gem object when specific gem mmap is requested. For this, it sets dev->driver->gem_vm_ops to vma->vm_ops. And this patch is based on exynos-drm-next-iommu branch of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos Signed-off-by: Inki Dae <inki.dae(a)samsung.com> Signed-off-by: Kyungmin Park <kyungmin.park(a)samsung.com> --- drivers/gpu/drm/exynos/exynos_drm_gem.c | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/drivers/gpu/drm/exynos/exynos_drm_gem.c b/drivers/gpu/drm/exynos/exynos_drm_gem.c index 50d73f1..b7ce8b6 100644 --- a/drivers/gpu/drm/exynos/exynos_drm_gem.c +++ b/drivers/gpu/drm/exynos/exynos_drm_gem.c @@ -372,10 +372,13 @@ static int exynos_drm_gem_mmap_buffer(struct file *filp, struct exynos_drm_gem_obj *exynos_gem_obj = to_exynos_gem_obj(obj); struct exynos_drm_gem_buf *buffer; unsigned long vm_size; + int ret; DRM_DEBUG_KMS("%s\n", __FILE__); vma->vm_flags |= VM_IO | VM_DONTEXPAND | VM_DONTDUMP; + vma->vm_private_data = obj; + vma->vm_ops = obj->dev->driver->gem_vm_ops; update_vm_cache_attr(exynos_gem_obj, vma); @@ -391,9 +394,22 @@ static int exynos_drm_gem_mmap_buffer(struct file *filp, if (vm_size > buffer->size) return -EINVAL; - return dma_mmap_attrs(obj->dev->dev, vma, buffer->kvaddr, + ret = dma_mmap_attrs(obj->dev->dev, vma, buffer->kvaddr, buffer->dma_addr, buffer->size, &buffer->dma_attrs); + if (ret < 0) { + DRM_ERROR("failed to mmap.\n"); + return ret; + } + + /* + * take a reference to this mapping of the object. And this reference + * is unreferenced by the corresponding vm_close call. + */ + drm_gem_object_reference(obj); + drm_vm_open_locked(obj->dev, vma); + + return 0; } static const struct file_operations exynos_drm_gem_fops = { @@ -426,6 +442,8 @@ int exynos_drm_gem_mmap_ioctl(struct drm_device *dev, void *data, addr = vm_mmap(obj->filp, 0, args->size, PROT_READ | PROT_WRITE, MAP_SHARED, 0); + /* restore it to drm_file object. */ + obj->filp->private_data = file_priv; drm_gem_object_unreference_unlocked(obj); if (IS_ERR((void *)addr)) -- 1.7.4.1

1 2

← Newer
1
...
57
58
59
60
61
62
63
...
80
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel November 2012