Commit 5d985ac8 authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915: kill a few unused things in dev_priv 



... and move a few others only used by i915_dma.c into the dri1
dungeon.

Reviewed-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent fac3274c

drivers/gpu/drm/i915/i915_dma.c

+11 −11
Original line number Diff line number Diff line
@@ -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;

}

drivers/gpu/drm/i915/i915_drv.h

+6 −7
Original line number Diff line number Diff line
@@ -428,12 +428,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 */
@@ -451,7 +445,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;
@@ -790,6 +783,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 */