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

Commit 56fcfd63 authored by Imre Deak's avatar Imre Deak
Browse files

drm/i915: fix the power well ID for always on wells 



lookup_power_well() expects uniq power well IDs, but atm we have
uninitialized IDs which would clash with those power wells with a 0
ID. This wasn't a problem so far since nothing looked up such a power
well, but an upcoming patch will (Misc IO for SKL), so fix this up on
platforms where this matters.

Signed-off-by: default avatarImre Deak <imre.deak@intel.com>
Reviewed-by: default avatarPatrik Jakobsson <patrik.jakobsson@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446657859-9598-2-git-send-email-imre.deak@intel.com
parent e64e6bd0

drivers/gpu/drm/i915/i915_reg.h

+3 −1
Original line number Diff line number Diff line
@@ -621,7 +621,7 @@ enum punit_power_well { 
	PUNIT_POWER_WELL_DPIO_RX1		= 11,

	PUNIT_POWER_WELL_DPIO_CMN_D		= 12,



	PUNIT_POWER_WELL_NUM,

	PUNIT_POWER_WELL_ALWAYS_ON,

};



enum skl_disp_power_wells {
@@ -632,6 +632,8 @@ enum skl_disp_power_wells { 
	SKL_DISP_PW_DDI_D,

	SKL_DISP_PW_1 = 14,

	SKL_DISP_PW_2,



	SKL_DISP_PW_ALWAYS_ON,

};



#define SKL_POWER_WELL_STATE(pw) (1 << ((pw) * 2))

drivers/gpu/drm/i915/intel_runtime_pm.c

+2 −0
Original line number Diff line number Diff line
@@ -1632,6 +1632,7 @@ static struct i915_power_well vlv_power_wells[] = { 
		.always_on = 1,

		.domains = VLV_ALWAYS_ON_POWER_DOMAINS,

		.ops = &i9xx_always_on_power_well_ops,

		.data = PUNIT_POWER_WELL_ALWAYS_ON,

	},

	{

		.name = "display",
@@ -1733,6 +1734,7 @@ static struct i915_power_well skl_power_wells[] = { 
		.always_on = 1,

		.domains = SKL_DISPLAY_ALWAYS_ON_POWER_DOMAINS,

		.ops = &i9xx_always_on_power_well_ops,

		.data = SKL_DISP_PW_ALWAYS_ON,

	},

	{

		.name = "power well 1",