From patchwork Fri Sep 8 19:24:16 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Padovan X-Patchwork-Id: 9944921 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 E2203604D4 for ; Fri, 8 Sep 2017 19:24:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id CF931288A7 for ; Fri, 8 Sep 2017 19:24:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C4639288AA; Fri, 8 Sep 2017 19:24:39 +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=unavailable 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 96418288A7 for ; Fri, 8 Sep 2017 19:24:39 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 478E96EBFC; Fri, 8 Sep 2017 19:24:37 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-qt0-f194.google.com (mail-qt0-f194.google.com [209.85.216.194]) by gabe.freedesktop.org (Postfix) with ESMTPS id CE97E6EBF2; Fri, 8 Sep 2017 19:24:35 +0000 (UTC) Received: by mail-qt0-f194.google.com with SMTP id 7so2103655qtz.3; Fri, 08 Sep 2017 12:24: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=CXecw2vehOSwvy1Y8C0/HEsxnD2ZIvrjbKiDCvdUUfQ=; b=DiuzqaxnFWox0bShzPiI0siu8K+JOLFwRtr6P5JIq4dlDbGoMY+tmDji08aoz1jqFn 2BMzwZ3yWN4tvzrpE7f55EkcypqgxT2wfrlwlOEdtLzMgoOZait2VmuYICof2Gy+/Dve KcHR724nI6Tgh2/IFPtdlTcf43KLtasuQSbZdIbcuibnJeCNu+1HVCs1tAjtc6YBLqc3 ehZeafThZ568rwJWXhC8uPC8V0nza7f1nbggWC3UcvNCd23hVkJCHwUbvIvZqbgfrzQV FtJq276Op6LQb71P5xHYb8k08cykN7yHUrd5xCelLq8g/Etm9PxPiuW5fJNvJr8vCQso ylxw== X-Gm-Message-State: AHPjjUh7fFAXNf1VDq9ExR+q3VCnK81hLvOUUKaVIZGdxRB+JhIeIf3B t+z7plP0KoaMhzaT1PY= X-Google-Smtp-Source: AOwi7QA0wmntIYtfTMxEJbf/siDnsfZG2G6Nujig/Pzsj5f7hK5I2gP4owAaYWG77IULnG5vpA/vSg== X-Received: by 10.200.47.238 with SMTP id m43mr516157qta.251.1504898674642; Fri, 08 Sep 2017 12:24:34 -0700 (PDT) Received: from localhost.localdomain ([187.35.193.7]) by smtp.gmail.com with ESMTPSA id f69sm1712471qke.27.2017.09.08.12.24.31 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Fri, 08 Sep 2017 12:24:33 -0700 (PDT) From: Gustavo Padovan To: dri-devel@lists.freedesktop.org Date: Fri, 8 Sep 2017 16:24:16 -0300 Message-Id: <20170908192419.21172-2-gustavo@padovan.org> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170908192419.21172-1-gustavo@padovan.org> References: <20170908192419.21172-1-gustavo@padovan.org> Cc: Gustavo Padovan , intel-gfx@lists.freedesktop.org, Daniel Vetter Subject: [Intel-gfx] [-PATCH v5 2/5] drm/i915: remove intel_cursor_plane_funcs X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" 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 Cc: intel-gfx@lists.freedesktop.org Signed-off-by: Gustavo Padovan --- drivers/gpu/drm/i915/intel_display.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 8399f04a8ad2..6af01d611b01 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -13547,16 +13547,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, - .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) { @@ -13721,7 +13711,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), NULL, DRM_PLANE_TYPE_CURSOR,