Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d33f3aa authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2014-02-14' of ssh://git.freedesktop.org/git/drm-intel into drm-next 

- Fix the execbuf rebind performance regression due to topic/ppgtt (Chris).
- Fix up the connector cleanup ordering for sdvod i2c and dp aux devices (Imre).
- Try to preserve the firmware modeset config on driver load. And a bit of prep
  work for smooth takeover of the fb contents (Jesse).
- Prep cleanup for larger gtt address spaces on bdw (Ben).
- Improve our vblank_wait code to make hsw modesets faster (Paulo).
- Display debugfs file (Jesse).
- DRRS prep work from Vandana Kannan.
- pipestat interrupt handler to fix a few races around vblank/pageflip handling
  on byt (Imre).
- Improve display fuse handling for display-less SKUs (Damien).
- Drop locks while stalling for the gpu when serving pagefaults to improve
  interactivity (Chris).
- And as usual piles of other improvements and small fixes all over.

* tag 'drm-intel-next-2014-02-14' of ssh://git.freedesktop.org/git/drm-intel: (65 commits)
  drm/i915: fix NULL deref in the load detect code
  drm/i915: Only bind each object rather than for every execbuffer
  drm/i915: Directly return the vma from bind_to_vm
  drm/i915: Simplify i915_gem_object_ggtt_unpin
  drm/i915: Allow blocking in the PDE alloc when running low on gtt space
  drm/i915: Don't allocate context pages as mappable
  drm/i915: Handle set_cache_level errors in the status page setup
  drm/i915: Don't pin the status page as mappable
  drm/i915: Don't set PIN_MAPPABLE for legacy ringbuffers
  drm/i915: Handle set_cache_level errors in the pipe control scratch setup
  drm/i915: split PIN_GLOBAL out from PIN_MAPPABLE
  drm/i915: Consolidate binding parameters into flags
  drm/i915: sdvo: add i2c sysfs symlink to the connector's directory
  drm/i915: sdvo: fix error path in sdvo_connector_init
  drm/i915: dp: fix order of dp aux i2c device cleanup
  drm/i915: add unregister callback to connector
  drm/i915: don't reference null pointer at i915_sink_crc
  drm/i915/lvds: Remove dead code from failing case
  drm/i915: don't preserve inherited configs with nothing on v2
  drm/i915/bdw: Split up PPGTT cleanup
  ...
parents 4d538b79 4c0e5528

drivers/gpu/drm/drm_crtc.c

+23 −0
Original line number Diff line number Diff line
@@ -215,6 +215,16 @@ static const struct drm_prop_enum_list drm_encoder_enum_list[] = 
	{ DRM_MODE_ENCODER_DSI, "DSI" },

};



static const struct drm_prop_enum_list drm_subpixel_enum_list[] =

{

	{ SubPixelUnknown, "Unknown" },

	{ SubPixelHorizontalRGB, "Horizontal RGB" },

	{ SubPixelHorizontalBGR, "Horizontal BGR" },

	{ SubPixelVerticalRGB, "Vertical RGB" },

	{ SubPixelVerticalBGR, "Vertical BGR" },

	{ SubPixelNone, "None" },

};



void drm_connector_ida_init(void)

{

	int i;
@@ -264,6 +274,19 @@ const char *drm_get_connector_status_name(enum drm_connector_status status) 
}

EXPORT_SYMBOL(drm_get_connector_status_name);



/**

 * drm_get_subpixel_order_name - return a string for a given subpixel enum

 * @order: enum of subpixel_order

 *

 * Note you could abuse this and return something out of bounds, but that

 * would be a caller error.  No unscrubbed user data should make it here.

 */

const char *drm_get_subpixel_order_name(enum subpixel_order order)

{

	return drm_subpixel_enum_list[order].name;

}

EXPORT_SYMBOL(drm_get_subpixel_order_name);



static char printable_char(int c)

{

	return isascii(c) && isprint(c) ? c : '?';

drivers/gpu/drm/drm_fb_helper.c

+4 −2
Original line number Diff line number Diff line
@@ -1136,7 +1136,7 @@ static int drm_fb_helper_probe_connector_modes(struct drm_fb_helper *fb_helper, 
	return count;

}



static struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector, int width, int height)

struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_connector *fb_connector, int width, int height)

{

	struct drm_display_mode *mode;
@@ -1149,6 +1149,7 @@ static struct drm_display_mode *drm_has_preferred_mode(struct drm_fb_helper_conn 
	}

	return NULL;

}

EXPORT_SYMBOL(drm_has_preferred_mode);



static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector)

{
@@ -1157,7 +1158,7 @@ static bool drm_has_cmdline_mode(struct drm_fb_helper_connector *fb_connector) 
	return cmdline_mode->specified;

}



static struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,

struct drm_display_mode *drm_pick_cmdline_mode(struct drm_fb_helper_connector *fb_helper_conn,

						      int width, int height)

{

	struct drm_cmdline_mode *cmdline_mode;
@@ -1197,6 +1198,7 @@ create_mode: 
	list_add(&mode->head, &fb_helper_conn->connector->modes);

	return mode;

}

EXPORT_SYMBOL(drm_pick_cmdline_mode);



static bool drm_connector_enabled(struct drm_connector *connector, bool strict)

{

drivers/gpu/drm/i915/i915_debugfs.c

+162 −0
Original line number Diff line number Diff line
@@ -1937,6 +1937,9 @@ static int i915_sink_crc(struct seq_file *m, void *data) 
		if (connector->base.dpms != DRM_MODE_DPMS_ON)

			continue;



		if (!connector->base.encoder)

			continue;



		encoder = to_intel_encoder(connector->base.encoder);

		if (encoder->type != INTEL_OUTPUT_EDP)

			continue;
@@ -2074,6 +2077,164 @@ static int i915_power_domain_info(struct seq_file *m, void *unused) 
	return 0;

}



static void intel_seq_print_mode(struct seq_file *m, int tabs,

				 struct drm_display_mode *mode)

{

	int i;



	for (i = 0; i < tabs; i++)

		seq_putc(m, '\t');



	seq_printf(m, "id %d:\"%s\" freq %d clock %d hdisp %d hss %d hse %d htot %d vdisp %d vss %d vse %d vtot %d type 0x%x flags 0x%x\n",

		   mode->base.id, mode->name,

		   mode->vrefresh, mode->clock,

		   mode->hdisplay, mode->hsync_start,

		   mode->hsync_end, mode->htotal,

		   mode->vdisplay, mode->vsync_start,

		   mode->vsync_end, mode->vtotal,

		   mode->type, mode->flags);

}



static void intel_encoder_info(struct seq_file *m,

			       struct intel_crtc *intel_crtc,

			       struct intel_encoder *intel_encoder)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct drm_crtc *crtc = &intel_crtc->base;

	struct intel_connector *intel_connector;

	struct drm_encoder *encoder;



	encoder = &intel_encoder->base;

	seq_printf(m, "\tencoder %d: type: %s, connectors:\n",

		   encoder->base.id, drm_get_encoder_name(encoder));

	for_each_connector_on_encoder(dev, encoder, intel_connector) {

		struct drm_connector *connector = &intel_connector->base;

		seq_printf(m, "\t\tconnector %d: type: %s, status: %s",

			   connector->base.id,

			   drm_get_connector_name(connector),

			   drm_get_connector_status_name(connector->status));

		if (connector->status == connector_status_connected) {

			struct drm_display_mode *mode = &crtc->mode;

			seq_printf(m, ", mode:\n");

			intel_seq_print_mode(m, 2, mode);

		} else {

			seq_putc(m, '\n');

		}

	}

}



static void intel_crtc_info(struct seq_file *m, struct intel_crtc *intel_crtc)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct drm_crtc *crtc = &intel_crtc->base;

	struct intel_encoder *intel_encoder;



	seq_printf(m, "\tfb: %d, pos: %dx%d, size: %dx%d\n",

		   crtc->fb->base.id, crtc->x, crtc->y,

		   crtc->fb->width, crtc->fb->height);

	for_each_encoder_on_crtc(dev, crtc, intel_encoder)

		intel_encoder_info(m, intel_crtc, intel_encoder);

}



static void intel_panel_info(struct seq_file *m, struct intel_panel *panel)

{

	struct drm_display_mode *mode = panel->fixed_mode;



	seq_printf(m, "\tfixed mode:\n");

	intel_seq_print_mode(m, 2, mode);

}



static void intel_dp_info(struct seq_file *m,

			  struct intel_connector *intel_connector)

{

	struct intel_encoder *intel_encoder = intel_connector->encoder;

	struct intel_dp *intel_dp = enc_to_intel_dp(&intel_encoder->base);



	seq_printf(m, "\tDPCD rev: %x\n", intel_dp->dpcd[DP_DPCD_REV]);

	seq_printf(m, "\taudio support: %s\n", intel_dp->has_audio ? "yes" :

		   "no");

	if (intel_encoder->type == INTEL_OUTPUT_EDP)

		intel_panel_info(m, &intel_connector->panel);

}



static void intel_hdmi_info(struct seq_file *m,

			    struct intel_connector *intel_connector)

{

	struct intel_encoder *intel_encoder = intel_connector->encoder;

	struct intel_hdmi *intel_hdmi = enc_to_intel_hdmi(&intel_encoder->base);



	seq_printf(m, "\taudio support: %s\n", intel_hdmi->has_audio ? "yes" :

		   "no");

}



static void intel_lvds_info(struct seq_file *m,

			    struct intel_connector *intel_connector)

{

	intel_panel_info(m, &intel_connector->panel);

}



static void intel_connector_info(struct seq_file *m,

				 struct drm_connector *connector)

{

	struct intel_connector *intel_connector = to_intel_connector(connector);

	struct intel_encoder *intel_encoder = intel_connector->encoder;



	seq_printf(m, "connector %d: type %s, status: %s\n",

		   connector->base.id, drm_get_connector_name(connector),

		   drm_get_connector_status_name(connector->status));

	if (connector->status == connector_status_connected) {

		seq_printf(m, "\tname: %s\n", connector->display_info.name);

		seq_printf(m, "\tphysical dimensions: %dx%dmm\n",

			   connector->display_info.width_mm,

			   connector->display_info.height_mm);

		seq_printf(m, "\tsubpixel order: %s\n",

			   drm_get_subpixel_order_name(connector->display_info.subpixel_order));

		seq_printf(m, "\tCEA rev: %d\n",

			   connector->display_info.cea_rev);

	}

	if (intel_encoder->type == INTEL_OUTPUT_DISPLAYPORT ||

	    intel_encoder->type == INTEL_OUTPUT_EDP)

		intel_dp_info(m, intel_connector);

	else if (intel_encoder->type == INTEL_OUTPUT_HDMI)

		intel_hdmi_info(m, intel_connector);

	else if (intel_encoder->type == INTEL_OUTPUT_LVDS)

		intel_lvds_info(m, intel_connector);



}



static int i915_display_info(struct seq_file *m, void *unused)

{

	struct drm_info_node *node = (struct drm_info_node *) m->private;

	struct drm_device *dev = node->minor->dev;

	struct drm_crtc *crtc;

	struct drm_connector *connector;



	drm_modeset_lock_all(dev);

	seq_printf(m, "CRTC info\n");

	seq_printf(m, "---------\n");

	list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {

		struct intel_crtc *intel_crtc = to_intel_crtc(crtc);



		seq_printf(m, "CRTC %d: pipe: %c, active: %s\n",

			   crtc->base.id, pipe_name(intel_crtc->pipe),

			   intel_crtc->active ? "yes" : "no");

		if (intel_crtc->active)

			intel_crtc_info(m, intel_crtc);

	}



	seq_printf(m, "\n");

	seq_printf(m, "Connector info\n");

	seq_printf(m, "--------------\n");

	list_for_each_entry(connector, &dev->mode_config.connector_list, head) {

		intel_connector_info(m, connector);

	}

	drm_modeset_unlock_all(dev);



	return 0;

}



struct pipe_crc_info {

	const char *name;

	struct drm_device *dev;
@@ -3519,6 +3680,7 @@ static const struct drm_info_list i915_debugfs_list[] = { 
	{"i915_energy_uJ", i915_energy_uJ, 0},

	{"i915_pc8_status", i915_pc8_status, 0},

	{"i915_power_domain_info", i915_power_domain_info, 0},

	{"i915_display_info", i915_display_info, 0},

};

#define I915_DEBUGFS_ENTRIES ARRAY_SIZE(i915_debugfs_list)

drivers/gpu/drm/i915/i915_dma.c

+69 −12
Original line number Diff line number Diff line
@@ -626,9 +626,8 @@ static int i915_batchbuffer(struct drm_device *dev, void *data, 
			    struct drm_file *file_priv)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;

	drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)

	    master_priv->sarea_priv;

	struct drm_i915_master_private *master_priv;

	drm_i915_sarea_t *sarea_priv;

	drm_i915_batchbuffer_t *batch = data;

	int ret;

	struct drm_clip_rect *cliprects = NULL;
@@ -636,6 +635,9 @@ static int i915_batchbuffer(struct drm_device *dev, void *data, 
	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -ENODEV;



	master_priv = dev->primary->master->driver_priv;

	sarea_priv = (drm_i915_sarea_t *) master_priv->sarea_priv;



	if (!dev_priv->dri1.allow_batchbuffer) {

		DRM_ERROR("Batchbuffer ioctl disabled\n");

		return -EINVAL;
@@ -682,9 +684,8 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, 
			  struct drm_file *file_priv)

{

	drm_i915_private_t *dev_priv = (drm_i915_private_t *) dev->dev_private;

	struct drm_i915_master_private *master_priv = dev->primary->master->driver_priv;

	drm_i915_sarea_t *sarea_priv = (drm_i915_sarea_t *)

	    master_priv->sarea_priv;

	struct drm_i915_master_private *master_priv;

	drm_i915_sarea_t *sarea_priv;

	drm_i915_cmdbuffer_t *cmdbuf = data;

	struct drm_clip_rect *cliprects = NULL;

	void *batch_data;
@@ -696,6 +697,9 @@ static int i915_cmdbuffer(struct drm_device *dev, void *data, 
	if (drm_core_check_feature(dev, DRIVER_MODESET))

		return -ENODEV;



	master_priv = dev->primary->master->driver_priv;

	sarea_priv = (drm_i915_sarea_t *) master_priv->sarea_priv;



	RING_LOCK_TEST_WITH_RETURN(dev, file_priv);



	if (cmdbuf->num_cliprects < 0)
@@ -1442,7 +1446,7 @@ static void i915_kick_out_firmware_fb(struct drm_i915_private *dev_priv) 


static void i915_dump_device_info(struct drm_i915_private *dev_priv)

{

	const struct intel_device_info *info = dev_priv->info;

	const struct intel_device_info *info = &dev_priv->info;



#define PRINT_S(name) "%s"

#define SEP_EMPTY
@@ -1459,6 +1463,58 @@ static void i915_dump_device_info(struct drm_i915_private *dev_priv) 
#undef SEP_COMMA

}



/*

 * Determine various intel_device_info fields at runtime.

 *

 * Use it when either:

 *   - it's judged too laborious to fill n static structures with the limit

 *     when a simple if statement does the job,

 *   - run-time checks (eg read fuse/strap registers) are needed.

 *

 * This function needs to be called:

 *   - after the MMIO has been setup as we are reading registers,

 *   - after the PCH has been detected,

 *   - before the first usage of the fields it can tweak.

 */

static void intel_device_info_runtime_init(struct drm_device *dev)

{

	struct drm_i915_private *dev_priv = dev->dev_private;

	struct intel_device_info *info;



	info = (struct intel_device_info *)&dev_priv->info;



	info->num_sprites = 1;

	if (IS_VALLEYVIEW(dev))

		info->num_sprites = 2;



	if (i915.disable_display) {

		DRM_INFO("Display disabled (module parameter)\n");

		info->num_pipes = 0;

	} else if (info->num_pipes > 0 &&

		   (INTEL_INFO(dev)->gen == 7 || INTEL_INFO(dev)->gen == 8) &&

		   !IS_VALLEYVIEW(dev)) {

		u32 fuse_strap = I915_READ(FUSE_STRAP);

		u32 sfuse_strap = I915_READ(SFUSE_STRAP);



		/*

		 * SFUSE_STRAP is supposed to have a bit signalling the display

		 * is fused off. Unfortunately it seems that, at least in

		 * certain cases, fused off display means that PCH display

		 * reads don't land anywhere. In that case, we read 0s.

		 *

		 * On CPT/PPT, we can detect this case as SFUSE_STRAP_FUSE_LOCK

		 * should be set when taking over after the firmware.

		 */

		if (fuse_strap & ILK_INTERNAL_DISPLAY_DISABLE ||

		    sfuse_strap & SFUSE_STRAP_DISPLAY_DISABLED ||

		    (dev_priv->pch_type == PCH_CPT &&

		     !(sfuse_strap & SFUSE_STRAP_FUSE_LOCK))) {

			DRM_INFO("Display fused off, disabling\n");

			info->num_pipes = 0;

		}

	}

}



/**

 * i915_driver_load - setup chip and create an initial config

 * @dev: DRM device
@@ -1473,7 +1529,7 @@ static void i915_dump_device_info(struct drm_i915_private *dev_priv) 
int i915_driver_load(struct drm_device *dev, unsigned long flags)

{

	struct drm_i915_private *dev_priv;

	struct intel_device_info *info;

	struct intel_device_info *info, *device_info;

	int ret = 0, mmio_bar, mmio_size;

	uint32_t aperture_size;
@@ -1496,7 +1552,10 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 


	dev->dev_private = (void *)dev_priv;

	dev_priv->dev = dev;

	dev_priv->info = info;



	/* copy initial configuration to dev_priv->info */

	device_info = (struct intel_device_info *)&dev_priv->info;

	*device_info = *info;



	spin_lock_init(&dev_priv->irq_lock);

	spin_lock_init(&dev_priv->gpu_error.lock);
@@ -1635,9 +1694,7 @@ int i915_driver_load(struct drm_device *dev, unsigned long flags) 
	if (!IS_I945G(dev) && !IS_I945GM(dev))

		pci_enable_msi(dev->pdev);



	dev_priv->num_plane = 1;

	if (IS_VALLEYVIEW(dev))

		dev_priv->num_plane = 2;

	intel_device_info_runtime_init(dev);



	if (INTEL_INFO(dev)->num_pipes) {

		ret = drm_vblank_init(dev, INTEL_INFO(dev)->num_pipes);

drivers/gpu/drm/i915/i915_drv.h

+36 −22
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ enum plane { 
};

#define plane_name(p) ((p) + 'A')



#define sprite_name(p, s) ((p) * dev_priv->num_plane + (s) + 'A')

#define sprite_name(p, s) ((p) * INTEL_INFO(dev)->num_sprites + (s) + 'A')



enum port {

	PORT_A = 0,
@@ -164,6 +164,10 @@ enum hpd_pin { 
	list_for_each_entry((intel_encoder), &(dev)->mode_config.encoder_list, base.head) \

		if ((intel_encoder)->base.crtc == (__crtc))



#define for_each_connector_on_encoder(dev, __encoder, intel_connector) \

	list_for_each_entry((intel_connector), &(dev)->mode_config.connector_list, base.head) \

		if ((intel_connector)->base.encoder == (__encoder))



struct drm_i915_private;



enum intel_dpll_id {
@@ -530,6 +534,7 @@ struct intel_uncore { 
struct intel_device_info {

	u32 display_mmio_offset;

	u8 num_pipes:3;

	u8 num_sprites:2;

	u8 gen;

	u8 ring_mask; /* Rings supported by the HW */

	DEV_INFO_FOR_EACH_FLAG(DEFINE_FLAG, SEP_SEMICOLON);
@@ -1390,7 +1395,7 @@ typedef struct drm_i915_private { 
	struct drm_device *dev;

	struct kmem_cache *slab;



	const struct intel_device_info *info;

	const struct intel_device_info info;



	int relative_constants_mode;
@@ -1435,6 +1440,7 @@ typedef struct drm_i915_private { 
	};

	u32 gt_irq_mask;

	u32 pm_irq_mask;

	u32 pipestat_irq_mask[I915_MAX_PIPES];



	struct work_struct hotplug_work;

	bool enable_hotplug_processing;
@@ -1450,8 +1456,6 @@ typedef struct drm_i915_private { 
	u32 hpd_event_bits;

	struct timer_list hotplug_reenable_timer;



	int num_plane;



	struct i915_fbc fbc;

	struct intel_opregion opregion;

	struct intel_vbt_data vbt;
@@ -1501,8 +1505,8 @@ typedef struct drm_i915_private { 


	struct sdvo_device_mapping sdvo_mappings[2];



	struct drm_crtc *plane_to_crtc_mapping[3];

	struct drm_crtc *pipe_to_crtc_mapping[3];

	struct drm_crtc *plane_to_crtc_mapping[I915_MAX_PIPES];

	struct drm_crtc *pipe_to_crtc_mapping[I915_MAX_PIPES];

	wait_queue_head_t pending_flip_queue;



#ifdef CONFIG_DEBUG_FS
@@ -1799,7 +1803,7 @@ struct drm_i915_file_private { 
	atomic_t rps_wait_boost;

};



#define INTEL_INFO(dev)	(to_i915(dev)->info)

#define INTEL_INFO(dev)	(&to_i915(dev)->info)



#define IS_I830(dev)		((dev)->pdev->device == 0x3577)

#define IS_845G(dev)		((dev)->pdev->device == 0x2562)
@@ -1953,18 +1957,20 @@ struct i915_params { 
	int vbt_sdvo_panel_type;

	int enable_rc6;

	int enable_fbc;

	bool enable_hangcheck;

	int enable_ppgtt;

	int enable_psr;

	unsigned int preliminary_hw_support;

	int disable_power_well;

	int enable_ips;

	bool fastboot;

	int enable_pc8;

	int pc8_timeout;

	int invert_brightness;

	/* leave bools at the end to not create holes */

	bool enable_hangcheck;

	bool fastboot;

	bool prefault_disable;

	bool reset;

	int invert_brightness;

	bool disable_display;

};

extern struct i915_params i915 __read_mostly;
@@ -2012,10 +2018,12 @@ extern void intel_uncore_check_errors(struct drm_device *dev); 
extern void intel_uncore_fini(struct drm_device *dev);



void

i915_enable_pipestat(drm_i915_private_t *dev_priv, enum pipe pipe, u32 mask);

i915_enable_pipestat(drm_i915_private_t *dev_priv, enum pipe pipe,

		     u32 status_mask);



void

i915_disable_pipestat(drm_i915_private_t *dev_priv, enum pipe pipe, u32 mask);

i915_disable_pipestat(drm_i915_private_t *dev_priv, enum pipe pipe,

		      u32 status_mask);



/* i915_gem.c */

int i915_gem_init_ioctl(struct drm_device *dev, void *data,
@@ -2076,14 +2084,14 @@ void i915_init_vm(struct drm_i915_private *dev_priv, 
void i915_gem_free_object(struct drm_gem_object *obj);

void i915_gem_vma_destroy(struct i915_vma *vma);



#define PIN_MAPPABLE 0x1

#define PIN_NONBLOCK 0x2

#define PIN_GLOBAL 0x4

int __must_check i915_gem_object_pin(struct drm_i915_gem_object *obj,

				     struct i915_address_space *vm,

				     uint32_t alignment,

				     bool map_and_fenceable,

				     bool nonblocking);

void i915_gem_object_ggtt_unpin(struct drm_i915_gem_object *obj);

				     unsigned flags);

int __must_check i915_vma_unbind(struct i915_vma *vma);

int __must_check i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj);

int i915_gem_object_put_pages(struct drm_i915_gem_object *obj);

void i915_gem_release_all_mmaps(struct drm_i915_private *dev_priv);

void i915_gem_release_mmap(struct drm_i915_gem_object *obj);
@@ -2283,13 +2291,19 @@ i915_gem_obj_ggtt_size(struct drm_i915_gem_object *obj) 
static inline int __must_check

i915_gem_obj_ggtt_pin(struct drm_i915_gem_object *obj,

		      uint32_t alignment,

		      bool map_and_fenceable,

		      bool nonblocking)

		      unsigned flags)

{

	return i915_gem_object_pin(obj, obj_to_ggtt(obj), alignment,

				   map_and_fenceable, nonblocking);

	return i915_gem_object_pin(obj, obj_to_ggtt(obj), alignment, flags | PIN_GLOBAL);

}



static inline int

i915_gem_object_ggtt_unbind(struct drm_i915_gem_object *obj)

{

	return i915_vma_unbind(i915_gem_obj_to_ggtt(obj));

}



void i915_gem_object_ggtt_unpin(struct drm_i915_gem_object *obj);



/* i915_gem_context.c */

#define ctx_to_ppgtt(ctx) container_of((ctx)->vm, struct i915_hw_ppgtt, base)

int __must_check i915_gem_context_init(struct drm_device *dev);
@@ -2331,8 +2345,7 @@ int __must_check i915_gem_evict_something(struct drm_device *dev, 
					  int min_size,

					  unsigned alignment,

					  unsigned cache_level,

					  bool mappable,

					  bool nonblock);

					  unsigned flags);

int i915_gem_evict_vm(struct i915_address_space *vm, bool do_idle);

int i915_gem_evict_everything(struct drm_device *dev);
@@ -2547,6 +2560,7 @@ extern void intel_modeset_suspend_hw(struct drm_device *dev); 
extern void intel_modeset_init(struct drm_device *dev);

extern void intel_modeset_gem_init(struct drm_device *dev);

extern void intel_modeset_cleanup(struct drm_device *dev);

extern void intel_connector_unregister(struct intel_connector *);

extern int intel_modeset_vga_set_state(struct drm_device *dev, bool state);

extern void intel_modeset_setup_hw_state(struct drm_device *dev,

					 bool force_restore);