From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Hellstrom Subject: [PULL] vmwgfx-next Date: Fri, 4 Jul 2014 12:44:46 +0200 Message-ID: <1404470686-3358-1-git-send-email-thellstrom@vmware.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from smtp-outbound-2.vmware.com (smtp-outbound-2.vmware.com [208.91.2.13]) by gabe.freedesktop.org (Postfix) with ESMTP id D0E206E0B9 for ; Fri, 4 Jul 2014 03:45:03 -0700 (PDT) List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: airlied@gmail.com, airlied@redhat.com Cc: pv-drivers@vmware.com, Thomas Hellstrom , linux-graphics-maintainer@vmware.com, dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Dave, A compat shader namespace fix that at the same tame makes much of the code more generic in preparation for future use. The following changes since commit bc1dfff04a5d4064ba0db1fab13f84ab4f333d2b: Merge branch 'drm-nouveau-next' of git://anongit.freedesktop.org/git/nouveau/linux-2.6 into drm-next (2014-06-11 16:28:10 +1000) are available in the git repository at: git://people.freedesktop.org/~thomash/linux tags/vmwgfx-next-2014-07-04 for you to fetch changes up to 18e4a4669c5023eb1157f2a3f1bf6ca2b8535572: drm/vmwgfx: Fix compat shader namespace (2014-07-04 12:12:09 +0200) ---------------------------------------------------------------- Pull request of 2014-07-04 ---------------------------------------------------------------- Thomas Hellstrom (1): drm/vmwgfx: Fix compat shader namespace drivers/gpu/drm/vmwgfx/Makefile | 3 +- drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c | 341 +++++++++++++++++++++++++ drivers/gpu/drm/vmwgfx/vmwgfx_context.c | 38 ++- drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 7 - drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 74 ++++-- drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 227 +++++++++-------- drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 396 +++++++++-------------------- 7 files changed, 673 insertions(+), 413 deletions(-) create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf_res.c