Commit 6600f9d5 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-intel-fixes-2020-11-19' of... 

Merge tag 'drm-intel-fixes-2020-11-19' of git://anongit.freedesktop.org/drm/drm-intel

 into drm-fixes

- Fix tgl power gating issue (Rodrigo)
- Memory leak fixes (Tvrtko, Chris)
- Selftest fixes (Zhang)
- Display bpc fix (Ville)
- Fix TGL MOCS for PTE tracking (Chris)

GVT Fixes: It temporarily disables VFIO edid
feature on BXT/APL until its virtual display is really fixed to make
it work properly. And fixes for DPCD 1.2 and error return in taking
module reference.

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Rodrigo Vivi <rodrigo.vivi@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20201119203417.GA1795798@intel.com
parents 9336127d be33805c

drivers/gpu/drm/i915/display/intel_display.c

+2 −1
Original line number Diff line number Diff line
@@ -12878,10 +12878,11 @@ compute_sink_pipe_bpp(const struct drm_connector_state *conn_state, 
	case 10 ... 11:

		bpp = 10 * 3;

		break;

	case 12:

	case 12 ... 16:

		bpp = 12 * 3;

		break;

	default:

		MISSING_CASE(conn_state->max_bpc);

		return -EINVAL;

	}
































drivers/gpu/drm/i915/gt/intel_lrc.c



+1
−0






























Original line number
Diff line number
Diff line







@@ -5457,6 +5457,7 @@ static void virtual_context_destroy(struct kref *kref)







		__execlists_context_fini(&ve->context);









	intel_context_fini(&ve->context);



















	intel_breadcrumbs_free(ve->base.breadcrumbs);









	intel_engine_free_request_pool(&ve->base);



















	kfree(ve->bonds);
































drivers/gpu/drm/i915/gt/intel_mocs.c



+3
−2






























Original line number
Diff line number
Diff line







@@ -243,8 +243,9 @@ static const struct drm_i915_mocs_entry tgl_mocs_table[] = {







	 * only, __init_mocs_table() take care to program unused index with









	 * this entry.









	 */









	MOCS_ENTRY(1, LE_3_WB | LE_TC_1_LLC | LE_LRUM(3),









		   L3_3_WB),









	MOCS_ENTRY(I915_MOCS_PTE,









		   LE_0_PAGETABLE | LE_TC_0_PAGETABLE,









		   L3_1_UC),









	GEN11_MOCS_ENTRIES,



















	/* Implicitly enable L1 - HDC:L1 + L3 + LLC */
































drivers/gpu/drm/i915/gt/intel_rc6.c



+17
−5






























Original line number
Diff line number
Diff line







@@ -56,9 +56,12 @@ static inline void set(struct intel_uncore *uncore, i915_reg_t reg, u32 val)

















static void gen11_rc6_enable(struct intel_rc6 *rc6)









{









	struct intel_uncore *uncore = rc6_to_uncore(rc6);









	struct intel_gt *gt = rc6_to_gt(rc6);









	struct intel_uncore *uncore = gt->uncore;









	struct intel_engine_cs *engine;









	enum intel_engine_id id;









	u32 pg_enable;









	int i;



















	/* 2b: Program RC6 thresholds.*/









	set(uncore, GEN6_RC6_WAKE_RATE_LIMIT, 54 << 16 | 85);








@@ -102,10 +105,19 @@ static void gen11_rc6_enable(struct intel_rc6 *rc6)







		GEN6_RC_CTL_RC6_ENABLE |









		GEN6_RC_CTL_EI_MODE(1);



















	set(uncore, GEN9_PG_ENABLE,









	pg_enable =









		GEN9_RENDER_PG_ENABLE |









		GEN9_MEDIA_PG_ENABLE |









	    GEN11_MEDIA_SAMPLER_PG_ENABLE);









		GEN11_MEDIA_SAMPLER_PG_ENABLE;



















	if (INTEL_GEN(gt->i915) >= 12) {









		for (i = 0; i < I915_MAX_VCS; i++)









			if (HAS_ENGINE(gt, _VCS(i)))









				pg_enable |= (VDN_HCP_POWERGATE_ENABLE(i) |









					      VDN_MFX_POWERGATE_ENABLE(i));









	}



















	set(uncore, GEN9_PG_ENABLE, pg_enable);









}



















static void gen9_rc6_enable(struct intel_rc6 *rc6)
































drivers/gpu/drm/i915/gt/intel_workarounds.c



+3
−1






























Original line number
Diff line number
Diff line







@@ -131,8 +131,10 @@ static void _wa_add(struct i915_wa_list *wal, const struct i915_wa *wa)







			return;









		}



















		if (wal->list)









		if (wal->list) {









			memcpy(list, wal->list, sizeof(*wa) * wal->count);









			kfree(wal->list);









		}



















		wal->list = list;









	}








































































CRA Git | Maintained and supported by SUSTech CRA and CCSE