From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jesse Barnes Subject: Re: [PATCH 07/76] drm/i915: kill a few unused things in dev_priv Date: Wed, 29 Aug 2012 10:37:58 -0700 Message-ID: <20120829103758.173d560a@jbarnes-x220> References: <1343328581-2324-1-git-send-email-daniel.vetter@ffwll.ch> <1343328581-2324-8-git-send-email-daniel.vetter@ffwll.ch> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from oproxy9.bluehost.com (oproxy9.bluehost.com [69.89.24.6]) by gabe.freedesktop.org (Postfix) with SMTP id CBCF19F36F for ; Wed, 29 Aug 2012 10:38:01 -0700 (PDT) In-Reply-To: <1343328581-2324-8-git-send-email-daniel.vetter@ffwll.ch> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+gcfxdi-intel-gfx=m.gmane.org@lists.freedesktop.org To: Daniel Vetter Cc: Intel Graphics Development List-Id: intel-gfx@lists.freedesktop.org On Thu, 26 Jul 2012 20:48:32 +0200 Daniel Vetter wrote: > ... and move a few others only used by i915_dma.c into the dri1 > dungeon. > > Signed-off-by: Daniel Vetter > --- > drivers/gpu/drm/i915/i915_dma.c | 22 +++++++++++----------- > drivers/gpu/drm/i915/i915_drv.h | 13 ++++++------- > 2 files changed, 17 insertions(+), 18 deletions(-) > > diff --git a/drivers/gpu/drm/i915/i915_dma.c > b/drivers/gpu/drm/i915/i915_dma.c index 71672ce..6ff86c1 100644 > --- a/drivers/gpu/drm/i915/i915_dma.c > +++ b/drivers/gpu/drm/i915/i915_dma.c > @@ -235,10 +235,10 @@ static int i915_initialize(struct drm_device * > dev, drm_i915_init_t * init) } > } > > - dev_priv->cpp = init->cpp; > - dev_priv->back_offset = init->back_offset; > - dev_priv->front_offset = init->front_offset; > - dev_priv->current_page = 0; > + dev_priv->dri1.cpp = init->cpp; > + dev_priv->dri1.back_offset = init->back_offset; > + dev_priv->dri1.front_offset = init->front_offset; > + dev_priv->dri1.current_page = 0; > if (master_priv->sarea_priv) > master_priv->sarea_priv->pf_current_page = 0; > > @@ -575,7 +575,7 @@ static int i915_dispatch_flip(struct drm_device * > dev) > DRM_DEBUG_DRIVER("%s: page=%d pfCurrentPage=%d\n", > __func__, > - dev_priv->current_page, > + dev_priv->dri1.current_page, > master_priv->sarea_priv->pf_current_page); > > i915_kernel_lost_context(dev); > @@ -589,12 +589,12 @@ static int i915_dispatch_flip(struct drm_device > * dev) > OUT_RING(CMD_OP_DISPLAYBUFFER_INFO | ASYNC_FLIP); > OUT_RING(0); > - if (dev_priv->current_page == 0) { > - OUT_RING(dev_priv->back_offset); > - dev_priv->current_page = 1; > + if (dev_priv->dri1.current_page == 0) { > + OUT_RING(dev_priv->dri1.back_offset); > + dev_priv->dri1.current_page = 1; > } else { > - OUT_RING(dev_priv->front_offset); > - dev_priv->current_page = 0; > + OUT_RING(dev_priv->dri1.front_offset); > + dev_priv->dri1.current_page = 0; > } > OUT_RING(0); > > @@ -613,7 +613,7 @@ static int i915_dispatch_flip(struct drm_device * > dev) ADVANCE_LP_RING(); > } > > - master_priv->sarea_priv->pf_current_page = > dev_priv->current_page; > + master_priv->sarea_priv->pf_current_page = > dev_priv->dri1.current_page; return 0; > } > > diff --git a/drivers/gpu/drm/i915/i915_drv.h > b/drivers/gpu/drm/i915/i915_drv.h index 0b2eb17..1258a74 100644 > --- a/drivers/gpu/drm/i915/i915_drv.h > +++ b/drivers/gpu/drm/i915/i915_drv.h > @@ -402,12 +402,6 @@ typedef struct drm_i915_private { > > struct resource mch_res; > > - unsigned int cpp; > - int back_offset; > - int front_offset; > - int current_page; > - int page_flipping; > - > atomic_t irq_received; > > /* protects the irq masks */ > @@ -425,7 +419,6 @@ typedef struct drm_i915_private { > u32 hotplug_supported_mask; > struct work_struct hotplug_work; > > - unsigned int sr01, adpa, ppcr, dvob, dvoc, lvds; > int num_pipe; > int num_pch_pll; > > @@ -764,6 +757,12 @@ typedef struct drm_i915_private { > struct { > unsigned allow_batchbuffer : 1; > u32 __iomem *gfx_hws_cpu_addr; > + > + unsigned int cpp; > + int back_offset; > + int front_offset; > + int current_page; > + int page_flipping; > } dri1; > > /* Kernel Modesetting */ Does dri1 work anymore? If not, and no one has noticed, let's kill it! Jesse