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

Commit 732ce74f authored by Daniel Vetter's avatar Daniel Vetter
Browse files

drm/i915/dvo: implement get_hw_state 



Similar to the sdvo code we poke the dvo encoder whether the output is
active. Safe that dvo encoders are not standardized, so this requires
a new callback into the dvo chip driver.

Hence implement that for all 6 dvo drivers.

v2: With the newly added ns2501 we now have 6 dvo drivers instead of
just 5 ...

Acked-by: default avatarJesse Barnes <jbarnes@virtuousgeek.org>
Signed-Off-by: default avatarDaniel Vetter <daniel.vetter@ffwll.ch>
parent 4ac41f47

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,

drivers/gpu/drm/i915/dvo_ns2501.c

+15 −0
Original line number Diff line number Diff line
@@ -492,6 +492,20 @@ static void ns2501_mode_set(struct intel_dvo_device *dvo, 
		restore_dvo(dvo);

}



/* set the NS2501 power state */

static bool ns2501_get_hw_state(struct intel_dvo_device *dvo)

{

	unsigned char ch;



	if (!ns2501_readb(dvo, NS2501_REG8, &ch))

		return false;



	if (ch & NS2501_8_PD)

		return true;

	else

		return false;

}



/* set the NS2501 power state */

static void ns2501_dpms(struct intel_dvo_device *dvo, bool enable)

{
@@ -568,6 +582,7 @@ struct intel_dvo_dev_ops ns2501_ops = { 
	.mode_valid = ns2501_mode_valid,

	.mode_set = ns2501_mode_set,

	.dpms = ns2501_dpms,

	.get_hw_state = ns2501_get_hw_state,

	.dump_regs = ns2501_dump_regs,

	.destroy = ns2501_destroy,

};