dri-devel May 2012

dri-devel@lists.freedesktop.org

115 participants
737 discussions

[ANNOUNCE] libdrm 2.4.34
by Eric Anholt 10 May '12

10 May '12

Anisse Astier (1): radeon: Add new R600 PCI ids for surface manager Ben Skeggs (3): lists: add nicer+unsafe foreach, and list join macros nouveau: pull in major libdrm rewrite nouveau: init nvc0 channel alloc req structure fully Christoph Bumiller (1): nouveau: expose notifier handle on nvc0 as well Daniel Vetter (1): intel/decode: decode MI_WAIT_FOR_EVENT Eugeni Dodonov (1): intel: add Ivy Bridge GT2 server variant Marcin Slusarz (2): … [View More]

1 0

[PATCH 0/2] Audio client support for VGA-switcheroo
by Takashi Iwai 10 May '12

10 May '12

Dave, this is a small patch series to add the support for audio clients to VGA switcheroo. The background problem is that the HD-audio HDMI controller of the discrete GPU is also disabled when the graphics core is disabled by vga-switcheroo. This leads to a long stall of the audio driver, or at worst, it Oopses. https://bugzilla.kernel.org/show_bug.cgi?id=43155 I tried to work around it only in the audio driver side, but it doesn't seem to help. When the graphics is disabled, the … [View More]

4 12

[PATCH libdrm] radeon: Add new R600 PCI ids for surface manager
by Anisse Astier 10 May '12

10 May '12

This is the same list of PCI ids added by Alex Deucher in xf86-video-ati commit aacbd629b02cbee3f9e6a0ee452b4e3f21376bd3. This is needed since the addition of the surface allocator helper in commit c51f7f0e460dcadb9f1a56ecf1615810877c33c8 ; it needs to differentiate pre and post-R600 GPUs. Therefore we should maintain another PCI id list. Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=48138 Signed-off-by: Anisse Astier <anisse(a)astier.eu> --- radeon/r600_pci_ids.h | 10 +++++++++… [View More]

2 1

[patch] gma500: silence an unused variable warning
by Dan Carpenter 10 May '12

10 May '12

If CONFIG_BACKLIGHT_CLASS_DEVICE is disabled then GCC warns that: drivers/gpu/drm/gma500/opregion.c:154:6: warning: unused variable ‘max’ [-Wunused-variable] Which give me a chance to use the new config_enabled() macro. :) Signed-off-by: Dan Carpenter <dan.carpenter(a)oracle.com> diff --git a/drivers/gpu/drm/gma500/opregion.c b/drivers/gpu/drm/gma500/opregion.c index 05661bf..d2125ba 100644 --- a/drivers/gpu/drm/gma500/opregion.c +++ b/drivers/gpu/drm/gma500/opregion.c @@ -151,7 +… [View More]

4 3

[PULL] drm-intel-next
by Daniel Vetter 10 May '12

10 May '12

Hi Dave, New drm-intel-next pull request. Highlights: - sparse fixes from Ben. - tons of little cleanups from Chris all over: tiling_changed clarification, deferred_free list removal, ... - fix up irq handler on gen2 & gen3 + related cleanups from Chris - prep work for wait_rendering_timeout from Ben with some nice refactorings - first set of infoframe fixes from Paulo for doubleclocked CEA modes - improve pch pll handling from Jesse and Chris - gpu hangman, this also contains the … [View More]reset fix for gen4 - rps sanity check from Chris - this papers over issues when the gpu fails to clock up on snb/ivb, and it is shockingly easy to hit. The code prints a big WARN backtrace and restores the hw to a sane state. The real fix is still in the works. Atm I'm aware of 2 regressions in -next: - One of the gmbus patches (not gmbus itself) regressed lvds detection on a MacbookPro. I've analyzed the bug already and I think I know what's going on, patch is awaiting test feedback. - Just today QA reported that DP on ilk regressed. That bug is fresh of the press and still awaiting detailed logfiles and the bisect result. The only thing that's clear atm is that -fixes works and -next doesn't. Otherwise 3.5 merge is winding down, I am queueing up a few things though that I'd like to still sneak in: - More infoframe fixes from Paulo (most already queued into my tree). - Final pieces of the first cut at hsw support from Eugeni - all the invasive pieces and code rework has landed already so not much harm there. - I'm working on some backlight fixes I'd like to land in 3.5, but not yet all ready. As discussed on irc this pull request is for the merged branch which already resolves the conflicts with drm-next (due to the -rc6 backmerge). Yours, Daniel The following changes since commit 4f256e8aa3eda15c11c3cec3ec5336e1fc579cbd: Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-core-next (2012-05-07 16:09:35 +0100) are available in the git repository at: git://people.freedesktop.org/~danvet/drm-intel tags/drm-intel-next-2012-05-06-merged for you to fetch changes up to 5e13a0c5ec05d382b488a691dfb8af015b1dea1e: Merge remote-tracking branch 'airlied/drm-core-next' into drm-intel-next-queued (2012-05-08 13:39:59 +0200) ---------------------------------------------------------------- Ben Widawsky (11): drm/i915: [sparse] __iomem fixes for opregion drm/i915: [sparse] __iomem fixes for overlay drm/i915: [sparse] __iomem fixes for gem drm/i915: remove do_retire from i915_wait_request drm/i915: move vbetool invoked ier stuff drm/i915: kill waiting_seqno drm/i915: drop polled waits from i915_wait_request drm/i915: extract __wait_seqno from i915_wait_request drm/i915: remove polled wait from throttle drm/i915: use __wait_seqno for ring throttle drm/i915: extract some common olr+wedge code Chris Wilson (32): drm/i915/sprite: Avoid incurring extra vblank stall when updating plane on IVB drm/i915: Remove i915_gem_ringbuffer_(data|info) from debugfs drm/i915: Clarify the semantics of tiling_changed drm/i915: Only the zap the VMA after updating the tiling parameters drm/i915: i8xx interrupt handler drm/i915: Use a global lock for modifying global irq flags drm/i915: Remove too early plane enable on pre-PCH hardware drm/i915: Bump the inactive LRU on set-to-GTT-domain drm/i915: Remove i915_gem_evict_inactive() drm/i915: Remove the list of pinned inactive objects drm/i915: Remove the deferred-free list drm/i915: Split the stolen handling for GEM out of i915_dma.c drm/i915: Move GEM initialisation from i915_dma.c to i915_gem.c drm/i915: CR clock gating is recommend to be set on PineView drm/i915: Unconditionally initialise the interrupt workers drm/i915: Remove redundant initialisation of per-ring IRQ waitqueues drm/i915: pending_flip_is_done is gen3, name it so drm/i915: Duplicate and split the gen3/4 irq handler drm/i915: Clear FlipDone semantics change for pageflipping on gen3 drm/i915: Remove gen3 irq code from gen4 irq routine drm/i915: Remove gen4 irq code from gen3 irq routine drm/i915: HWSTAM is only 16-bit on gen3 drm/i915: Cleanup gen3 irq uninstall drm/i915: Handle PendingFlip on gen3 robustly drm/i915: Inline I915_INTERRUPT_ENABLE_FIX drm/i915: Remove unused and unloved vblank macros drm/i915: Remove unused ring->irq_seqno drm/i915: Only enable IPS polling for gen5 drm/i915: Remove unused dev_priv->vblank_pipe drm/i915: Wait for the clocks to stabilise before updating PLLs drm/i915: Periodically sanity check power management drm/i915: Support pageflipping interrupts for all 3-pipes on IVB Daniel Vetter (43): drm/i915: print computed bpp in dp link configuration drm/i915: [sparse] __iomem fixes for debugfs drm/i915: re-add static qualifier to get_cxsr_latency drm/i915: fixup tv load-detect on enabled but not active crtc drm/i915: create macros to handle masked bits drm/i915: implement Disable4x2SubspanOptimization w/a for ivb, too drm/i915: properly check for MODESET for kms driver ioctls drm/i915: disallow gem ums init ioctl for kms drm/i915: rip out GEM drm feature checks drm/i915: rip out dev_priv->has_gem drm/i915: check for kms in dri1 ioctls drm/i915: use the new masked bit macro some more drm/i915: move dri1 vblank stubs to i915_dma.c drm/i915: create dev_priv->dri1 dragon dungeon^W^W sub-struct drm/i915 disallow physical batchbuffers for KMS drm/i915: rip out dev_priv->tex_lru_log_granularity drm/i915: remove LP_RING&friends from modeset code drm/i915: kill intel_clear_scanline_wait drm/i915: rip out dri1 breadcrumb updates from gen5+ irq handlers drm/i915: move dri1 irq ioctl code to i915_dma.c drm/i915: extract dri1 breadcrumb update from irq handler drm/i915: move LP_RING&friends to i915_dma.c drm/i915: disallow clip rects on gen5+ drm/i915: move the ips code to intel_pm.c drm/i915: move rps/emon function declarations drm/i915: kill pointless clearing of dev_priv->hws_map drm/i915: rework legacy GFX HWS handling drm/i915: fixup __iomem mixups in ringbuffer.c drm/i915: move pnv|ilk_gem_mem_freq to intel_pm.c drm/i915: rip out intel_dpio_write again drm/i915: rip out unnecessary calls to drm_mode_set_crtcinfo drm/i915: use mode values consistently when converting to sdvo dtd drm/i915: add interface to simulate gpu hangs drm/i915: rework dev->first_error locking drm/i915: allow the existing error_state to be destroyed drm/i915: simplify i915_reset a bit drm/i915: extract intel_gpu_reset drm/i915: make gpu hangman more resilient drm/i915: kill flags parameter for reset functions drm/i915: also reset the media engine on gen4/5 drm/i915: remove modeset reset from i915_reset drm/i915: fix gen4 gpu reset Merge remote-tracking branch 'airlied/drm-core-next' into drm-intel-next-queued Jesse Barnes (1): drm/i915: manage PCH PLLs separately from pipes Paulo Zanoni (2): drm/i915: rename AVI InfoFrame field 'PR' to 'YQ_CN_PR' drm/i915: make DBLCLK modes work drivers/gpu/drm/i915/Makefile | 1 + drivers/gpu/drm/i915/i915_debugfs.c | 270 ++++--- drivers/gpu/drm/i915/i915_dma.c | 1076 ++++++-------------------- drivers/gpu/drm/i915/i915_drv.c | 132 ++-- drivers/gpu/drm/i915/i915_drv.h | 122 ++- drivers/gpu/drm/i915/i915_gem.c | 434 +++++------ drivers/gpu/drm/i915/i915_gem_debug.c | 16 - drivers/gpu/drm/i915/i915_gem_evict.c | 42 +- drivers/gpu/drm/i915/i915_gem_execbuffer.c | 9 +- drivers/gpu/drm/i915/i915_gem_gtt.c | 2 +- drivers/gpu/drm/i915/i915_gem_stolen.c | 202 +++++ drivers/gpu/drm/i915/i915_gem_tiling.c | 18 +- drivers/gpu/drm/i915/i915_irq.c | 1136 ++++++++++++++++------------ drivers/gpu/drm/i915/i915_reg.h | 24 +- drivers/gpu/drm/i915/i915_suspend.c | 2 +- drivers/gpu/drm/i915/intel_display.c | 413 ++++++---- drivers/gpu/drm/i915/intel_dp.c | 19 +- drivers/gpu/drm/i915/intel_drv.h | 24 +- drivers/gpu/drm/i915/intel_hdmi.c | 8 +- drivers/gpu/drm/i915/intel_opregion.c | 67 +- drivers/gpu/drm/i915/intel_overlay.c | 209 ++--- drivers/gpu/drm/i915/intel_pm.c | 675 ++++++++++++++++- drivers/gpu/drm/i915/intel_ringbuffer.c | 170 +++-- drivers/gpu/drm/i915/intel_ringbuffer.h | 15 +- drivers/gpu/drm/i915/intel_sdvo.c | 19 +- drivers/gpu/drm/i915/intel_sprite.c | 29 +- drivers/gpu/drm/i915/intel_tv.c | 5 +- 27 files changed, 2882 insertions(+), 2257 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gem_stolen.c -- Daniel Vetter Mail: daniel(a)ffwll.ch Mobile: +41 (0)79 365 57 48 [View Less]

1 0

[PATCH] i915: add dmabuf/prime buffer sharing support.
by Daniel Vetter 10 May '12

10 May '12

From: Dave Airlie <airlied(a)redhat.com> This adds handle->fd and fd->handle support to i915, this is to allow for offloading of rendering in one direction and outputs in the other. v2 from Daniel Vetter: - fixup conflicts with the prepare/finish gtt prep work. - implement ppgtt binding support. Note that we have squat i-g-t testcoverage for any of the lifetime and access rules dma_buf/prime support brings along. And there are quite a few intricate situations here. Also note … [View More]that the integration with the existing code is a bit hackish, especially around get_gtt_pages and put_gtt_pages. It imo would be easier with the prep code from Chris Wilson's unbound series, but that is for 3.6. Also note that I didn't bother to put the new prepare/finish gtt hooks to good use by moving the dma_buf_map/unmap_attachment calls in there (like we've originally planned for). Last but not least this patch is only compile-tested, but I've changed very little compared to Dave Airlie's version. So there's a decent chance v2 on drm-next works as well as v1 on 3.4-rc. Signed-off-by: Dave Airlie <airlied(a)redhat.com> Signed-Off-by: Daniel Vetter <daniel.vetter(a)ffwll.ch> --- drivers/gpu/drm/i915/Makefile | 3 +- drivers/gpu/drm/i915/i915_drv.c | 8 +- drivers/gpu/drm/i915/i915_drv.h | 11 +++ drivers/gpu/drm/i915/i915_gem.c | 12 ++- drivers/gpu/drm/i915/i915_gem_dmabuf.c | 149 ++++++++++++++++++++++++++++++++ drivers/gpu/drm/i915/i915_gem_gtt.c | 17 +++- 6 files changed, 193 insertions(+), 7 deletions(-) create mode 100644 drivers/gpu/drm/i915/i915_gem_dmabuf.c diff --git a/drivers/gpu/drm/i915/Makefile b/drivers/gpu/drm/i915/Makefile index 8b8bbc7..7b7ecb8 100644 --- a/drivers/gpu/drm/i915/Makefile +++ b/drivers/gpu/drm/i915/Makefile @@ -37,7 +37,8 @@ i915-y := i915_drv.o i915_dma.o i915_irq.o \ dvo_ch7017.o \ dvo_ivch.o \ dvo_tfp410.o \ - dvo_sil164.o + dvo_sil164.o \ + i915_gem_dmabuf.o i915-$(CONFIG_COMPAT) += i915_ioc32.o diff --git a/drivers/gpu/drm/i915/i915_drv.c b/drivers/gpu/drm/i915/i915_drv.c index 1ccfc23..ac13c2c 100644 --- a/drivers/gpu/drm/i915/i915_drv.c +++ b/drivers/gpu/drm/i915/i915_drv.c @@ -1034,7 +1034,7 @@ static struct drm_driver driver = { */ .driver_features = DRIVER_USE_AGP | DRIVER_REQUIRE_AGP | /* DRIVER_USE_MTRR |*/ - DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM, + DRIVER_HAVE_IRQ | DRIVER_IRQ_SHARED | DRIVER_GEM | DRIVER_PRIME, .load = i915_driver_load, .unload = i915_driver_unload, .open = i915_driver_open, @@ -1057,6 +1057,12 @@ static struct drm_driver driver = { .gem_init_object = i915_gem_init_object, .gem_free_object = i915_gem_free_object, .gem_vm_ops = &i915_gem_vm_ops, + + .prime_handle_to_fd = drm_gem_prime_handle_to_fd, + .prime_fd_to_handle = drm_gem_prime_fd_to_handle, + .gem_prime_export = i915_gem_prime_export, + .gem_prime_import = i915_gem_prime_import, + .dumb_create = i915_gem_dumb_create, .dumb_map_offset = i915_gem_mmap_gtt, .dumb_destroy = i915_gem_dumb_destroy, diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index e03a4f8..751f25c 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -935,6 +935,8 @@ struct drm_i915_gem_object { struct scatterlist *sg_list; int num_sg; + /* prime dma-buf support */ + struct sg_table *sg_table; /** * Used for performing relocations during execbuffer insertion. */ @@ -1240,6 +1242,8 @@ int __must_check i915_gem_object_unbind(struct drm_i915_gem_object *obj); void i915_gem_release_mmap(struct drm_i915_gem_object *obj); void i915_gem_lastclose(struct drm_device *dev); +int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj, + gfp_t gfpmask); int __must_check i915_mutex_lock_interruptible(struct drm_device *dev); int __must_check i915_gem_object_wait_rendering(struct drm_i915_gem_object *obj); int i915_gem_object_sync(struct drm_i915_gem_object *obj, @@ -1337,6 +1341,13 @@ i915_gem_get_unfenced_gtt_alignment(struct drm_device *dev, int i915_gem_object_set_cache_level(struct drm_i915_gem_object *obj, enum i915_cache_level cache_level); +struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, + struct dma_buf *dma_buf); + +struct dma_buf *i915_gem_prime_export(struct drm_device *dev, + struct drm_gem_object *gem_obj, int flags); + + /* i915_gem_gtt.c */ int __must_check i915_gem_init_aliasing_ppgtt(struct drm_device *dev); void i915_gem_cleanup_aliasing_ppgtt(struct drm_device *dev); diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 44a5f24..d3bcfd4 100644 --- a/drivers/gpu/drm/i915/i915_gem.c +++ b/drivers/gpu/drm/i915/i915_gem.c @@ -35,6 +35,7 @@ #include <linux/slab.h> #include <linux/swap.h> #include <linux/pci.h> +#include <linux/dma-buf.h> static __must_check int i915_gem_object_flush_gpu_write_domain(struct drm_i915_gem_object *obj); static void i915_gem_object_flush_gtt_write_domain(struct drm_i915_gem_object *obj); @@ -1302,8 +1303,7 @@ i915_gem_mmap_gtt_ioctl(struct drm_device *dev, void *data, return i915_gem_mmap_gtt(file, dev, args->handle, &args->offset); } - -static int +int i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj, gfp_t gfpmask) { @@ -1312,6 +1312,8 @@ i915_gem_object_get_pages_gtt(struct drm_i915_gem_object *obj, struct inode *inode; struct page *page; + if (obj->pages || obj->sg_table) + return 0; /* Get the list of pages out of our struct file. They'll be pinned * at this point until we release them. */ @@ -1353,6 +1355,9 @@ i915_gem_object_put_pages_gtt(struct drm_i915_gem_object *obj) int page_count = obj->base.size / PAGE_SIZE; int i; + if (!obj->pages) + return; + BUG_ON(obj->madv == __I915_MADV_PURGED); if (i915_gem_object_needs_bit17_swizzle(obj)) @@ -3321,6 +3326,9 @@ void i915_gem_free_object(struct drm_gem_object *gem_obj) trace_i915_gem_object_destroy(obj); + if (gem_obj->import_attach) + drm_prime_gem_destroy(gem_obj, obj->sg_table); + if (obj->phys_obj) i915_gem_detach_phys_object(dev, obj); diff --git a/drivers/gpu/drm/i915/i915_gem_dmabuf.c b/drivers/gpu/drm/i915/i915_gem_dmabuf.c new file mode 100644 index 0000000..6ee677d --- /dev/null +++ b/drivers/gpu/drm/i915/i915_gem_dmabuf.c @@ -0,0 +1,149 @@ +/* + * Copyright 2012 Red Hat Inc + * + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the + * Software is furnished to do so, subject to the following conditions: + * + * The above copyright notice and this permission notice (including the next + * paragraph) shall be included in all copies or substantial portions of the + * Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. + * + * Authors: + * Dave Airlie <airlied(a)redhat.com> + */ +#include "drmP.h" +#include "i915_drv.h" +#include <linux/dma-buf.h> + +struct sg_table *i915_gem_map_dma_buf(struct dma_buf_attachment *attachment, + enum dma_data_direction dir) +{ + struct drm_i915_gem_object *obj = attachment->dmabuf->priv; + struct drm_device *dev = obj->base.dev; + int npages = obj->base.size / PAGE_SIZE; + struct sg_table *sg = NULL; + int ret; + int nents; + + ret = i915_mutex_lock_interruptible(dev); + if (ret) + return NULL; + + if (!obj->pages) { + ret = i915_gem_object_get_pages_gtt(obj, __GFP_NORETRY | __GFP_NOWARN); + if (ret) + goto out; + } + + /* link the pages into an SG then map the sg */ + sg = drm_prime_pages_to_sg(obj->pages, npages); + nents = dma_map_sg(attachment->dev, sg->sgl, sg->nents, dir); +out: + mutex_unlock(&dev->struct_mutex); + return sg; +} + +void i915_gem_unmap_dma_buf(struct dma_buf_attachment *attachment, + struct sg_table *sg, enum dma_data_direction dir) +{ + dma_unmap_sg(attachment->dev, sg->sgl, sg->nents, dir); + sg_free_table(sg); + kfree(sg); +} + +void i915_gem_dmabuf_release(struct dma_buf *dma_buf) +{ + struct drm_i915_gem_object *obj = dma_buf->priv; + + if (obj->base.export_dma_buf == dma_buf) { + /* drop the reference on the export fd holds */ + obj->base.export_dma_buf = NULL; + drm_gem_object_unreference_unlocked(&obj->base); + } +} + +struct dma_buf_ops i915_dmabuf_ops = { + .map_dma_buf = i915_gem_map_dma_buf, + .unmap_dma_buf = i915_gem_unmap_dma_buf, + .release = i915_gem_dmabuf_release, +}; + +struct dma_buf *i915_gem_prime_export(struct drm_device *dev, + struct drm_gem_object *gem_obj, int flags) +{ + struct drm_i915_gem_object *obj = to_intel_bo(gem_obj); + + return dma_buf_export(obj, &i915_dmabuf_ops, + obj->base.size, 0600); +} + +struct drm_gem_object *i915_gem_prime_import(struct drm_device *dev, + struct dma_buf *dma_buf) +{ + struct dma_buf_attachment *attach; + struct sg_table *sg; + struct drm_i915_gem_object *obj; + int npages; + int size; + int ret; + + /* is this one of own objects? */ + if (dma_buf->ops == &i915_dmabuf_ops) { + obj = dma_buf->priv; + /* is it from our device? */ + if (obj->base.dev == dev) { + drm_gem_object_reference(&obj->base); + return &obj->base; + } + } + + /* need to attach */ + attach = dma_buf_attach(dma_buf, dev->dev); + if (IS_ERR(attach)) + return ERR_PTR(-EINVAL); + + sg = dma_buf_map_attachment(attach, DMA_BIDIRECTIONAL); + if (IS_ERR(sg)) { + ret = PTR_ERR(sg); + goto fail_detach; + } + + size = dma_buf->size; + npages = size / PAGE_SIZE; + + obj = kzalloc(sizeof(*obj), GFP_KERNEL); + if (obj == NULL) { + ret = -ENOMEM; + goto fail_unmap; + } + + ret = drm_gem_private_object_init(dev, &obj->base, size); + if (ret) { + ret = -ENOMEM; + kfree(obj); + goto fail_unmap; + } + + obj->sg_table = sg; + obj->base.import_attach = attach; + + return &obj->base; + +fail_unmap: + dma_buf_unmap_attachment(attach, sg, DMA_BIDIRECTIONAL); +fail_detach: + dma_buf_detach(dma_buf, attach); + return ERR_PTR(ret); +} diff --git a/drivers/gpu/drm/i915/i915_gem_gtt.c b/drivers/gpu/drm/i915/i915_gem_gtt.c index 29d573c..5d86c65 100644 --- a/drivers/gpu/drm/i915/i915_gem_gtt.c +++ b/drivers/gpu/drm/i915/i915_gem_gtt.c @@ -267,7 +267,13 @@ void i915_ppgtt_bind_object(struct i915_hw_ppgtt *ppgtt, BUG(); } - if (dev_priv->mm.gtt->needs_dmar) { + if (obj->sg_table) { + i915_ppgtt_insert_sg_entries(ppgtt, + obj->sg_table->sgl, + obj->sg_table->nents, + obj->gtt_space->start >> PAGE_SHIFT, + pte_flags); + } else if (obj->sg_list) { BUG_ON(!obj->sg_list); i915_ppgtt_insert_sg_entries(ppgtt, @@ -371,7 +377,12 @@ void i915_gem_gtt_bind_object(struct drm_i915_gem_object *obj, struct drm_i915_private *dev_priv = dev->dev_private; unsigned int agp_type = cache_level_to_agp_type(dev, cache_level); - if (dev_priv->mm.gtt->needs_dmar) { + if (obj->sg_table) { + intel_gtt_insert_sg_entries(obj->sg_table->sgl, + obj->sg_table->nents, + obj->gtt_space->start >> PAGE_SHIFT, + agp_type); + } else if (dev_priv->mm.gtt->needs_dmar) { BUG_ON(!obj->sg_list); intel_gtt_insert_sg_entries(obj->sg_list, @@ -403,7 +414,7 @@ void i915_gem_gtt_finish_object(struct drm_i915_gem_object *obj) interruptible = do_idling(dev_priv); - if (obj->sg_list) { + if (dev_priv->mm.gtt->needs_dmar) { intel_gtt_unmap_memory(obj->sg_list, obj->num_sg); obj->sg_list = NULL; } -- 1.7.10 [View Less]

2 2

[Bug 49418] [RV730] Screen is Scrambled When Booting in EFI Mode
by bugzilla-daemon＠freedesktop.org 10 May '12

10 May '12

https://bugs.freedesktop.org/show_bug.cgi?id=49418 --- Comment #4 from Bastien Dejean <nihilhill(a)gmail.com> 2012-05-10 03:59:24 PDT --- I can provide further debug information if needed. -- 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

In Diablo III when the ground is covered in water, it's all messed-up.
by Mike Mestnik 10 May '12

10 May '12

I found a rendering error in Diablo III, in a well there ground is covered in water and it's all red and flickers. http://c566453.r53.cf2.rackcdn.com/DiabloIII-well-wine-preloader.trace.xz 3.5G, 234665296 Bytes compressed ~234M. EE r600_shader.c:1605 r600_shader_from_tgsi - GPR limit exceeded - shader requires 181 registers EE r600_shader.c:140 r600_pipe_shader_create - translation from TGSI failed ! Rendered 621 frames in 80.724 secs, average of 7.69288 fps

2 1

[Bug 43858] New: DVI of ATI RADEON 9200 AGP don't work
by bugzilla-daemon＠freedesktop.org 09 May '12

09 May '12

https://bugs.freedesktop.org/show_bug.cgi?id=43858 Bug #: 43858 Summary: DVI of ATI RADEON 9200 AGP don't work Classification: Unclassified Product: DRI Version: unspecified Platform: x86 (IA32) OS/Version: Linux (All) Status: NEW Severity: normal Priority: medium Component: DRM/Radeon AssignedTo: dri-devel(a)lists.freedesktop.org ReportedBy: valter.giovannetti(a)alice.… [View More]

1 29

Include request for SA improvements
by Christian König 09 May '12

09 May '12

Hi Dave & Jerome and everybody on the list, I can't find any more bugs and also I'm out of things to test, so I really hope that this is the last incarnation of this patchset, and if Jerome is ok with it it should now be included into drm-next. Cheers, Christian.

3 21

← Newer
1
...
64
65
66
67
68
69
70
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

dri-devel May 2012