From patchwork Fri Jun 30 18:03:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9820227 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 71A29602B1 for ; Fri, 30 Jun 2017 18:03:45 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 59858286B6 for ; Fri, 30 Jun 2017 18:03:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4CB06286C1; Fri, 30 Jun 2017 18:03:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.7 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CEA29286B6 for ; Fri, 30 Jun 2017 18:03:41 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 272936E860; Fri, 30 Jun 2017 18:03:38 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-qk0-f195.google.com (mail-qk0-f195.google.com [209.85.220.195]) by gabe.freedesktop.org (Postfix) with ESMTPS id 0CBD96E857; Fri, 30 Jun 2017 18:03:35 +0000 (UTC) Received: by mail-qk0-f195.google.com with SMTP id 91so16349038qkq.1; Fri, 30 Jun 2017 11:03:35 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=BfDTB8ZQXWIbQtQvkfUqWQ84nLm28JuHFE4iWhf0p7E=; b=CU8OSChyHEIMd4yzfxf6q8k/IOtYOCxVfpuYU+26VikGFgoLyvaEh7krxdVaLj3ydK NdbVmH/SZ2eqIOF1IvImJ7FgzP0Ryo380ij4iOSl+lL8iqthBFK0jK42d4uDJqg4ezvq HJMq4I+dyF7Qy80EV1oG8hh/dFbQF+h6e9pHZCNCV5cqRYYnBVgu8ed3TFwtrE21y/Al 8Y0xNMlMTjj6OjiOrIoI55iwax+0ieFC925jJa+w7j0a1u/smGBPzLm9JtioEoJ7X6og wnRtUwTVM0BkMVBuBOU6upqlYlF3gj51zfjqT+C5LR/riGFa3JDzb1lKX3a2n66vMv9z zuig== X-Gm-Message-State: AKS2vOwxlOIp/Tkrxik50VcEemSxcbilE9rqOxxplvGpBDRqPnmEE3fJ hb7+Uc/XRIdYZc7uJrE= X-Received: by 10.55.58.75 with SMTP id h72mr29697508qka.16.1498845814065; Fri, 30 Jun 2017 11:03:34 -0700 (PDT) Received: from localhost.localdomain ([177.9.58.168]) by smtp.gmail.com with ESMTPSA id z43sm6728334qtg.59.2017.06.30.11.03.31 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Jun 2017 11:03:33 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Subject: [PATCH v4 3/6] drm/i915: remove intel_cursor_plane_funcs Date: Fri, 30 Jun 2017 15:03:19 -0300 Message-Id: <20170630180322.29007-4-gustavo@padovan.org> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170630180322.29007-1-gustavo@padovan.org> References: <20170630180322.29007-1-gustavo@padovan.org> Cc: Gustavo Padovan , intel-gfx@lists.freedesktop.org, Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP From: Gustavo Padovan After converting legacy cursor updates to atomic async commits intel_cursor_plane_funcs just duplicates intel_plane_funcs now. Cc: Daniel Vetter Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/i915/intel_display.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8817222..73d2508 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13610,17 +13610,6 @@ const struct drm_plane_funcs intel_plane_funcs = { .atomic_destroy_state = intel_plane_destroy_state, }; -static const struct drm_plane_funcs intel_cursor_plane_funcs = { - .update_plane = drm_atomic_helper_update_plane, - .disable_plane = drm_atomic_helper_disable_plane, - .destroy = intel_plane_destroy, - .set_property = drm_atomic_helper_plane_set_property, - .atomic_get_property = intel_plane_atomic_get_property, - .atomic_set_property = intel_plane_atomic_set_property, - .atomic_duplicate_state = intel_plane_duplicate_state, - .atomic_destroy_state = intel_plane_destroy_state, -}; - static struct intel_plane * intel_primary_plane_create(struct drm_i915_private *dev_priv, enum pipe pipe) { @@ -13782,7 +13771,7 @@ intel_cursor_plane_create(struct drm_i915_private *dev_priv, cursor->cursor.size = ~0; ret = drm_universal_plane_init(&dev_priv->drm, &cursor->base, - 0, &intel_cursor_plane_funcs, + 0, &intel_plane_funcs, intel_cursor_formats, ARRAY_SIZE(intel_cursor_formats), DRM_PLANE_TYPE_CURSOR,