From patchwork Mon Oct 21 19:10:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3079911 Return-Path: X-Original-To: patchwork-intel-gfx@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 EEC759F2B8 for ; Mon, 21 Oct 2013 22:24:26 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0057820373 for ; Mon, 21 Oct 2013 22:24:25 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 1A05F20334 for ; Mon, 21 Oct 2013 22:24:25 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id CC4E1E6CFD for ; Mon, 21 Oct 2013 15:24:24 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ea0-f170.google.com (mail-ea0-f170.google.com [209.85.215.170]) by gabe.freedesktop.org (Postfix) with ESMTP id 33D59E6679 for ; Mon, 21 Oct 2013 12:10:03 -0700 (PDT) Received: by mail-ea0-f170.google.com with SMTP id q10so3043069eaj.1 for ; Mon, 21 Oct 2013 12:10:02 -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; bh=16f/DJlkFl24XQ4Yj03Nmadf0jBl0AXH+Im7z2KvFFE=; b=XOezSGabqaPI1bri8ScuZ0GLzilVJGquWHSyMHA8W4lO/Bp+szjlTNb8nGZxXnowoY 53ZuNIveeV5MUUQbkusCnHe2wnCrHdfG2kPGr6k//RRH7UMk3VictfWfzTqU8Hn+AHlL JNqNR/EW6/R9Rhzg7C9QQmvYuDMm64mHjLsgw= 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; bh=16f/DJlkFl24XQ4Yj03Nmadf0jBl0AXH+Im7z2KvFFE=; b=TbNDZBotbi9Jf5E/pAGej2PcZnuh9SGK7m20SIVMxPwTr5Bbgy81BlhC4nm4o8x8aW D7wvS05h0WpYLMh8RWd4GMBLrUeVUS+U0A2JUECP4MJqwV4EqlAv+6SR+lTun462pnjo JBy40fJMHvIeU/KqBUGfdaAwOZAZC4/4LJmO3k1dfWTwY8gs0FRt06lpD/TwxuQvlqsH /tIqAtnz3wlnMXPQTje9S5On8ODvEo1R7VFKmzY/cVMoiYR7jzsnA8JUW9O4ywe28Th+ unzLV4QZCuG6o6U7Hy1JY/E2C/iAZdzgNX9VHhLkN/s2v7j6ewanb5zYAd2/CVY5VH6f t9ag== X-Gm-Message-State: ALoCoQl2HTQg7EjmfttSTaoK5nE/n2p65PMiroyL47H4oiULSXgY0CU10xLrgugtJUbIIaNFLhh3 X-Received: by 10.14.179.66 with SMTP id g42mr311670eem.104.1382382602276; Mon, 21 Oct 2013 12:10:02 -0700 (PDT) Received: from phenom.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPSA id e13sm47145579eeu.4.2013.10.21.12.10.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 21 Oct 2013 12:10:01 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Mon, 21 Oct 2013 21:10:20 +0200 Message-Id: <1382382620-23405-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.rc3 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH] drm/i915: Move the pipe CRC stuff to other pipe data X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.5 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 Adding stuff to the bottom of struct drm_i915_driver_private is nowadays considered uncool. Cc: Damien Lespiau Signed-off-by: Daniel Vetter Reviewed-by: Damien Lespiau --- drivers/gpu/drm/i915/i915_drv.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index faface9..2e1e884 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -1380,6 +1380,10 @@ typedef struct drm_i915_private { struct drm_crtc *pipe_to_crtc_mapping[3]; wait_queue_head_t pending_flip_queue; +#ifdef CONFIG_DEBUG_FS + struct intel_pipe_crc pipe_crc[I915_MAX_PIPES]; +#endif + int num_shared_dpll; struct intel_shared_dpll shared_dplls[I915_NUM_PLLS]; struct intel_ddi_plls ddi_plls; @@ -1460,10 +1464,6 @@ typedef struct drm_i915_private { struct i915_dri1_state dri1; /* Old ums support infrastructure, same warning applies. */ struct i915_ums_state ums; - -#ifdef CONFIG_DEBUG_FS - struct intel_pipe_crc pipe_crc[I915_MAX_PIPES]; -#endif } drm_i915_private_t; static inline struct drm_i915_private *to_i915(const struct drm_device *dev)