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

Commit c3f8d864 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-next-fixes-2016-07-25' of... 

Merge tag 'drm-intel-next-fixes-2016-07-25' of git://anongit.freedesktop.org/drm-intel into drm-next

Bunch of fixes for the 4.8 merge pull, nothing out of the ordinary. All
suitably marked up with cc: stable where needed.

* tag 'drm-intel-next-fixes-2016-07-25' of git://anongit.freedesktop.org/drm-intel:
  drm/i915/gen9: Add WaInPlaceDecompressionHang
  drm/i915/guc: Revert "drm/i915/guc: enable GuC loading & submission by default"
  drm/i915/bxt: Fix inadvertent CPU snooping due to incorrect MOCS config
  drm/i915/gen9: Clean up MOCS table definitions
  drm/i915: Set legacy properties when using legacy gamma set IOCTL. (v2)
  drm/i915: Enable polling when we don't have hpd
  drm/i915/vlv: Disable HPD in valleyview_crt_detect_hotplug()
  drm/i915/vlv: Reset the ADPA in vlv_display_power_well_init()
  drm/i915/vlv: Make intel_crt_reset() per-encoder
  drm/i915: Unbreak interrupts on pre-gen6
  drm/i915/breadcrumbs: Queue hangcheck before sleeping
parents 9af07af9 f15f6ca1

drivers/gpu/drm/i915/i915_drv.c

+3 −0
Original line number Diff line number Diff line
@@ -2413,6 +2413,9 @@ static int intel_runtime_suspend(struct device *device) 


	assert_forcewakes_inactive(dev_priv);



	if (!IS_VALLEYVIEW(dev_priv) || !IS_CHERRYVIEW(dev_priv))

		intel_hpd_poll_init(dev_priv);



	DRM_DEBUG_KMS("Device suspended\n");

	return 0;

}

drivers/gpu/drm/i915/i915_drv.h

+7 −0
Original line number Diff line number Diff line
@@ -284,6 +284,9 @@ struct i915_hotplug { 
	u32 short_port_mask;

	struct work_struct dig_port_work;



	struct work_struct poll_init_work;

	bool poll_enabled;



	/*

	 * if we get a HPD irq from DP and a HPD irq from non-DP

	 * the non-DP HPD could block the workqueue on a mode config
@@ -2743,6 +2746,8 @@ struct drm_i915_cmd_table { 
#define SKL_REVID_D0		0x3

#define SKL_REVID_E0		0x4

#define SKL_REVID_F0		0x5

#define SKL_REVID_G0		0x6

#define SKL_REVID_H0		0x7



#define IS_SKL_REVID(p, since, until) (IS_SKYLAKE(p) && IS_REVID(p, since, until))
@@ -2957,6 +2962,8 @@ void intel_hpd_init(struct drm_i915_private *dev_priv); 
void intel_hpd_init_work(struct drm_i915_private *dev_priv);

void intel_hpd_cancel_work(struct drm_i915_private *dev_priv);

bool intel_hpd_pin_to_port(enum hpd_pin pin, enum port *port);

bool intel_hpd_disable(struct drm_i915_private *dev_priv, enum hpd_pin pin);

void intel_hpd_enable(struct drm_i915_private *dev_priv, enum hpd_pin pin);



/* i915_irq.c */

static inline void i915_queue_hangcheck(struct drm_i915_private *dev_priv)

drivers/gpu/drm/i915/i915_gem.c

+0 −9
Original line number Diff line number Diff line
@@ -1501,15 +1501,6 @@ int __i915_wait_request(struct drm_i915_gem_request *req, 
			break;

		}



		/* Ensure that even if the GPU hangs, we get woken up.

		 *

		 * However, note that if no one is waiting, we never notice

		 * a gpu hang. Eventually, we will have to wait for a resource

		 * held by the GPU and so trigger a hangcheck. In the most

		 * pathological case, this will be upon memory starvation!

		 */

		i915_queue_hangcheck(req->i915);



		timeout_remain = io_schedule_timeout(timeout_remain);

		if (timeout_remain == 0) {

			ret = -ETIME;

drivers/gpu/drm/i915/i915_params.c

+4 −4
Original line number Diff line number Diff line
@@ -54,8 +54,8 @@ struct i915_params i915 __read_mostly = { 
	.verbose_state_checks = 1,

	.nuclear_pageflip = 0,

	.edp_vswing = 0,

	.enable_guc_loading = -1,

	.enable_guc_submission = -1,

	.enable_guc_loading = 0,

	.enable_guc_submission = 0,

	.guc_log_level = -1,

	.enable_dp_mst = true,

	.inject_load_failure = 0,
@@ -203,12 +203,12 @@ MODULE_PARM_DESC(edp_vswing, 
module_param_named_unsafe(enable_guc_loading, i915.enable_guc_loading, int, 0400);

MODULE_PARM_DESC(enable_guc_loading,

		"Enable GuC firmware loading "

		"(-1=auto [default], 0=never, 1=if available, 2=required)");

		"(-1=auto, 0=never [default], 1=if available, 2=required)");



module_param_named_unsafe(enable_guc_submission, i915.enable_guc_submission, int, 0400);

MODULE_PARM_DESC(enable_guc_submission,

		"Enable GuC submission "

		"(-1=auto [default], 0=never, 1=if available, 2=required)");

		"(-1=auto, 0=never [default], 1=if available, 2=required)");



module_param_named(guc_log_level, i915.guc_log_level, int, 0400);

MODULE_PARM_DESC(guc_log_level,

drivers/gpu/drm/i915/i915_reg.h

+3 −0
Original line number Diff line number Diff line
@@ -1686,6 +1686,9 @@ enum skl_disp_power_wells { 


#define GEN7_TLB_RD_ADDR	_MMIO(0x4700)



#define GEN9_GAMT_ECO_REG_RW_IA _MMIO(0x4ab0)

#define   GAMT_ECO_ENABLE_IN_PLACE_DECOMPRESS	(1<<18)



#define GAMT_CHKN_BIT_REG	_MMIO(0x4ab8)

#define   GAMT_CHKN_DISABLE_DYNAMIC_CREDIT_SHARING	(1<<28)