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

Commit 33f724eb 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: enable 36bit physical address for hardware status page
  drm/i915: fix eDP pipe mask
  drm/i915: fix pixel color depth setting on eDP
  drm/i915: parse eDP panel color depth from VBT block
  drm/i915: disable LVDS downclock by default
  drm/i915: Fix the incorrect cursor A bit definition in DSPFW2 register
  drm/i915: Remove chatty execbuf failure message.
  drm/i915: remove loop in Ironlake interrupt handler
  drm/i915: Don't wait interruptible for possible plane buffer flush
  drm/i915: try another possible DDC bus for the SDVO device with multiple outputs
  drm/i915: Read the response after issuing DDC bus switch command
  drm/i915: Don't use the child device parsed from VBT to setup HDMI/DP
  drm/i915: Fix resume regression on MSI Wind U100 w/o KMS
  drm/i915: Fix Ironlake M/N/P ranges to match the spec
  drm/i915: Use find_pll function to calculate DPLL setting for LVDS downclock
  drm/i915: Add HP nx9020/SamsungSX20S to ACPI LID quirk list
  drm/i915: disable TV hotplug status check

Trivial conflicts in drivers/gpu/drm/i915/i915_drv.c due to i915
non-modeset suspend fix with different comment.
parents 9ddabb67 9b974cc1

drivers/char/agp/intel-agp.c

+5 −1
Original line number Diff line number Diff line
@@ -2460,10 +2460,14 @@ static int __devinit agp_intel_probe(struct pci_dev *pdev, 
				&bridge->mode);

	}



	if (bridge->driver->mask_memory == intel_i965_mask_memory)

	if (bridge->driver->mask_memory == intel_i965_mask_memory) {

		if (pci_set_dma_mask(intel_private.pcidev, DMA_BIT_MASK(36)))

			dev_err(&intel_private.pcidev->dev,

				"set gfx device dma mask 36bit failed!\n");

		else

			pci_set_consistent_dma_mask(intel_private.pcidev,

						    DMA_BIT_MASK(36));

	}



	pci_set_drvdata(pdev, bridge);

	return agp_add_bridge(bridge);

drivers/gpu/drm/i915/i915_dma.c

+4 −0
Original line number Diff line number Diff line
@@ -134,6 +134,10 @@ static int i915_init_phys_hws(struct drm_device *dev) 


	memset(dev_priv->hw_status_page, 0, PAGE_SIZE);



	if (IS_I965G(dev))

		dev_priv->dma_status_page |= (dev_priv->dma_status_page >> 28) &

					     0xf0;



	I915_WRITE(HWS_PGA, dev_priv->dma_status_page);

	DRM_DEBUG_DRIVER("Enabled hardware status page\n");

	return 0;

drivers/gpu/drm/i915/i915_drv.c

+6 −0
Original line number Diff line number Diff line
@@ -45,6 +45,9 @@ module_param_named(fbpercrtc, i915_fbpercrtc, int, 0400); 
unsigned int i915_powersave = 1;

module_param_named(powersave, i915_powersave, int, 0400);



unsigned int i915_lvds_downclock = 0;

module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);



static struct drm_driver driver;



#define INTEL_VGA_DEVICE(id, info) {		\
@@ -464,8 +467,11 @@ static struct drm_driver driver = { 
	.lastclose = i915_driver_lastclose,

	.preclose = i915_driver_preclose,

	.postclose = i915_driver_postclose,



	/* Used in place of i915_pm_ops for non-DRIVER_MODESET */

	.suspend = i915_suspend,

	.resume = i915_resume,



	.device_is_agp = i915_driver_device_is_agp,

	.enable_vblank = i915_enable_vblank,

	.disable_vblank = i915_disable_vblank,

drivers/gpu/drm/i915/i915_drv.h

+3 −0
Original line number Diff line number Diff line
@@ -283,6 +283,7 @@ typedef struct drm_i915_private { 
	unsigned int lvds_use_ssc:1;

	unsigned int edp_support:1;

	int lvds_ssc_freq;

	int edp_bpp;



	struct notifier_block lid_notifier;
@@ -722,6 +723,7 @@ extern struct drm_ioctl_desc i915_ioctls[]; 
extern int i915_max_ioctl;

extern unsigned int i915_fbpercrtc;

extern unsigned int i915_powersave;

extern unsigned int i915_lvds_downclock;



extern void i915_save_display(struct drm_device *dev);

extern void i915_restore_display(struct drm_device *dev);
@@ -864,6 +866,7 @@ int i915_do_wait_request(struct drm_device *dev, uint32_t seqno, int interruptib 
int i915_gem_fault(struct vm_area_struct *vma, struct vm_fault *vmf);

int i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj,

				      int write);

int i915_gem_object_set_to_display_plane(struct drm_gem_object *obj);

int i915_gem_attach_phys_object(struct drm_device *dev,

				struct drm_gem_object *obj, int id);

void i915_gem_detach_phys_object(struct drm_device *dev,

drivers/gpu/drm/i915/i915_gem.c

+51 −2
Original line number Diff line number Diff line
@@ -2837,6 +2837,57 @@ i915_gem_object_set_to_gtt_domain(struct drm_gem_object *obj, int write) 
	return 0;

}



/*

 * Prepare buffer for display plane. Use uninterruptible for possible flush

 * wait, as in modesetting process we're not supposed to be interrupted.

 */

int

i915_gem_object_set_to_display_plane(struct drm_gem_object *obj)

{

	struct drm_device *dev = obj->dev;

	struct drm_i915_gem_object *obj_priv = obj->driver_private;

	uint32_t old_write_domain, old_read_domains;

	int ret;



	/* Not valid to be called on unbound objects. */

	if (obj_priv->gtt_space == NULL)

		return -EINVAL;



	i915_gem_object_flush_gpu_write_domain(obj);



	/* Wait on any GPU rendering and flushing to occur. */

	if (obj_priv->active) {

#if WATCH_BUF

		DRM_INFO("%s: object %p wait for seqno %08x\n",

			  __func__, obj, obj_priv->last_rendering_seqno);

#endif

		ret = i915_do_wait_request(dev, obj_priv->last_rendering_seqno, 0);

		if (ret != 0)

			return ret;

	}



	old_write_domain = obj->write_domain;

	old_read_domains = obj->read_domains;



	obj->read_domains &= I915_GEM_DOMAIN_GTT;



	i915_gem_object_flush_cpu_write_domain(obj);



	/* It should now be out of any other write domains, and we can update

	 * the domain values for our changes.

	 */

	BUG_ON((obj->write_domain & ~I915_GEM_DOMAIN_GTT) != 0);

	obj->read_domains |= I915_GEM_DOMAIN_GTT;

	obj->write_domain = I915_GEM_DOMAIN_GTT;

	obj_priv->dirty = 1;



	trace_i915_gem_object_change_domain(obj,

					    old_read_domains,

					    old_write_domain);



	return 0;

}



/**

 * Moves a single object to the CPU read, and possibly write domain.

 *
@@ -4000,8 +4051,6 @@ i915_gem_execbuffer(struct drm_device *dev, void *data, 
				  "back to user (%d)\n",

				  args->buffer_count, ret);

		}

	} else {

		DRM_ERROR("i915_gem_do_execbuffer returns %d\n", ret);

	}



	drm_free_large(exec_list);