From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Herrmann Subject: [PATCH 0/7] DRM: Remove gem_init_object() and friends Date: Wed, 14 Aug 2013 15:07:13 +0200 Message-ID: <1376485640-711-1-git-send-email-dh.herrmann@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail-ea0-f169.google.com (mail-ea0-f169.google.com [209.85.215.169]) by gabe.freedesktop.org (Postfix) with ESMTP id 327C4E5F30 for ; Wed, 14 Aug 2013 06:07:38 -0700 (PDT) Received: by mail-ea0-f169.google.com with SMTP id z7so4791814eaf.14 for ; Wed, 14 Aug 2013 06:07:37 -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: dri-devel@lists.freedesktop.org List-Id: dri-devel@lists.freedesktop.org Hi This series removes any access to gem_obj->driver_private from all drivers and then drops drm_gem_object_alloc() with its ->gem_init_object() driver callback. All this is only needed if a gem object is not embedded into the driver's bo. However, all drivers (except for nouveau, see patch #6) embed the objects. No need to allow dynamic allocations, anymore. Patches #1 to #5 are trivial and only remove dead code. Patch #6 converts nouveau to embed gem objects into nouveau_bo. I tested this on my nv50 and it runs fine. Patch #7 drops gem_init_object() from all drivers as it is unused and the callbacks are all empty (or BUG()). And the diff-stat looks pretty nice, too. Cheers David David Herrmann (7): drm/ast: remove unused driver_private access drm/mgag200: remove unused driver_private access drm/cirrus: remove unused driver_private access drm/qxl: remove unused object_pin/unpin() helpers drm/radeon: remove stale gem->driver_private access drm/nouveau: embed gem object in nouveau_bo drm: kill ->gem_init_object() and friends drivers/gpu/drm/ast/ast_drv.c | 1 - drivers/gpu/drm/ast/ast_drv.h | 1 - drivers/gpu/drm/ast/ast_main.c | 6 ----- drivers/gpu/drm/ast/ast_ttm.c | 1 - drivers/gpu/drm/cirrus/cirrus_drv.c | 1 - drivers/gpu/drm/cirrus/cirrus_drv.h | 1 - drivers/gpu/drm/cirrus/cirrus_main.c | 6 ----- drivers/gpu/drm/cirrus/cirrus_ttm.c | 1 - drivers/gpu/drm/drm_gem.c | 29 --------------------- drivers/gpu/drm/exynos/exynos_drm_drv.c | 1 - drivers/gpu/drm/exynos/exynos_drm_gem.c | 5 ---- drivers/gpu/drm/exynos/exynos_drm_gem.h | 3 --- drivers/gpu/drm/gma500/gem.c | 5 ---- drivers/gpu/drm/gma500/psb_drv.c | 1 - drivers/gpu/drm/gma500/psb_drv.h | 1 - drivers/gpu/drm/i915/i915_drv.c | 1 - drivers/gpu/drm/i915/i915_drv.h | 1 - drivers/gpu/drm/i915/i915_gem.c | 7 ------ drivers/gpu/drm/mgag200/mgag200_drv.c | 1 - drivers/gpu/drm/mgag200/mgag200_drv.h | 1 - drivers/gpu/drm/mgag200/mgag200_main.c | 6 ----- drivers/gpu/drm/mgag200/mgag200_ttm.c | 1 - drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 +-- drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- drivers/gpu/drm/nouveau/nouveau_bo.h | 5 +++- drivers/gpu/drm/nouveau/nouveau_display.c | 10 ++++---- drivers/gpu/drm/nouveau/nouveau_drm.c | 1 - drivers/gpu/drm/nouveau/nouveau_fbcon.c | 2 +- drivers/gpu/drm/nouveau/nouveau_gem.c | 42 +++++++++++++------------------ drivers/gpu/drm/nouveau/nouveau_gem.h | 3 +-- drivers/gpu/drm/nouveau/nouveau_prime.c | 10 +++++--- drivers/gpu/drm/omapdrm/omap_drv.c | 1 - drivers/gpu/drm/omapdrm/omap_drv.h | 1 - drivers/gpu/drm/omapdrm/omap_gem.c | 5 ---- drivers/gpu/drm/qxl/qxl_drv.c | 1 - drivers/gpu/drm/qxl/qxl_drv.h | 4 --- drivers/gpu/drm/qxl/qxl_gem.c | 32 ----------------------- drivers/gpu/drm/qxl/qxl_object.c | 1 - drivers/gpu/drm/radeon/radeon_drv.c | 2 -- drivers/gpu/drm/radeon/radeon_gem.c | 7 ------ drivers/gpu/drm/radeon/radeon_object.c | 1 - drivers/gpu/drm/radeon/radeon_prime.c | 1 - drivers/gpu/drm/udl/udl_drv.c | 1 - drivers/gpu/drm/udl/udl_drv.h | 1 - drivers/gpu/drm/udl/udl_gem.c | 7 ------ include/drm/drmP.h | 5 ---- 46 files changed, 37 insertions(+), 193 deletions(-) -- 1.8.3.4