From patchwork Wed Jun 1 22:06:25 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9148427 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 2F545600BC for ; Wed, 1 Jun 2016 22:07:32 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 225C22714F for ; Wed, 1 Jun 2016 22:07:32 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 1725D2715B; Wed, 1 Jun 2016 22:07:32 +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=unavailable 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 E41A12714F for ; Wed, 1 Jun 2016 22:07:31 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2D2876EA7C; Wed, 1 Jun 2016 22:07:17 +0000 (UTC) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-wm0-x242.google.com (mail-wm0-x242.google.com [IPv6:2a00:1450:400c:c09::242]) by gabe.freedesktop.org (Postfix) with ESMTPS id 35D426EA6D for ; Wed, 1 Jun 2016 22:07:13 +0000 (UTC) Received: by mail-wm0-x242.google.com with SMTP id n184so10066712wmn.1 for ; Wed, 01 Jun 2016 15:07:13 -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=ElFpI/iXcCWCGCuYuSgdiAFjV8koSJcDKoN4ybEmrVb3ytFChFY92sRIhVLfNKt9wp MjU6cNT+BYjgAhb83Nb/OjSRtysQ/ObeaZiXG9T32CrZzjCcW5F28qQjS95Ra5SWQqIg BFBLrPlIDTGnNnqLoAux8HZLEhTqy4Z/xTqQ4= 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=d4OzNx/IblBqRwA06rQOqDQJyhrur4hnWnE7HKU4HyQdo6/xJEsfgd7KRA6xrBd4Py MxjAVvIyYOxnKZdzmO0i+x7jCLD0Y6bvlS4nkYjq85AQM/t9cPcT28QjYgZp59R2DjYx DTUApa2wJAR1BhZ4pACPnZkgNK59dDW33kY2Z/oHQGp4T/ZHTQ4bod4Xp7CqTInnoxLF /kaRG/586BO0CjJkg5t0Rw+d3r7YrYIypF9Vie5Lk3ms95KWyb7JVFf/g3g5zr51b3MQ NdcAfhqb1AqbkL9ejfAemdg3V30+i2tuCI+gKT+vMLvFwQ5wtvyF8UYfZjdWl88XNN+9 V++A== X-Gm-Message-State: ALyK8tKZg7vmqaD+q8H8hYdd0+Nr2YsPjGmJuflWlIeXBrE4mbmS443ZSqDo7AE1DFElAw== X-Received: by 10.194.81.72 with SMTP id y8mr5796381wjx.83.1464818831148; Wed, 01 Jun 2016 15:07:11 -0700 (PDT) Received: from phenom.ffwll.local ([2a02:168:56b5:0:ac27:b86c:7764:9429]) by smtp.gmail.com with ESMTPSA id lf7sm1571508wjb.23.2016.06.01.15.07.10 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 01 Jun 2016 15:07:10 -0700 (PDT) From: Daniel Vetter To: DRI Development Date: Thu, 2 Jun 2016 00:06:25 +0200 Message-Id: <1464818821-5736-3-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1464818821-5736-1-git-send-email-daniel.vetter@ffwll.ch> References: <1464818821-5736-1-git-send-email-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Intel Graphics Development , Daniel Vetter Subject: [Intel-gfx] [PATCH 02/38] drm/i915: Use drm_atomic_get_existing_plane_state 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 We want to encapsulate the drm_atomic_state internals. Signed-off-by: Daniel Vetter Reviewed-by: Maarten Lankhorst --- 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; }