similar to: [PATCH 4/4] nouveau: clean up nouveau_mem_alloc function

From: Pekka Enberg <penberg at cs.helsinki.fi> This introduces memory type specific nouveau_addmap_{agp,fb,pci} functions as a preparatory step to cleaning up nouveau_mem_alloc(). Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi> --- shared-core/nouveau_mem.c | 50 ++++++++++++++++++++++++++++++++++------------ 1 file changed, 37 insertions(+), 13 deletions(-) Index:

From: Pekka Enberg <penberg at cs.helsinki.fi> This extracts the struct mem_block to struct drm_map_list entry mapping into a separate function. Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi> --- shared-core/nouveau_mem.c | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) Index: drm/shared-core/nouveau_mem.c

From: Pekka Enberg <penberg at cs.helsinki.fi> Move nouveau_map_block() call from nouveau_mem_alloc() to nouveau_addmap() to simplify error handling. Signed-off-by: Pekka Enberg <penberg at cs.helsinki.fi> --- shared-core/nouveau_mem.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) Index: drm/shared-core/nouveau_mem.c

Hi, Please find attached the patches which I currently use on my desktop machine for dual head with the randr branch to fix the issues which I found. They may help others as well but may e.g. also disable the Xv blitter which might be working for some (but didn't on my card) - more information is found in the text comments in the patches. I have to hurry so this is short, will be back.

- added lots of comments, discussed comments with ahuillet and refined comments - replaced two constants with MACROs - no changes to actual code diff --git a/src/nv_video.c b/src/nv_video.c index cf4f88d..d9ee700 100644 --- a/src/nv_video.c +++ b/src/nv_video.c @@ -25,6 +25,15 @@ #include "nv_include.h" #include "nv_dma.h" +/* +2046 is the maximum image size in one

Introduce accessors for TTM buffer object memory that has been mapped into the kernel virtual address space or as IO memory. IO memory needs to be accessed via special accessor functions, not by dereferencing the iomem cookie. The wrappers hide the details of 32-bit access and honour the TTM map type. nv04_crtc_cursor_set() is changed to use the new wrappers. 'cursor' is received from

Revised patch set v2. [PATCH 1/8] drm/nouveau: bo read/write wrappers for nv04_crtc.c [PATCH 2/8] drm/nouveau: use bo accessors for push buffers [PATCH 3/8] drm/nouveau: OUT_RINGp - optimize OUT_RING loops [PATCH 4/8] drm/nv50: proper notifier_bo access in nv50_display_vblank_crtc_handler() [PATCH 5/8] drm/nouveau: access fbcon notifier via bo accessors [PATCH 6/8] drm/nouveau: screen_base and

Signed-off-by: Francisco Jerez <currojerez at riseup.net> --- drivers/gpu/drm/nouveau/nouveau_drv.h | 23 +++++ drivers/gpu/drm/nouveau/nouveau_reg.h | 16 ++-- drivers/gpu/drm/nouveau/nouveau_state.c | 8 ++ drivers/gpu/drm/nouveau/nv10_fb.c | 32 ++++++-- drivers/gpu/drm/nouveau/nv10_graph.c | 47 ++++++++--- drivers/gpu/drm/nouveau/nv20_graph.c | 80