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

Commit 7facf166 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel into drm-next 

Daniel writes:
"The big ticket item here is the new i915 modeset infrastructure.
Shockingly it didn't not blow up all over the place (i.e. I've managed to
fix the ugly issues before merging). 1-2 smaller corner cases broke, but
we have patches. Also, there's tons of patches on top of this that clean
out cruft and fix a few bugs that couldn't be fixed with the crtc helper
based stuff. So more stuff to come ;-)

Also a few other things:
- Tiny fix in the fb helper to go through the official dpms interface
  instead of calling the crtc helper code.
- forcewake code frobbery from Ben, code should be more in-line with
  what Windows does now.
- fixes for the render ring flush on hsw (Paulo)
- gpu frequency tracepoint
- vlv forcewake changes to better align it with our understanding of the
  forcewake magic.
- a few smaller cleanups"

+ 2 fixes.

* 'for-airlied' of git://people.freedesktop.org/~danvet/drm-intel: (78 commits)
  drm/i915: fix OOPS in lid_notify
  drm/i915: correctly update crtc->x/y in set_base
  drm/fb helper: don't call drm_helper_connector_dpms directly
  drm/i915: improve modeset state checking after dpms calls
  drm/i915: add tons of modeset state checks
  drm/i915: no longer call drm_helper_resume_force_mode
  drm/i915: disable all crtcs at suspend time
  drm/i915: push commit_output_state past the crtc/encoder preparing
  drm/i915: switch the load detect code to the staged modeset config
  drm/i915: WARN if the pipe won't turn off
  drm/i915: s/intel_encoder_disable/intel_encoder_noop
  drm/i915: push commit_output_state past crtc disabling
  drm/i915: implement new set_mode code flow
  drm/i915: compute masks of crtcs affected in set_mode
  drm/i915: use staged outuput config in lvds->mode_fixup
  drm/i915: use staged outuput config in tv->mode_fixup
  drm/i915: extract adjusted mode computation
  drm/i915: move output commit and crtc disabling into set_mode
  drm/i915: remove crtc disabling special case
  drm/i915: push crtc->fb update into pipe_set_base
  ...
parents 87229ad9 3b7a89fc

drivers/gpu/drm/drm_fb_helper.c

+1 −1
Original line number Diff line number Diff line
@@ -330,7 +330,7 @@ static void drm_fb_helper_dpms(struct fb_info *info, int dpms_mode) 
		/* Walk the connectors & encoders on this fb turning them on/off */

		for (j = 0; j < fb_helper->connector_count; j++) {

			connector = fb_helper->connector_info[j]->connector;

			drm_helper_connector_dpms(connector, dpms_mode);

			connector->funcs->dpms(connector, dpms_mode);

			drm_connector_property_set_value(connector,

				dev->mode_config.dpms_property, dpms_mode);

		}

drivers/gpu/drm/i915/dvo.h

+6 −0
Original line number Diff line number Diff line
@@ -114,6 +114,12 @@ struct intel_dvo_dev_ops { 
	 */

	enum drm_connector_status (*detect)(struct intel_dvo_device *dvo);



	/*

	 * Probe the current hw status, returning true if the connected output

	 * is active.

	 */

	bool (*get_hw_state)(struct intel_dvo_device *dev);



	/**

	 * Query the device for the modes it provides.

	 *

drivers/gpu/drm/i915/dvo_ch7017.c

+13 −0
Original line number Diff line number Diff line
@@ -359,6 +359,18 @@ static void ch7017_dpms(struct intel_dvo_device *dvo, bool enable) 
	msleep(20);

}



static bool ch7017_get_hw_state(struct intel_dvo_device *dvo)

{

	uint8_t val;



	ch7017_read(dvo, CH7017_LVDS_POWER_DOWN, &val);



	if (val & CH7017_LVDS_POWER_DOWN_EN)

		return false;

	else

		return true;

}



static void ch7017_dump_regs(struct intel_dvo_device *dvo)

{

	uint8_t val;
@@ -396,6 +408,7 @@ struct intel_dvo_dev_ops ch7017_ops = { 
	.mode_valid = ch7017_mode_valid,

	.mode_set = ch7017_mode_set,

	.dpms = ch7017_dpms,

	.get_hw_state = ch7017_get_hw_state,

	.dump_regs = ch7017_dump_regs,

	.destroy = ch7017_destroy,

};

drivers/gpu/drm/i915/dvo_ch7xxx.c

+13 −0
Original line number Diff line number Diff line
@@ -297,6 +297,18 @@ static void ch7xxx_dpms(struct intel_dvo_device *dvo, bool enable) 
		ch7xxx_writeb(dvo, CH7xxx_PM, CH7xxx_PM_FPD);

}



static bool ch7xxx_get_hw_state(struct intel_dvo_device *dvo)

{

	u8 val;



	ch7xxx_readb(dvo, CH7xxx_PM, &val);



	if (val & CH7xxx_PM_FPD)

		return false;

	else

		return true;

}



static void ch7xxx_dump_regs(struct intel_dvo_device *dvo)

{

	int i;
@@ -326,6 +338,7 @@ struct intel_dvo_dev_ops ch7xxx_ops = { 
	.mode_valid = ch7xxx_mode_valid,

	.mode_set = ch7xxx_mode_set,

	.dpms = ch7xxx_dpms,

	.get_hw_state = ch7xxx_get_hw_state,

	.dump_regs = ch7xxx_dump_regs,

	.destroy = ch7xxx_destroy,

};

drivers/gpu/drm/i915/dvo_ivch.c

+15 −0
Original line number Diff line number Diff line
@@ -323,6 +323,20 @@ static void ivch_dpms(struct intel_dvo_device *dvo, bool enable) 
	udelay(16 * 1000);

}



static bool ivch_get_hw_state(struct intel_dvo_device *dvo)

{

	uint16_t vr01;



	/* Set the new power state of the panel. */

	if (!ivch_read(dvo, VR01, &vr01))

		return false;



	if (vr01 & VR01_LCD_ENABLE)

		return true;

	else

		return false;

}



static void ivch_mode_set(struct intel_dvo_device *dvo,

			  struct drm_display_mode *mode,

			  struct drm_display_mode *adjusted_mode)
@@ -413,6 +427,7 @@ static void ivch_destroy(struct intel_dvo_device *dvo) 
struct intel_dvo_dev_ops ivch_ops = {

	.init = ivch_init,

	.dpms = ivch_dpms,

	.get_hw_state = ivch_get_hw_state,

	.mode_valid = ivch_mode_valid,

	.mode_set = ivch_mode_set,

	.detect = ivch_detect,