From patchwork Sun May 29 18:34:59 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9139851 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 2418460759 for ; Sun, 29 May 2016 18:35:58 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 190EA27CF9 for ; Sun, 29 May 2016 18:35:58 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DDEF281F9; Sun, 29 May 2016 18:35:58 +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=-4.1 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D259D27CF9 for ; Sun, 29 May 2016 18:35:57 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 239DF6E595; Sun, 29 May 2016 18:35:35 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) by gabe.freedesktop.org (Postfix) with ESMTPS id C30756E58D for ; Sun, 29 May 2016 18:35:32 +0000 (UTC) Received: by mail-wm0-x241.google.com with SMTP id e3so16012113wme.2 for ; Sun, 29 May 2016 11:35:32 -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:in-reply-to:references; bh=sSdfUowTYKe/NaM1FjtkTW07x5lQ4vZBeIXG6mN6PoI=; b=Pz318tGs9F9y112libn5SFv/AuStvat8/l5tY958QlCnJO5RoIDFE3gAyR/D13wj5D rW9vXB2qCn2qF9k0rOBacWa/kOSjkc9hpAa8gxPaicqUHbJfcpFepmxbX59bqwYZlGgJ 1CT9oA/2vref+BC8GQEMWt+eJJNQZvaeTXx7I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=sSdfUowTYKe/NaM1FjtkTW07x5lQ4vZBeIXG6mN6PoI=; b=ZrrZk/DJ0SMNo8NzcSeE6pA5AQifbHkRDsm2sRVNI9xl1o2jU8uEIUd4tmS+FaULAB r5Vk4nyABUPMmnME/wVjBtQwRRIw2YjDZ/o/VQ/BusVGyNiBu8ECxqaoXyJbaltfbfBv bNDhaJ/RzqwGAzZQ43VMPMnCVrLcfclAqAkhlqDwrZmlQnxEnLNBprHpZnRpnaRYJ67k tG1PMOMUzSk52gZSkr/ZgKbT/QVp1TgKoDTklxvzZ3YKb7xbmsayGEt0elxQYqf/REEb SjeiCScwyvfrhO764QFD7lz4XRlAC05I0poAQJfwnS7TPnocrQEiG+HBqZIvYy2ma8E3 vSJQ== X-Gm-Message-State: ALyK8tL/i+TR9SqTAq9iKA8s7EwD3zPeQMbKEWOwemx7ulxb8RvQutSpdU2xcAvSVZE9GQ== X-Received: by 10.28.107.28 with SMTP id g28mr7131980wmc.86.1464546930811; Sun, 29 May 2016 11:35:30 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id h2sm7761550wjv.15.2016.05.29.11.35.29 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 29 May 2016 11:35:30 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH 02/26] drm/i915: Use drm_atomic_get_existing_plane_state Date: Sun, 29 May 2016 20:34:59 +0200 Message-Id: <1464546923-13439-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464546923-13439-1-git-send-email-daniel.vetter@ffwll.ch> References: <1464546923-13439-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , 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 We want to encapsulate the drm_atomic_state internals. Signed-off-by: Daniel Vetter --- drivers/gpu/drm/i915/intel_atomic.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_atomic.c b/drivers/gpu/drm/i915/intel_atomic.c index 50ff90aea721..3e6d9ff8840a 100644 --- a/drivers/gpu/drm/i915/intel_atomic.c +++ b/drivers/gpu/drm/i915/intel_atomic.c @@ -223,7 +223,9 @@ int intel_atomic_setup_scalers(struct drm_device *dev, continue; } - plane_state = to_intel_plane_state(drm_state->plane_states[i]); + plane_state = to_intel_plane_state( + drm_atomic_get_existing_plane_state(drm_state, + plane)); scaler_id = &plane_state->scaler_id; }