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

Commit 13bd8e46 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/anholt/drm-intel:
  drm/i915: Ignore LVDS EDID when it is unavailabe or invalid
  drm/i915: Add no_lvds entry for the Clientron U800
  drm/i915: Rename many remaining uses of "output" to encoder or connector.
  drm/i915: Rename intel_output to intel_encoder.
  agp/intel: intel_845_driver is an agp driver!
  drm/i915: introduce to_intel_bo helper
  drm/i915: Disable FBC on 915GM and 945GM.
parents d6f533c8 bfac4d67

drivers/char/agp/intel-agp.c

+0 −3
Original line number Diff line number Diff line
@@ -1817,8 +1817,6 @@ static int intel_845_configure(void) 
	pci_write_config_byte(agp_bridge->dev, INTEL_I845_AGPM, temp2 | (1 << 1));

	/* clear any possible error conditions */

	pci_write_config_word(agp_bridge->dev, INTEL_I845_ERRSTS, 0x001c);



	intel_i830_setup_flush();

	return 0;

}
@@ -2188,7 +2186,6 @@ static const struct agp_bridge_driver intel_845_driver = { 
	.agp_destroy_page	= agp_generic_destroy_page,

	.agp_destroy_pages      = agp_generic_destroy_pages,

	.agp_type_to_mask_type  = agp_generic_type_to_mask_type,

	.chipset_flush		= intel_i830_chipset_flush,

};



static const struct agp_bridge_driver intel_850_driver = {

drivers/gpu/drm/i915/i915_debugfs.c

+1 −1
Original line number Diff line number Diff line
@@ -226,7 +226,7 @@ static int i915_gem_fence_regs_info(struct seq_file *m, void *data) 
		} else {

			struct drm_i915_gem_object *obj_priv;



			obj_priv = obj->driver_private;

			obj_priv = to_intel_bo(obj);

			seq_printf(m, "Fenced object[%2d] = %p: %s "

				   "%08x %08zx %08x %s %08x %08x %d",

				   i, obj, get_pin_flag(obj_priv),

drivers/gpu/drm/i915/i915_drv.c

+3 −3
Original line number Diff line number Diff line
@@ -80,14 +80,14 @@ const static struct intel_device_info intel_i915g_info = { 
	.is_i915g = 1, .is_i9xx = 1, .cursor_needs_physical = 1,

};

const static struct intel_device_info intel_i915gm_info = {

	.is_i9xx = 1,  .is_mobile = 1, .has_fbc = 1,

	.is_i9xx = 1,  .is_mobile = 1,

	.cursor_needs_physical = 1,

};

const static struct intel_device_info intel_i945g_info = {

	.is_i9xx = 1, .has_hotplug = 1, .cursor_needs_physical = 1,

};

const static struct intel_device_info intel_i945gm_info = {

	.is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1, .has_fbc = 1,

	.is_i945gm = 1, .is_i9xx = 1, .is_mobile = 1,

	.has_hotplug = 1, .cursor_needs_physical = 1,

};
@@ -361,7 +361,7 @@ int i965_reset(struct drm_device *dev, u8 flags) 
	    !dev_priv->mm.suspended) {

		drm_i915_ring_buffer_t *ring = &dev_priv->ring;

		struct drm_gem_object *obj = ring->ring_obj;

		struct drm_i915_gem_object *obj_priv = obj->driver_private;

		struct drm_i915_gem_object *obj_priv = to_intel_bo(obj);

		dev_priv->mm.suspended = 0;



		/* Stop the ring if it's running. */

drivers/gpu/drm/i915/i915_drv.h

+4 −0
Original line number Diff line number Diff line
@@ -611,6 +611,8 @@ typedef struct drm_i915_private { 
	/* Reclocking support */

	bool render_reclock_avail;

	bool lvds_downclock_avail;

	/* indicate whether the LVDS EDID is OK */

	bool lvds_edid_good;

	/* indicates the reduced downclock for LVDS*/

	int lvds_downclock;

	struct work_struct idle_work;
@@ -731,6 +733,8 @@ struct drm_i915_gem_object { 
	atomic_t pending_flip;

};



#define to_intel_bo(x) ((struct drm_i915_gem_object *) (x)->driver_private)



/**

 * Request queue structure.

 *

drivers/gpu/drm/i915/i915_gem.c

+66 −66

File changed.

Preview size limit exceeded, changes collapsed.