Commit 379dd277 authored by Dave Airlie's avatar Dave Airlie
Browse files

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

Just minor stuff really, on vlv dp fix and two patches to tune down some
opregion sanity check. Plus MAINTAINERS update for the new git repo, which
is the only reason I've really bothered with this pull request.

* tag 'drm-intel-fixes-2014-02-06' of ssh://git.freedesktop.org/git/drm-intel:
  drm/i915: demote opregion excessive timeout WARN_ONCE to DRM_INFO_ONCE
  drm: add DRM_INFO_ONCE() to print a one-time DRM_INFO() message
  MAINTAINERS: Update drm/i915 git repo
  drm/i915: vlv: fix DP PHY lockup due to invalid PP sequencer setup
parents 30d44425 bdde5c6a

MAINTAINERS

+1 −1
Original line number Diff line number Diff line
@@ -2857,7 +2857,7 @@ M: Jani Nikula <jani.nikula@linux.intel.com> 
L:	intel-gfx@lists.freedesktop.org

L:	dri-devel@lists.freedesktop.org

Q:	http://patchwork.freedesktop.org/project/intel-gfx/

T:	git git://people.freedesktop.org/~danvet/drm-intel

T:	git git://anongit.freedesktop.org/drm-intel

S:	Supported

F:	drivers/gpu/drm/i915/

F:	include/drm/i915*

drivers/gpu/drm/i915/intel_dp.c

+6 −4
Original line number Diff line number Diff line
@@ -1869,10 +1869,12 @@ static void vlv_pre_enable_dp(struct intel_encoder *encoder) 


	mutex_unlock(&dev_priv->dpio_lock);



	if (is_edp(intel_dp)) {

		/* init power sequencer on this pipe and port */

		intel_dp_init_panel_power_sequencer(dev, intel_dp, &power_seq);

		intel_dp_init_panel_power_sequencer_registers(dev, intel_dp,

							      &power_seq);

	}



	intel_enable_dp(encoder);

drivers/gpu/drm/i915/intel_opregion.c

+6 −3
Original line number Diff line number Diff line
@@ -226,6 +226,8 @@ struct opregion_asle { 
#define ACPI_DIGITAL_OUTPUT (3<<8)

#define ACPI_LVDS_OUTPUT (4<<8)



#define MAX_DSLP	1500



#ifdef CONFIG_ACPI

static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out)

{
@@ -260,10 +262,11 @@ static int swsci(struct drm_device *dev, u32 function, u32 parm, u32 *parm_out) 
		/* The spec says 2ms should be the default, but it's too small

		 * for some machines. */

		dslp = 50;

	} else if (dslp > 500) {

	} else if (dslp > MAX_DSLP) {

		/* Hey bios, trust must be earned. */

		WARN_ONCE(1, "excessive driver sleep timeout (DSPL) %u\n", dslp);

		dslp = 500;

		DRM_INFO_ONCE("ACPI BIOS requests an excessive sleep of %u ms, "

			      "using %u ms instead\n", dslp, MAX_DSLP);

		dslp = MAX_DSLP;

	}



	/* The spec tells us to do this, but we are the only user... */

include/drm/drmP.h

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ int drm_err(const char *func, const char *format, ...); 
#define DRM_INFO(fmt, ...)				\

	printk(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__)



#define DRM_INFO_ONCE(fmt, ...)				\

	printk_once(KERN_INFO "[" DRM_NAME "] " fmt, ##__VA_ARGS__)



/**

 * Debug output.

 *

CRA Git | Maintained and supported by SUSTech CRA and CCSE