[Intel-gfx] [PATCH 3/3] drm: kill agp indirection mess

2010-04-14 Thread Daniel Vetter
There's no point in jumping through two indirections. So kill one and call the kernels agp functions directly. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/drm_agpsupport.c | 40 +++-- drivers/gpu/drm/drm_memory.c | 12

[Intel-gfx] [PATCH 1/3] drm: kill drm_agp_chipset_flush

2010-04-14 Thread Daniel Vetter
for this is a rather gross amount of fragile code duplication between these two parts of the kernel intel graphics driver. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/drm_agpsupport.c |7 --- drivers/gpu/drm/i915/i915_gem.c |8 include/drm/drmP.h

[Intel-gfx] [PATCH] drm/i915: fix tiling limits for i915 class hw

2010-04-15 Thread Daniel Vetter
was not affected because the ddx does some additional checks there ensure the buffer is within hw-limits. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27449 Tested-by: Alexander Lam lambchop...@gmail.com Cc: sta...@kernel.org --- drivers/gpu

[Intel-gfx] [PATCH] drm/i915: fix tiling limits for i915 class hw v2

2010-04-17 Thread Daniel Vetter
some WARN_ONs in i915_write_fence_reg like I've done for the i830 case (using the right limits). Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=27449 Tested-by: Alexander Lam lambchop...@gmail.com Cc: sta...@kernel.org --- drivers/gpu/drm

[Intel-gfx] [PATCH] strange args for intel_calculate_wm in pineview function

2010-04-17 Thread Daniel Vetter
Hi Jesse, This is something I've stumbled upon while crawling through code. Passing a fifo line size instead of a latency is surely not what's ment to happen. Can you please take a look? I think the below patch makes somewhat sense. Yours, Daniel --- drivers/gpu/drm/i915/intel_display.c |4

[Intel-gfx] [PATCH 2/2] agp/intel: make intel-gtt.c into a real source file

2010-04-22 Thread Daniel Vetter
-agp.o - drivers/char/agp/intel-agp.o dependency dropped. Instead of renaming intel-agp.c I've simply created a new module out of intel-gtt.c. Renaming intel-agp.ko to something else is not an option for it will surely kill someones boot process. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch

[Intel-gfx] [PATCH] libdrm changes to allow exact fence usage accounting

2010-04-22 Thread Daniel Vetter
of ten :( Yours, Daniel Daniel Vetter (1): i830 uxa: track fence reg usage exactly src/i830.h | 13 ++- src/i830_batchbuffer.c |2 + src/i830_driver.c | 32 src/i830_render.c | 12 +++--- src/i830_uxa.c | 95

[Intel-gfx] [PATCH] intel: allow fence register tracking to be disable

2010-04-22 Thread Daniel Vetter
libdrm just doesn't know enough to do this precisely. Therefore allow this to be disabled and put the burden on the client where enough information is available. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- intel/intel_bufmgr.h |1 + intel/intel_bufmgr_gem.c | 25

[Intel-gfx] [PATCH] drm/i915: adjust fence registers asynchronously on tiling changes v2

2010-04-22 Thread Daniel Vetter
in put_fence. No functional change because put_fence checks whether there is actually a fence allocated, so the put_fence in adjust_fencing won't harm. But IMHO the code makes slightly more sense this way around. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_drv.h

[Intel-gfx] [PATCH] drm/i915: report all active objects as busy v2

2010-04-23 Thread Daniel Vetter
. Spotted by Chris Wilson. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_gem.c | 30 +- 1 files changed, 21 insertions(+), 9 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_gem.c b/drivers/gpu/drm/i915/i915_gem.c index 023f4db

[Intel-gfx] [PATCH] drm/i915: don't allow tiling changes on pinned buffers v2

2010-04-23 Thread Daniel Vetter
Makes no sense and complicates matters for pipelined tiling changes. So don't allow it and return -EBUSY. v2: Fix reference leak. Thanks to Owain Ainsworth for spotting this. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_gem_tiling.c |5 + 1 files

[Intel-gfx] [PATCH 0/2] put intel gem buffer objects on diet

2010-04-28 Thread Daniel Vetter
and merge for -next. Applies on top of my avoid-bo-reuse-related-stalls series (because that introduced yet another wasteful 32bit wide boolean). Thanks, Daniel Daniel Vetter (2): drm/i915: move fence lru to struct drm_i915_fence_reg drm/i915: combine all small integers into one single bitfield

[Intel-gfx] [PATCH 2/2] drm/i915: combine all small integers into one single bitfield

2010-04-28 Thread Daniel Vetter
This saves a whooping 8 dwords. Zero functional changes. Because some of the refcounts are rather tightly calculated, I've put BUG_ONs in the code to check for overflows. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_drv.h | 87

[Intel-gfx] [PATCH 0/4] gtt cache coherency checker for i830 class hw

2010-05-09 Thread Daniel Vetter
drm-intel-next, too. Yours, Daniel Daniel Vetter (4): agp/intel-gtt: steal the last gtt page drm/i915: add locking around chipset flush agp/intel-gtt: check cache-coherency on i830 class chipsets agp/intel-gtt: extract mch buffer flush in i830 chipset flush drivers/char/agp/intel-gtt.c

[Intel-gfx] [PATCH 1/4] agp/intel-gtt: steal the last gtt page

2010-05-09 Thread Daniel Vetter
it only contains this single define. But I've already noticed quite some code duplication between the intel-agp and the i915 drm module. The idea is that this new header file can be used to share some code between these two modules. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char

[Intel-gfx] [PATCH 2/4] drm/i915: add locking around chipset flush

2010-05-09 Thread Daniel Vetter
My cache coherency checker for i8xx chipsets will make cache flushes stateful. Therefore add some locking around the only caller that had none. This is not a fast-path, anyway, so it won't hurt for the other chipsets. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915

[Intel-gfx] [PATCH 4/4] agp/intel-gtt: extract mch buffer flush in i830 chipset flush

2010-05-09 Thread Daniel Vetter
Just a small clean up. The real fix will add tons of code here, so it's nice to shrink the function a tad bit, first. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 24 1 files changed, 16 insertions(+), 8 deletions(-) diff

[Intel-gfx] [PATCH] put intel gem buffer objects on diet (resend)

2010-05-13 Thread Daniel Vetter
. Please (re-)apply to -next. Thanks, Daniel Daniel Vetter (1): drm/i915: combine all small integers into one single bitfield drivers/gpu/drm/i915/i915_drv.h | 75 +- drivers/gpu/drm/i915/i915_gem.c |5 +++ 2 files changed, 54 insertions(+), 26 deletions

Re: [Intel-gfx] [PATCH 1/4] introduce intel_ring_buffer structure

2010-05-14 Thread Daniel Vetter
Yours, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 1/4] introduce intel_ring_buffer structure

2010-05-14 Thread Daniel Vetter
Hi all, On Fri, May 14, 2010 at 11:51:14AM +0200, Daniel Vetter wrote: So please explain the technical reasons we need this rather complex beast of code in the kernel? Ok, I owe you my apologies (and a beer). I've read through the HD docs and it looks like bsd decoding for avc/vc1 can't

Re: [Intel-gfx] [PATCH] [RFC] drm/i915: Restore LRU evict order, with a twist!

2010-05-16 Thread Daniel Vetter
. batchbuffers of suspended clients). -Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 1/4] introduce intel_ring_buffer structure

2010-05-17 Thread Daniel Vetter
. And if you try to, your users will get the pitchforks and scream bloody murder trying to get you ;) So we need to get these patches right (at least the semantics of the interface) beforehand. Thanks Zou Nan hai Yours, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48

Re: [Intel-gfx] [PATCH] enable multiple ring buffer

2010-05-17 Thread Daniel Vetter
at a review that the code as-is too confusing to review. So I'm not gonna make myself a laughing stock by trying again - on a quick lock it seems essentially unchanged. Yours, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel

[Intel-gfx] [PATCH 1/9] list.h: add list_for_each_entry_safe_from_reverse

2010-05-18 Thread Daniel Vetter
i915 needs this. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- include/linux/list.h | 15 +++ 1 files changed, 15 insertions(+), 0 deletions(-) diff --git a/include/linux/list.h b/include/linux/list.h index 8392884..21cdd99 100644 --- a/include/linux/list.h +++ b/include

[Intel-gfx] [PATCH 2/9] drm: use list_for_each_entry in drm_mm.c

2010-05-18 Thread Daniel Vetter
Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/drm_mm.c |8 ++-- 1 files changed, 2 insertions(+), 6 deletions(-) diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index 2ac074c..b75eb55 100644 --- a/drivers/gpu/drm/drm_mm.c +++ b/drivers/gpu/drm

[Intel-gfx] [PATCH 3/9] drm: kill drm_mm_node-private

2010-05-18 Thread Daniel Vetter
Only ever assigned, never used. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_gem.c |4 +--- drivers/gpu/drm/ttm/ttm_bo.c |6 -- drivers/gpu/drm/ttm/ttm_bo_util.c |2 -- include/drm/drm_mm.h |1 - 4 files changed, 1

[Intel-gfx] [PATCH 4/9] drm: kill dead code in drm_mm.c

2010-05-18 Thread Daniel Vetter
Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/drm_mm.c | 45 - 1 files changed, 0 insertions(+), 45 deletions(-) diff --git a/drivers/gpu/drm/drm_mm.c b/drivers/gpu/drm/drm_mm.c index b75eb55..a5a7a16 100644 --- a/drivers

[Intel-gfx] [PATCH 6/9] drm_mm: extract check_free_mm_node

2010-05-18 Thread Daniel Vetter
There are already two copies of this logic. And the new scanning stuff will add some more. So extract it into a small helper function. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/drm_mm.c | 71 ++ 1 files changed, 34

[Intel-gfx] [PATCH 5/9] drm: sane naming for drm_mm.c

2010-05-18 Thread Daniel Vetter
Yeah, I've kinda noticed that fl_entry is the free stack. Still give it (and the memory node list ml_entry) decent names. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/drm_mm.c | 72 ++--- include/drm/drm_mm.h | 11

[Intel-gfx] [PATCH 8/9] drm/i915: prepare for fair lru eviction

2010-05-18 Thread Daniel Vetter
object, so move the unbind call into the helper function that scans for the object to be evicted, too. And adjust its name. No functional changes in this patch, just preparation. Signed-Off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_gem.c | 65

[Intel-gfx] [PATCH 7/9] drm: implement helper functions for scanning lru list

2010-05-18 Thread Daniel Vetter
approach by i915 (scan the lru for a object large enough to contain the new object). It's also more efficient than the current approach used by ttm (uncoditionally evict objects from the lru until there's enough free space). Signed-Off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm

[Intel-gfx] [PATCH 9/9] drm/i915: implement fair lru eviction

2010-05-18 Thread Daniel Vetter
Besides that this should leader to better gtt usage (by not favouring small objects) this also fixes the eviction-ping-pong-of-doom. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_gem.c | 79 +- 1 files changed, 52

Re: [Intel-gfx] [PATCH 3/9] drm: kill drm_mm_node-private

2010-05-19 Thread Daniel Vetter
On Wed, May 19, 2010 at 11:25:07AM +0200, Jerome Glisse wrote: On Tue, May 18, 2010 at 11:11:45PM +0200, Daniel Vetter wrote: Only ever assigned, never used. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch NAK private was to be use when doing range restricted allocation somehow

Re: [Intel-gfx] [PATCH 0/3] implement multiple ring buffer V1

2010-05-19 Thread Daniel Vetter
send-email --to 'b...@bla.com' --cc 'f...@bar.com' *.patch [--dry-run] sends them away. Use --dry-run to check first that git does the right thing with your patches. Yours, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48

Re: [Intel-gfx] [PATCH 0/9] [RFC] fair-lru eviction

2010-05-19 Thread Daniel Vetter
eviction stuff. /Thomas Thanks, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 0/3] implement multiple ring buffer V1

2010-05-20 Thread Daniel Vetter
that and doing regression and duration tests over the patch. I will sent out V2 tomorrow. Ok, I'll wait till v2 arrives on intel-gfx with reviewing your patches. Thanks Zou Nan hai Cheers, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48

Re: [Intel-gfx] [PATCH] drm/i915: use wake_up instead of drm wrapper.

2010-05-28 Thread Daniel Vetter
: #define DRM_WAKEUP( queue ) wake_up( queue ) It's been like that since I've originally wrote the uninterruptible sleep stuff for the intel overlay code (I've checked way back then to make sure it doesn't hang). Care to explain how this fixes a regression? Cheers, Daniel -- Daniel Vetter Mail: dan

Re: [Intel-gfx] [PATCH 2/2] drm/i915: Fix up address spaces in slow_kernel_write()

2010-05-28 Thread Daniel Vetter
help in (someday) fixing up the racy pwrite/pread locking. So for both patches: Reviewed-by: Daniel Vetter daniel.vet...@ffwll.ch -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx

Re: [Intel-gfx] [intel-gfx][PATCH] intel: add a new interface drm_intel_bo_alloc_direct

2010-05-28 Thread Daniel Vetter
is what I have here for my ilk machine. Dunno whether that 23 for the number of reference framse is correct, but it's certainly an upper bound. Yours, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch M bile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel

Re: [Intel-gfx] [intel-gfx][PATCH] intel: add a new interface drm_intel_bo_alloc_direct

2010-06-01 Thread Daniel Vetter
On Tue, Jun 01, 2010 at 05:17:45PM +0800, Xiang, Haihao wrote: On Fri, 2010-05-28 at 22:04 +0800, Daniel Vetter wrote: On Tue, May 25, 2010 at 01:06:50PM +0800, Xiang, Haihao wrote: This interface is the same as drm_intel_bo_alloc except the allocated size isn't rounded up, so it bypasses

Re: [Intel-gfx] [PATCH] drm/i915: Repeat unbinding during free if interrupted (v3)

2010-07-23 Thread Daniel Vetter
enabled https://bugzilla.kernel.org/show_bug.cgi?id=15664 v2: Daniel Vetter reminded me that kernel space programming is never easy. We cannot simply spin to clear the pending signal and so must deferred the freeing of the object until later. v3: Run from the top level retire requests. Signed

Re: [Intel-gfx] [PATCH] drm/i915: report all active objects as busy

2010-08-04 Thread Daniel Vetter
On Wed, Aug 04, 2010 at 08:57:26PM +0200, Daniel Vetter wrote: On Wed, Aug 04, 2010 at 03:36:30PM +0100, Chris Wilson wrote: Incorporates a similar patch by Daniel Vetter, the alteration being to report the current busy state after retiring. Woot, nice idea to exactly preserve the semantics

[Intel-gfx] [PATCH 1/2] drm/i915: fixup pageflip ringbuffer commands for i8xx

2010-08-04 Thread Daniel Vetter
Add a new path for 2nd gen chips that uses the commands for i81x chips (where public docs do exist) augmented with the plane bits from i915. It seems to work and doesn't result in a black screen like before. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch Cc: sta...@kernel.org --- drivers

Re: [Intel-gfx] [PATCH] drm/i915: Capture the overlay status upon a GPU hang.

2010-08-04 Thread Daniel Vetter
On Wed, Aug 04, 2010 at 08:26:07PM +0100, Chris Wilson wrote: v2: Add the interrupt status and address. Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk Cc: Daniel Vetter daniel.vet...@ffwll.ch Reviewed-by: Daniel Vetter daniel.vet...@ffwll.ch -- Daniel Vetter Mail: dan...@ffwll.ch

Re: [Intel-gfx] [PATCH 4/5] drm/i915: Implement fair lru eviction across both rings.

2010-08-04 Thread Daniel Vetter
available. -Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH 2/2] drm/i915: i8xx also does not like multiple oustanding pageflips

2010-08-04 Thread Daniel Vetter
of the things on my idea for drm/i915 projects: To unify the overlay/display plane pageflip support code. -Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http

Re: [Intel-gfx] [PATCH] drm/i915: Implement fair lru eviction across both rings. (v2)

2010-08-06 Thread Daniel Vetter
/loop https://bugs.freedesktop.org/show_bug.cgi?id=28478 v2: Attempt to clarify the logic and order of eviction through the use of comments and macros. Signed-off-by: Chris Wilson ch...@chris-wilson.co.uk Cc: Daniel Vetter dan...@ffwll.ch One small nitpick below. int

Re: [Intel-gfx] [PATCH 06/20] drm/i915: Maintain LRU order of inactive objects upon access by CPU

2010-08-07 Thread Daniel Vetter
. Think frontbuffer rendering - that's at least how I've tracked it down. -Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo

Re: [Intel-gfx] [PATCH] drm/i915: Fix offset page-flips on i965+

2010-08-08 Thread Daniel Vetter
and tiling_mode. Whatever, current code seems to work. -Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [PATCH] drm/i915: Fix offset page-flips on i965+

2010-08-08 Thread Daniel Vetter
On Sun, Aug 08, 2010 at 02:24:11PM +0200, Daniel Vetter wrote: In conclusion I think we need an if (IS_SNB(dev)) that sets dword 0, bit 22 to 1 and ensures that dword 2, bit 0 is zero. For the rest of of the IS_I965G branch we might as well write 0 instead of pitch and tiling_mode. I've played

[Intel-gfx] [PATCH] drm/i915: overlay on gen2 can't address above 1G

2010-08-30 Thread Daniel Vetter
) supported. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=28318 Cc: sta...@kernel.org Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_dma.c |4 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_dma.c b/drivers/gpu

[Intel-gfx] [PATCH 00/23] intel gtt rework, part 1: initialization

2010-09-01 Thread Daniel Vetter
separate out the non-gem ums driver and get rid of the fake agp driver for kms completely somewhen later. Comments, flames, ideas highly welcome. Yours, Daniel daniel Vetter (23): agp/intel: split out gmch/gtt probe, part 2 agp/intel: make intel-gtt.c into a real source file intel-gtt

[Intel-gfx] [PATCH 01/23] agp/intel: split out gmch/gtt probe, part 2

2010-09-01 Thread Daniel Vetter
kill 2 out of the three Ironlake mobile entries that only differed in host bridge pci id. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-agp.c | 187 + drivers/char/agp/intel-gtt.c | 116 ++ 2 files

[Intel-gfx] [PATCH 03/23] intel-gtt: introduce drm/intel-gtt.h

2010-09-01 Thread Daniel Vetter
Add a few definitions to it that are already shared and that will be shared in the future (like the number of stolen entries). No functional changes in here. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c| 42

[Intel-gfx] [PATCH 04/23] intel-gtt: store a local pointer to the bridge pci dev

2010-09-01 Thread Daniel Vetter
When the intel-gtt code now longer depends on agp, we cannot rely on this. So store a local reference in intel-gtt.c. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 69 +++--- 1 files changed, 38 insertions(+), 31

[Intel-gfx] [PATCH 06/23] intel-gtt: new function intel_gtt_mappable_entries

2010-09-01 Thread Daniel Vetter
, this will grow until it contains the complete init sequence starting from the call to gtt_mappable_entries. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 83 -- 1 files changed, 64 insertions(+), 19 deletions(-) diff --git

[Intel-gfx] [PATCH 05/23] intel-gtt: s/intel_i830_init_gtt_entries/intel_gtt_stolen_entries

2010-09-01 Thread Daniel Vetter
First simple step towards a more generic initialization. This is needed to disentangle the agp stuff from the stuff that is actually needed by drm/i915. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 12 ++-- 1 files changed, 6 insertions(+), 6

[Intel-gfx] [PATCH 08/23] intel-gtt: sane variable names for intel_gtt_stolen_entries

2010-09-01 Thread Daniel Vetter
This somewhat aligns it with the version in drm/i915/i915_dma.c. Changes: - s/gtt_entries/stolen_size - track overhead entries in a separate var (the effective gtt size calculation will be extracted later on). - subtract the overhead at the end instead of in each clause. Signed-off-by: Daniel

[Intel-gfx] [PATCH 07/23] intel-gtt: generic intel_fake_agp_fetch_size

2010-09-01 Thread Daniel Vetter
This uses the new mappable gtt size detection from the previous patch. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 77 +- 1 files changed, 24 insertions(+), 53 deletions(-) diff --git a/drivers/char/agp/intel

[Intel-gfx] [PATCH 09/23] intel-gtt: drop unnecessary conditions in intel_gtt_stolen_entries

2010-09-01 Thread Daniel Vetter
The detection function in drm/i915/i915_dma.c works without it, so drop it here, too. All the values are distinct, anyway. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 42 -- 1 files changed, 8 insertions(+), 34

[Intel-gfx] [PATCH 10/23] intel-gtt: adjust overhead entries in intel_gtt_stolen_entries

2010-09-01 Thread Daniel Vetter
in intel_gtt_total_size for later use. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 136 ++ 1 files changed, 72 insertions(+), 64 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 08428d5

[Intel-gfx] [PATCH 13/23] intel-gtt: introduce intel_gtt_driver

2010-09-01 Thread Daniel Vetter
Same idea as INTEL_INFO from drm/i915. This - reduces the dependancy on agp_driver - stops the what-does-IS_I965G-mean confusion (here it's just gen4, in drm/i915 it's gen =4) - further prepares the separation of the fake agp driver from the rest. Signed-off-by: Daniel Vetter daniel.vet

[Intel-gfx] [PATCH 14/23] intel-gtt: i915: use detected gtt size for mapping

2010-09-01 Thread Daniel Vetter
Slight reordering of the init sequence required. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 58 ++--- 1 files changed, 9 insertions(+), 49 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp

[Intel-gfx] [PATCH 16/23] intel-gtt: i830: adjust ioremap of regs and gtt to i9xx

2010-09-01 Thread Daniel Vetter
This way around this can be extracted into common code. Also use a common cleanup function (and give it a generic name). Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 41 +++-- 1 files changed, 23 insertions(+), 18

[Intel-gfx] [PATCH 15/23] intel-gtt: i965: use detected gtt size for mapping

2010-09-01 Thread Daniel Vetter
Also move the Sandybdridge size detection into gtt_total_entries, like the rest. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 75 +++--- 1 files changed, 34 insertions(+), 41 deletions(-) diff --git a/drivers/char

[Intel-gfx] [PATCH 17/23] intel-gtt: consolidate the gtt ioremap calls

2010-09-01 Thread Daniel Vetter
Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 70 +++-- 1 files changed, 26 insertions(+), 44 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index f4308d3..0ebb76a 100644

[Intel-gfx] [PATCH 18/23] intel-gtt: consolidate i830 setup

2010-09-01 Thread Daniel Vetter
Slightly reordered sequence was necessary. Also don't set agp_bridge-gatt_bus_addr anymore. Only used by generic agp helper functions, hence unnecessary for the intel fake agp driver. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 83

[Intel-gfx] [PATCH 20/23] intel-gtt: call init_gtt_init in probe function

2010-09-01 Thread Daniel Vetter
by the generic agp code. - filling the whole gtt with scratch_page ptes is not yet consolidated - this needs abstracted pte handling, first. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 60 ++--- 1 files changed, 15

[Intel-gfx] [PATCH 19/23] intel-gtt: consolidate i9xx setup

2010-09-01 Thread Daniel Vetter
The only difference between i915 and i965 was the calculation of the gtt address. So merge these two paths into one. Otherwise the same changes as in the i830 setup consolidation. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 154

[Intel-gfx] [PATCH 23/23] drm/i915: die, i915_probe_agp, die

2010-09-01 Thread Daniel Vetter
Use the detection from intel-gtt.ko instead. Hooray! Also move the stolen mem allocator to the other gtt stuff in dev_priv-mem. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c|6 ++ drivers/gpu/drm/i915/i915_dma.c | 187

[Intel-gfx] [PATCH 21/23] intel-gtt: use chipset generation number some more

2010-09-01 Thread Daniel Vetter
Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 13 +++-- 1 files changed, 3 insertions(+), 10 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 6e93f95..2aca66c 100644 --- a/drivers/char/agp/intel-gtt.c

Re: [Intel-gfx] [intel-gfx][PATCH 2/2] drm/i915: Add a new ring buffer on Sandybridge

2010-09-02 Thread Daniel Vetter
and definitely conflict against newer stuff. Yours, Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

Re: [Intel-gfx] [intel-gfx][PATCH 2/2] drm/i915: Add a new ring buffer on Sandybridge

2010-09-02 Thread Daniel Vetter
looked like - it didn't seem worth the effort for just 2 ringbuffers, but with 5 rings it's a different story. And there was enough other stuff going on, so that's why I haven't seen them through and pushed this. But I think you get the idea. -Daniel -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41

Re: [Intel-gfx] [git pull] i915

2010-09-07 Thread Daniel Vetter
://cgit.freedesktop.org/~danvet/drm/ -- Daniel Vetter Mail: dan...@ffwll.ch Mobile: +41 (0)79 365 57 48 ___ Intel-gfx mailing list Intel-gfx@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/intel-gfx

[Intel-gfx] [PATCH 00/17] gtt rework, part2 : pte handling

2010-09-13 Thread Daniel Vetter
on a hopefully well-tested basis. As usual, tested on i855 (with -fixes merged in), i945 and my ilk. Comments highly welcome. Altough I refuse to accept responsability for headaches from reading the (old) code in intel-gtt.c ;) Yours, Daniel Daniel Vetter (17): intel-gtt: initialize our own scratch page

[Intel-gfx] [PATCH 01/17] intel-gtt: initialize our own scratch page

2010-09-13 Thread Daniel Vetter
and teardown. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 81 +- 1 files changed, 64 insertions(+), 17 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 9cb7c98..af920b5

[Intel-gfx] [PATCH 02/17] intel-gtt: introduce pte write function for i8xx/i915/i945

2010-09-13 Thread Daniel Vetter
And put it to use in the gtt configuration code that writes the scratch page addr in all gtt ptes. This makes intel_i830_configure generic, hence rename it to intel_fake_agp_configure. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 41

[Intel-gfx] [PATCH 03/17] intel-gtt: introduce pte write function for g33/i965/gm45

2010-09-13 Thread Daniel Vetter
Like for the i830. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 17 +++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 59fad22..89dcc0b 100644

[Intel-gfx] [PATCH 08/17] intel-gtt: generic (insert|remove)_entries for i915

2010-09-13 Thread Daniel Vetter
Beef up the generic version to support dmar. Otherwise like for the i830. v2: Don't try to DMA remap on resume for already remapped pages. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 60 ++--- 1 files changed, 49

[Intel-gfx] [PATCH 10/17] intel-gtt: generic (insert|remove)_entries for sandybridge

2010-09-13 Thread Daniel Vetter
Like before, but now with the added bonus of being able to kill quite a bit of no-longer useful code (the old dmar support stuff). Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 144 +++--- 1 files changed, 8 insertions

[Intel-gfx] [PATCH 09/17] intel-gtt: generic (insert|remove)_entries for g33/i965

2010-09-13 Thread Daniel Vetter
Like for the i915. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 21 + 1 files changed, 9 insertions(+), 12 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 8273b2b..225b791 100644

[Intel-gfx] [PATCH 11/17] intel-gtt: kill mask_memory functions

2010-09-13 Thread Daniel Vetter
That indirection mess can now go. Add a dummy i81x gtt_driver to avoid a NULL pointer check. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 105 + 1 files changed, 13 insertions(+), 92 deletions(-) diff --git

[Intel-gfx] [PATCH 12/17] intel-gtt: move chipset flush to the gtt driver struct

2010-09-13 Thread Daniel Vetter
This is the last differentiator between the different fake agp drivers. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 28 +--- 1 files changed, 21 insertions(+), 7 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers

[Intel-gfx] [PATCH 14/17] agp: kill agp_(unmap|map)_memory

2010-09-13 Thread Daniel Vetter
DMA remapping was only used by the intel-gtt driver. With that code now folded into the driver, kill the agp generic support for it. Cc: Dave Airlie airl...@linux.ie Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/agp.h |3 --- drivers/char/agp/generic.c |8

[Intel-gfx] [PATCH 17/17] intel-gtt add a cleanup function for chipset specific stuff

2010-09-13 Thread Daniel Vetter
The old code didn't clean up the i830 chipset flush page. And it looks nicer. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 39 +++ 1 files changed, 31 insertions(+), 8 deletions(-) diff --git a/drivers/char/agp

[Intel-gfx] [PATCH 0/5] CFT: full gtt support

2010-09-24 Thread Daniel Vetter
the free room in there was intended for ppggt usage). This results in a 2GB aperture on my ilk, which not even virtual forbidden city can fill ;). This only works on gen5 hw (as Chris Wilson found out the hard way). Review, comments and test-reports highly welcome. Yours, Daniel Daniel Vetter (6

[Intel-gfx] [PATCH 1/6] drm/i915: range-restricted eviction support

2010-09-24 Thread Daniel Vetter
Add a mappable parameter to i915_gem_evict_something to distinguish the two cases (non-restricted vs. mappable gtt allocations). No functional changes because the mappable limit is set to the end of the gtt currently. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915

[Intel-gfx] [PATCH 2/6] drm/i915: range-restricted bind_to_gtt

2010-09-24 Thread Daniel Vetter
of the gtt. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_drv.h |3 +- drivers/gpu/drm/i915/i915_gem.c | 58 +- drivers/gpu/drm/i915/intel_display.c|6 ++-- drivers/gpu/drm/i915/intel_overlay.c|4

[Intel-gfx] [PATCH 3/6] drm/i915: unbind unmappable objects on fault/pin

2010-09-24 Thread Daniel Vetter
In i915_gem_object_pin obviously unbind only if mappable is true. This is the last part to enable gtt_mappable_end != gtt_size, which the next patch will do. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_gem.c | 24 ++-- 1 files changed

[Intel-gfx] [PATCH 5/6] intel-gtt: save PGETBL_CTL later in the setup process

2010-09-24 Thread Daniel Vetter
) needs to be restored on resume. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 14 +++--- 1 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 9a03815..6e7cd58 100644

[Intel-gfx] [PATCH 6/6] intel-gtt: maximize ggtt size on platforms that support this

2010-09-24 Thread Daniel Vetter
the complete area for the GGTT. Unfortunately the graphics core on G33/Pineview can't cope with really large GTTs and the BIOS usually enables the maximum of 512MB. So don't bother with maximizing the GTT on these platforms. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char

[Intel-gfx] [PATCH 00/15] The no more agp series

2010-11-06 Thread Daniel Vetter
sequence. - Fix i855 cache coherency. All these gtt optimizations only made things worse :( As usual, comments, flames, highly welcome. Wrt merging I think it'd be easiest if this goes in via d-i-n completely. Yours, Daniel Daniel Vetter (15): intel-gtt: drop dcache support for i830 and later

[Intel-gfx] [PATCH 01/15] intel-gtt: drop dcache support for i830 and later

2010-11-06 Thread Daniel Vetter
i830_check_flags already disallows it, so no need to implement it in the write_entry function. Seems to be a remnant from i810 support. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c |8 +--- 1 files changed, 1 insertions(+), 7 deletions(-) diff

[Intel-gfx] [PATCH 02/15] intel-gtt: kill unneeded sandybridge memory types

2010-11-06 Thread Daniel Vetter
Used for the now dead agp type_to_mask stuff. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c |6 -- 1 files changed, 0 insertions(+), 6 deletions(-) diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 8122aca..b677713

[Intel-gfx] [PATCH 03/15] intel-gtt: switch i81x to the write_entry helpers

2010-11-06 Thread Daniel Vetter
Initialization is still done with the old code with a few added things sprinkled in to make the intel_fake_agp helper functions work. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 152 +- 1 files changed, 60

[Intel-gfx] [PATCH 04/15] intel-gtt: switch i81x to the common initialization helpers

2010-11-06 Thread Daniel Vetter
Still a separate agp_bridge_driver because of the i81x-only dedicated vram support. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c | 197 +++--- 1 files changed, 71 insertions(+), 126 deletions(-) diff --git a/drivers

[Intel-gfx] [PATCH 06/15] drm/i915|intel-gtt: consolidate intel-gtt.h headers

2010-11-06 Thread Daniel Vetter
... and a few other defines. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/intel-gtt.c|5 - drivers/gpu/drm/i915/i915_gem.c |1 - include/drm/intel-gtt.h | 12 include/linux/intel-gtt.h | 20 4 files

[Intel-gfx] [PATCH 08/15] drm: kill drm_agp_chipset_flush

2010-11-06 Thread Daniel Vetter
No longer used. Cc: Dave Airlie airl...@gmail.com Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/drm_agpsupport.c |6 -- include/drm/drmP.h |1 - 2 files changed, 0 insertions(+), 7 deletions(-) diff --git a/drivers/gpu/drm/drm_agpsupport.c b

[Intel-gfx] [PATCH 10/15] drm/i915: track objects in the gtt

2010-11-06 Thread Daniel Vetter
this wastes, anyway. Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/gpu/drm/i915/i915_drv.h |4 drivers/gpu/drm/i915/i915_gem.c |4 2 files changed, 8 insertions(+), 0 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h

[Intel-gfx] [PATCH 09/15] agp: kill agp_flush_chipset and corresponding ioctl

2010-11-06 Thread Daniel Vetter
The intel drm calls the chipset functions now directly. Userspace never called the corresponding ioctl, hence it can be killed, too. Cc: Dave Airlie airl...@gmail.com Signed-off-by: Daniel Vetter daniel.vet...@ffwll.ch --- drivers/char/agp/agp.h |1 - drivers/char/agp/compat_ioctl.c

  1   2   3   4   5   6   7   8   9   10   >