From patchwork Fri Oct 4 11:53:42 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Ville Syrjala X-Patchwork-Id: 2988241 Return-Path: X-Original-To: patchwork-dri-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 9504DBFF0B for ; Fri, 4 Oct 2013 12:05:56 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 7BB5D20253 for ; Fri, 4 Oct 2013 12:05:55 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 278992023F for ; Fri, 4 Oct 2013 12:05:54 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 2674BE7C33 for ; Fri, 4 Oct 2013 05:05:54 -0700 (PDT) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by gabe.freedesktop.org (Postfix) with ESMTP id 5BC9BE5F5B for ; Fri, 4 Oct 2013 04:54:23 -0700 (PDT) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga101.fm.intel.com with ESMTP; 04 Oct 2013 04:54:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos; i="4.90,1032,1371106800"; d="scan'208"; a="411481829" Received: from stinkbox.fi.intel.com (HELO stinkbox) ([10.237.72.167]) by fmsmga002.fm.intel.com with SMTP; 04 Oct 2013 04:54:20 -0700 Received: by stinkbox (sSMTP sendmail emulation); Fri, 04 Oct 2013 14:54:20 +0300 From: ville.syrjala@linux.intel.com To: dri-devel@lists.freedesktop.org Subject: [PATCH 10/10] drm: Pack struct drm_device a bit better Date: Fri, 4 Oct 2013 14:53:42 +0300 Message-Id: <1380887622-13464-11-git-send-email-ville.syrjala@linux.intel.com> X-Mailer: git-send-email 1.8.1.5 In-Reply-To: <1380887622-13464-1-git-send-email-ville.syrjala@linux.intel.com> References: <1380887622-13464-1-git-send-email-ville.syrjala@linux.intel.com> MIME-Version: 1.0 X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org Errors-To: dri-devel-bounces+patchwork-dri-devel=patchwork.kernel.org@lists.freedesktop.org X-Spam-Status: No, score=-4.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD, 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 From: Ville Syrjälä x86-64: pahole before: /* size: 1328, cachelines: 21, members: 52 */ /* sum members: 1290, holes: 9, sum holes: 38 */ /* paddings: 3, sum paddings: 11 */ /* last cacheline: 48 bytes */ pahole after: /* size: 1296, cachelines: 21, members: 52 */ /* sum members: 1290, holes: 1, sum holes: 2 */ /* padding: 4 */ /* paddings: 3, sum paddings: 11 */ /* last cacheline: 16 bytes */ x86: pahole before: /* size: 772, cachelines: 13, members: 52 */ /* sum members: 762, holes: 4, sum holes: 10 */ /* paddings: 3, sum paddings: 7 */ /* last cacheline: 4 bytes */ pahole after: /* size: 764, cachelines: 12, members: 52 */ /* sum members: 762, holes: 1, sum holes: 2 */ /* paddings: 3, sum paddings: 7 */ /* last cacheline: 60 bytes */ Signed-off-by: Ville Syrjälä --- include/drm/drmP.h | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/include/drm/drmP.h b/include/drm/drmP.h index c72e548..dc84fc0 100644 --- a/include/drm/drmP.h +++ b/include/drm/drmP.h @@ -1121,6 +1121,8 @@ struct drm_device { atomic_t buf_alloc; /**< Buffer allocation in progress */ /*@} */ + unsigned int num_crtcs; /**< Number of CRTCs on this device */ + struct list_head filelist; /** \name Memory management */ @@ -1146,11 +1148,12 @@ struct drm_device { /** \name Context support */ /*@{ */ - bool irq_enabled; /**< True if irq handler is enabled */ __volatile__ long context_flag; /**< Context swapping flag */ int last_context; /**< Last current context */ /*@} */ + bool irq_enabled; /**< True if irq handler is enabled */ + /** \name VBLANK IRQ support */ /*@{ */ @@ -1162,20 +1165,19 @@ struct drm_device { */ bool vblank_disable_allowed; + /** + * List of events + */ + spinlock_t event_lock; + struct list_head vblank_event_list; + /* array of size num_crtcs */ struct drm_vblank_crtc *vblank; spinlock_t vblank_time_lock; /**< Protects vblank count and time updates during vblank enable/disable */ spinlock_t vbl_lock; - struct timer_list vblank_disable_timer; - u32 max_vblank_count; /**< size of vblank counter register */ - - /** - * List of events - */ - struct list_head vblank_event_list; - spinlock_t event_lock; + struct timer_list vblank_disable_timer; /*@} */ @@ -1191,7 +1193,6 @@ struct drm_device { struct usb_device *usbdev; struct drm_sg_mem *sg; /**< Scatter gather memory */ - unsigned int num_crtcs; /**< Number of CRTCs on this device */ void *dev_private; /**< device private data */ void *mm_private; struct address_space *dev_mapping; @@ -1199,8 +1200,6 @@ struct drm_device { sigset_t sigmask; struct drm_driver *driver; - struct drm_local_map *agp_buffer_map; - unsigned int agp_buffer_token; struct drm_minor *control; /**< Control node for card */ struct drm_minor *primary; /**< render type primary screen head */ struct drm_minor *render; /**< render node for card */ @@ -1215,6 +1214,9 @@ struct drm_device { int switch_power_state; atomic_t unplugged; /* device has been unplugged or gone away */ + + struct drm_local_map *agp_buffer_map; + unsigned int agp_buffer_token; }; #define DRM_SWITCH_POWER_ON 0