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

Commit 351fc4d6 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge remote branch 'keithp/drm-intel-next' of ../drm-next into drm-core-next 

* 'keithp/drm-intel-next' of ../drm-next:
  drm/i915: initialize gen6 rps work queue on Sandy Bridge and Ivy Bridge
  drm/i915/sdvo: Reorder i2c initialisation before ddc proxy
  drm/i915: FDI link training broken on Ironlake by Ivybridge integration
  drm/i915: enable rc6 by default
  drm/i915: add fbc enable flag, but disable by default
  drm/i915: clean up unused ring_get_irq/ring_put_irq functions
  drm/i915: fix user irq miss in BSD ring on g4x
parents fb0b7606 9e3c256d

drivers/gpu/drm/i915/i915_debugfs.c

+3 −0
Original line number Diff line number Diff line
@@ -1065,6 +1065,9 @@ static int i915_fbc_status(struct seq_file *m, void *unused) 
		case FBC_MULTIPLE_PIPES:

			seq_printf(m, "multiple pipes are enabled");

			break;

		case FBC_MODULE_PARAM:

			seq_printf(m, "disabled per module param (default off)");

			break;

		default:

			seq_printf(m, "unknown reason");

		}

drivers/gpu/drm/i915/i915_drv.c

+5 −2
Original line number Diff line number Diff line
@@ -52,9 +52,12 @@ module_param_named(powersave, i915_powersave, int, 0600); 
unsigned int i915_semaphores = 1;

module_param_named(semaphores, i915_semaphores, int, 0600);



unsigned int i915_enable_rc6 = 0;

unsigned int i915_enable_rc6 = 1;

module_param_named(i915_enable_rc6, i915_enable_rc6, int, 0600);



unsigned int i915_enable_fbc = 0;

module_param_named(i915_enable_fbc, i915_enable_fbc, int, 0600);



unsigned int i915_lvds_downclock = 0;

module_param_named(lvds_downclock, i915_lvds_downclock, int, 0400);
@@ -169,7 +172,7 @@ static const struct intel_device_info intel_ironlake_d_info = { 
static const struct intel_device_info intel_ironlake_m_info = {

	.gen = 5, .is_mobile = 1,

	.need_gfx_hws = 1, .has_hotplug = 1,

	.has_fbc = 0, /* disabled due to buggy hardware */

	.has_fbc = 1,

	.has_bsd_ring = 1,

};

drivers/gpu/drm/i915/i915_drv.h

+2 −0
Original line number Diff line number Diff line
@@ -250,6 +250,7 @@ enum no_fbc_reason { 
	FBC_BAD_PLANE, /* fbc not supported on plane */

	FBC_NOT_TILED, /* buffer not tiled */

	FBC_MULTIPLE_PIPES, /* more than one pipe active */

	FBC_MODULE_PARAM,

};



enum intel_pch {
@@ -995,6 +996,7 @@ extern unsigned int i915_lvds_downclock; 
extern unsigned int i915_panel_use_ssc;

extern int i915_vbt_sdvo_panel_type;

extern unsigned int i915_enable_rc6;

extern unsigned int i915_enable_fbc;



extern int i915_suspend(struct drm_device *dev, pm_message_t state);

extern int i915_resume(struct drm_device *dev);

drivers/gpu/drm/i915/i915_irq.c

+2 −1
Original line number Diff line number Diff line
@@ -1736,6 +1736,8 @@ void ironlake_irq_preinstall(struct drm_device *dev) 


	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);

	INIT_WORK(&dev_priv->error_work, i915_error_work_func);

	if (IS_GEN6(dev) || IS_IVYBRIDGE(dev))

		INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work);



	I915_WRITE(HWSTAM, 0xeffe);
@@ -1887,7 +1889,6 @@ void i915_driver_irq_preinstall(struct drm_device * dev) 


	INIT_WORK(&dev_priv->hotplug_work, i915_hotplug_work_func);

	INIT_WORK(&dev_priv->error_work, i915_error_work_func);

	INIT_WORK(&dev_priv->rps_work, gen6_pm_rps_work);



	if (I915_HAS_HOTPLUG(dev)) {

		I915_WRITE(PORT_HOTPLUG_EN, 0);

drivers/gpu/drm/i915/intel_display.c

+9 −4
Original line number Diff line number Diff line
@@ -1731,6 +1731,11 @@ static void intel_update_fbc(struct drm_device *dev) 
	intel_fb = to_intel_framebuffer(fb);

	obj = intel_fb->obj;



	if (!i915_enable_fbc) {

		DRM_DEBUG_KMS("fbc disabled per module param (default off)\n");

		dev_priv->no_fbc_reason = FBC_MODULE_PARAM;

		goto out_disable;

	}

	if (intel_fb->obj->base.size > dev_priv->cfb_size) {

		DRM_DEBUG_KMS("framebuffer too large, disabling "

			      "compression\n");
@@ -2051,12 +2056,12 @@ static void intel_fdi_normal_train(struct drm_crtc *crtc) 
	/* enable normal train */

	reg = FDI_TX_CTL(pipe);

	temp = I915_READ(reg);

	if (IS_GEN6(dev)) {

		temp &= ~FDI_LINK_TRAIN_NONE;

		temp |= FDI_LINK_TRAIN_NONE | FDI_TX_ENHANCE_FRAME_ENABLE;

	} else if (IS_IVYBRIDGE(dev)) {

	if (IS_IVYBRIDGE(dev)) {

		temp &= ~FDI_LINK_TRAIN_NONE_IVB;

		temp |= FDI_LINK_TRAIN_NONE_IVB | FDI_TX_ENHANCE_FRAME_ENABLE;

	} else {

		temp &= ~FDI_LINK_TRAIN_NONE;

		temp |= FDI_LINK_TRAIN_NONE | FDI_TX_ENHANCE_FRAME_ENABLE;

	}

	I915_WRITE(reg, temp);