From mboxrd@z Thu Jan 1 00:00:00 1970 From: Maarten Lankhorst Subject: [GIT PULL] generic bugfixes for nouveau Date: Sun, 07 Jul 2013 21:54:41 +0200 Message-ID: <51D9C781.9050501@canonical.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by gabe.freedesktop.org (Postfix) with ESMTP id DB572E5C90 for ; Sun, 7 Jul 2013 12:54:43 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org Errors-To: dri-devel-bounces+sf-dri-devel=m.gmane.org@lists.freedesktop.org To: Ben Skeggs Cc: Dave Airlie , "dri-devel@lists.freedesktop.org" List-Id: dri-devel@lists.freedesktop.org The following changes since commit 117287c8210dcfc5c5974a733c19a74a162f0c56: Merge remote-tracking branch 'airlied/drm-next' into nouveau (2013-07-07 10:33:48 +0200) are available in the git repository at: ssh://people.freedesktop.org/~mlankhorst/linux for-darktama for you to fetch changes up to e9dd5df1499e52ac71583ef27ad32f522e45a3c5: drm/nouveau: use separate copy engine channel on nvc0, and fix nve0 ce (2013-07-07 18:55:02 +0200) This series applies on top of the current nouveau/master branch when merged with airlied/drm-next. ---------------------------------------------------------------- Maarten Lankhorst (10): drm/nouveau: fix locking in nouveau_crtc_page_flip drm/nouveau: handle framebuffer pinning correctly drm/nouveau: do not unpin in nouveau_gem_object_del drm/nouveau: fix gpc firmware regression on nvc0 drm/nouveau: fix mapping in nouveau_bo_move_ntfy drm/nouveau: do not allow negative sizes for now drm/nouveau: add falcon interrupt handler drm/nouveau: prefer cached memory where possible drm/nouveau: bump fence timeout to 15 seconds drm/nouveau: use separate copy engine channel on nvc0, and fix nve0 ce drivers/gpu/drm/nouveau/core/engine/bsp/nvc0.c | 1 + drivers/gpu/drm/nouveau/core/engine/bsp/nve0.c | 1 + drivers/gpu/drm/nouveau/core/engine/falcon.c | 18 ++++++++ .../gpu/drm/nouveau/core/engine/graph/fuc/gpc.fuc | 3 ++ .../nouveau/core/engine/graph/fuc/gpcnvc0.fuc.h | 40 +++++++++--------- drivers/gpu/drm/nouveau/core/engine/ppp/nvc0.c | 1 + drivers/gpu/drm/nouveau/core/engine/vp/nvc0.c | 1 + drivers/gpu/drm/nouveau/core/engine/vp/nve0.c | 1 + .../gpu/drm/nouveau/core/include/engine/falcon.h | 2 + drivers/gpu/drm/nouveau/nouveau_bo.c | 48 +++++++++++----------- drivers/gpu/drm/nouveau/nouveau_display.c | 24 +++++++---- drivers/gpu/drm/nouveau/nouveau_drm.c | 7 ++++ drivers/gpu/drm/nouveau/nouveau_fbcon.c | 5 +++ drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 6 --- drivers/gpu/drm/nouveau/nv50_display.c | 13 ++++++ 16 files changed, 116 insertions(+), 57 deletions(-)