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

Commit 885ac04a authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-2014-04-16' of git://anongit.freedesktop.org/drm-intel into drm-next 

drm-intel-next-2014-04-16:
- vlv infoframe fixes from Jesse
- dsi/mipi fixes from Shobhit
- gen8 pageflip fixes for LRI/SRM from Damien
- cmd parser fixes from Brad Volkin
- some prep patches for CHV, DRRS, ...
- and tons of little things all over
drm-intel-next-2014-04-04:
- cmd parser for gen7 but only in enforcing and not yet granting mode - the
  batch copying stuff is still missing. Also performance is a bit ... rough
  (Brad Volkin + OACONTROL fix from Ken).
- deprecate UMS harder (i.e. CONFIG_BROKEN)
- interrupt rework from Paulo Zanoni
- runtime PM support for bdw and snb, again from Paulo
- a pile of refactorings from various people all over the place to prep for new
  stuff (irq reworks, power domain polish, ...)

drm-intel-next-2014-04-04:
- cmd parser for gen7 but only in enforcing and not yet granting mode - the
  batch copying stuff is still missing. Also performance is a bit ... rough
  (Brad Volkin + OACONTROL fix from Ken).
- deprecate UMS harder (i.e. CONFIG_BROKEN)
- interrupt rework from Paulo Zanoni
- runtime PM support for bdw and snb, again from Paulo
- a pile of refactorings from various people all over the place to prep for new
  stuff (irq reworks, power domain polish, ...)

Conflicts:
	drivers/gpu/drm/i915/i915_gem_context.c
parents 8aa9e85a c7905792

drivers/gpu/drm/drm_cache.c

+2 −2
Original line number Diff line number Diff line
@@ -131,11 +131,11 @@ drm_clflush_sg(struct sg_table *st) 
EXPORT_SYMBOL(drm_clflush_sg);



void

drm_clflush_virt_range(char *addr, unsigned long length)

drm_clflush_virt_range(void *addr, unsigned long length)

{

#if defined(CONFIG_X86)

	if (cpu_has_clflush) {

		char *end = addr + length;

		void *end = addr + length;

		mb();

		for (; addr < end; addr += boot_cpu_data.x86_clflush_size)

			clflush(addr);

drivers/gpu/drm/i915/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ config DRM_I915_PRELIMINARY_HW_SUPPORT 


config DRM_I915_UMS

	bool "Enable userspace modesetting on Intel hardware (DEPRECATED)"

	depends on DRM_I915

	depends on DRM_I915 && BROKEN

	default n

	help

	  Choose this option if you still need userspace modesetting.

drivers/gpu/drm/i915/dvo_ch7xxx.c

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ static bool ch7xxx_readb(struct intel_dvo_device *dvo, int addr, uint8_t *ch) 
	if (i2c_transfer(adapter, msgs, 2) == 2) {

		*ch = in_buf[0];

		return true;

	};

	}



	if (!ch7xxx->quiet) {

		DRM_DEBUG_KMS("Unable to read register 0x%02x from %s:%02x.\n",

drivers/gpu/drm/i915/dvo_ivch.c

+1 −1
Original line number Diff line number Diff line
@@ -195,7 +195,7 @@ static bool ivch_read(struct intel_dvo_device *dvo, int addr, uint16_t *data) 
	if (i2c_transfer(adapter, msgs, 3) == 3) {

		*data = (in_buf[1] << 8) | in_buf[0];

		return true;

	};

	}



	if (!priv->quiet) {

		DRM_DEBUG_KMS("Unable to read register 0x%02x from "

drivers/gpu/drm/i915/dvo_ns2501.c

+9 −15
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ static bool ns2501_readb(struct intel_dvo_device *dvo, int addr, uint8_t * ch) 
	if (i2c_transfer(adapter, msgs, 2) == 2) {

		*ch = in_buf[0];

		return true;

	};

	}



	if (!ns->quiet) {

		DRM_DEBUG_KMS
@@ -233,9 +233,8 @@ static enum drm_mode_status ns2501_mode_valid(struct intel_dvo_device *dvo, 
					      struct drm_display_mode *mode)

{

	DRM_DEBUG_KMS

	    ("%s: is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n",

	     __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay,

	     mode->vtotal);

	    ("is mode valid (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d)\n",

	     mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);



	/*

	 * Currently, these are all the modes I have data from.
@@ -261,9 +260,8 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, 
	struct ns2501_priv *ns = (struct ns2501_priv *)(dvo->dev_priv);



	DRM_DEBUG_KMS

	    ("%s: set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n",

	     __FUNCTION__, mode->hdisplay, mode->htotal, mode->vdisplay,

	     mode->vtotal);

	    ("set mode (hdisplay=%d,htotal=%d,vdisplay=%d,vtotal=%d).\n",

	     mode->hdisplay, mode->htotal, mode->vdisplay, mode->vtotal);



	/*

	 * Where do I find the native resolution for which scaling is not required???
@@ -277,8 +275,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, 
		if (mode->hdisplay == 800 && mode->vdisplay == 600) {

			/* mode 277 */

			ns->reg_8_shadow &= ~NS2501_8_BPAS;

			DRM_DEBUG_KMS("%s: switching to 800x600\n",

				      __FUNCTION__);

			DRM_DEBUG_KMS("switching to 800x600\n");



			/*

			 * No, I do not know where this data comes from.
@@ -341,8 +338,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, 


		} else if (mode->hdisplay == 640 && mode->vdisplay == 480) {

			/* mode 274 */

			DRM_DEBUG_KMS("%s: switching to 640x480\n",

				      __FUNCTION__);

			DRM_DEBUG_KMS("switching to 640x480\n");

			/*

			 * No, I do not know where this data comes from.

			 * It is just what the video bios left in the DVO, so
@@ -406,8 +402,7 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, 


		} else if (mode->hdisplay == 1024 && mode->vdisplay == 768) {

			/* mode 280 */

			DRM_DEBUG_KMS("%s: switching to 1024x768\n",

				      __FUNCTION__);

			DRM_DEBUG_KMS("switching to 1024x768\n");

			/*

			 * This might or might not work, actually. I'm silently

			 * assuming here that the native panel resolution is
@@ -458,8 +453,7 @@ static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable) 
	struct ns2501_priv *ns = (struct ns2501_priv *)(dvo->dev_priv);

	unsigned char ch;



	DRM_DEBUG_KMS("%s: Trying set the dpms of the DVO to %i\n",

		      __FUNCTION__, enable);

	DRM_DEBUG_KMS("Trying set the dpms of the DVO to %i\n", enable);



	ch = ns->reg_8_shadow;