From patchwork Mon Jul 1 20:05:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 2809451 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 39F229F3C3 for ; Mon, 1 Jul 2013 20:11:00 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 52052201BC for ; Mon, 1 Jul 2013 20:10:59 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 5D77E201B1 for ; Mon, 1 Jul 2013 20:10:58 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3F9FBE610D for ; Mon, 1 Jul 2013 13:10:58 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-ea0-f171.google.com (mail-ea0-f171.google.com [209.85.215.171]) by gabe.freedesktop.org (Postfix) with ESMTP id E309CE610C for ; Mon, 1 Jul 2013 13:06:02 -0700 (PDT) Received: by mail-ea0-f171.google.com with SMTP id m14so2329535eaj.30 for ; Mon, 01 Jul 2013 13:06:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer; bh=yARww/dPaptYJ+XiXYDV+3E5sjI1D6EshmPGsiaYWmE=; b=RA2XpKbNAxgFs1hQfnGDWpKd51EbTaYxRvjuKl8OA9/rEf9CvzQl9I1bmVo4y1EdyY +qHgLC6RTDQapkPzQThi6I4/Wcv7gkBbpoVQXUlkEvhZHZbuSlEmVZn+SGaC/H4W64du A27QBvhlc6dKf3ByjY9q3+17epbPUvp3EzOM4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=yARww/dPaptYJ+XiXYDV+3E5sjI1D6EshmPGsiaYWmE=; b=MmF+6oa3DDePW2xibQfUcW2Yh3SJBr+MOXjm0pDnu2yCqtHjA7/EKJQn6AU8VrA02C 6FfJA4VADzmhbU9iztHL9H+A0CUrbkQB29KpDBvwDYPh7/M4IqLtjLzmp9yZvITgfejf iYC2vx9otqCZpPcf1KGDrtJnJFTnP5VV7RK+AivJhOPNi9cQjuMJjRjaP+bapOpfc9qE U9HfIrRrDgpsVbBd1HWC26ZjznNa2oaYZois0arOtWmv7gbFbuP3uW8GXrx1ckTRxT6j xLdMk6l235muvE5/jx5kzmP9ENDW+yoOVVlMa9U7osMKIO4pBGV3qTzRCNTGTyXCBv2/ EaVA== X-Received: by 10.14.211.67 with SMTP id v43mr22991545eeo.55.1372709161738; Mon, 01 Jul 2013 13:06:01 -0700 (PDT) Received: from bremse.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id a4sm31875327eez.0.2013.07.01.13.06.00 for (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 01 Jul 2013 13:06:00 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 1/2] drm/mm: kill color_search_free/get_block Date: Mon, 1 Jul 2013 22:05:53 +0200 Message-Id: <1372709154-7524-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.7 X-Gm-Message-State: ALoCoQnl/EFhvuwCu9vdDavJ3bl3aSUlHthEAaJeHIcLQezsA78oQzNKufsmKSFMoEHoXdir65dU Cc: Daniel Vetter , Intel Graphics Development X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID,UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP drm/i915 is the only user of the color allocation handling and switched to insert_node a while ago. So we can ditch this. Signed-off-by: Daniel Vetter Reviewed-by: Chris Wilson --- include/drm/drm_mm.h | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/include/drm/drm_mm.h b/include/drm/drm_mm.h index 88591ef..ab240f1 100644 --- a/include/drm/drm_mm.h +++ b/include/drm/drm_mm.h @@ -177,17 +177,6 @@ static inline struct drm_mm_node *drm_mm_get_block_range( return drm_mm_get_block_range_generic(parent, size, alignment, 0, start, end, 0); } -static inline struct drm_mm_node *drm_mm_get_color_block_range( - struct drm_mm_node *parent, - unsigned long size, - unsigned alignment, - unsigned long color, - unsigned long start, - unsigned long end) -{ - return drm_mm_get_block_range_generic(parent, size, alignment, color, - start, end, 0); -} static inline struct drm_mm_node *drm_mm_get_block_atomic_range( struct drm_mm_node *parent, unsigned long size, @@ -255,26 +244,6 @@ static inline struct drm_mm_node *drm_mm_search_free_in_range( return drm_mm_search_free_in_range_generic(mm, size, alignment, 0, start, end, best_match); } -static inline struct drm_mm_node *drm_mm_search_free_color(const struct drm_mm *mm, - unsigned long size, - unsigned alignment, - unsigned long color, - bool best_match) -{ - return drm_mm_search_free_generic(mm,size, alignment, color, best_match); -} -static inline struct drm_mm_node *drm_mm_search_free_in_range_color( - const struct drm_mm *mm, - unsigned long size, - unsigned alignment, - unsigned long color, - unsigned long start, - unsigned long end, - bool best_match) -{ - return drm_mm_search_free_in_range_generic(mm, size, alignment, color, - start, end, best_match); -} extern int drm_mm_init(struct drm_mm *mm, unsigned long start, unsigned long size);