From 57fa3f2f3d7229778ade4b9624c3c96ded6e52ff Mon Sep 17 00:00:00 2001 From: Jesse Barnes Date: Thu, 22 Jan 2009 22:22:06 +1000 Subject: [PATCH] --- yaml --- r: 130079 b: refs/heads/master c: 335041ed31d774391d9add49824d05e7d19d93e9 h: refs/heads/master i: 130077: c3a9b9e72e830d130ae8c4d1f8c5462cc6fba1f6 130075: ad5731bbaad30994333d81f6462c3af67a989412 130071: 03c15a0aa2d173cbdaa24e0f77fb8c7f3838b7e8 130063: 6bd50a15e8ae5e88418cd6d1190c65525c6417ff 130047: 1c6e33aa348a09cce2b27e193bf121abfa4520af v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/i915/intel_lvds.c | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 39590d7323a6..b85d1dbf2653 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ed2dd4b0cc1494c27478f4ea8452f68d2037a60c +refs/heads/master: 335041ed31d774391d9add49824d05e7d19d93e9 diff --git a/trunk/drivers/gpu/drm/i915/intel_lvds.c b/trunk/drivers/gpu/drm/i915/intel_lvds.c index 2fafdcc108fe..6b1148fc2cbe 100644 --- a/trunk/drivers/gpu/drm/i915/intel_lvds.c +++ b/trunk/drivers/gpu/drm/i915/intel_lvds.c @@ -340,6 +340,18 @@ static void intel_lvds_destroy(struct drm_connector *connector) kfree(connector); } +static int intel_lvds_set_property(struct drm_connector *connector, + struct drm_property *property, + uint64_t value) +{ + struct drm_device *dev = connector->dev; + + if (property == dev->mode_config.dpms_property && connector->encoder) + intel_lvds_dpms(connector->encoder, (uint32_t)(value & 0xf)); + + return 0; +} + static const struct drm_encoder_helper_funcs intel_lvds_helper_funcs = { .dpms = intel_lvds_dpms, .mode_fixup = intel_lvds_mode_fixup, @@ -359,6 +371,7 @@ static const struct drm_connector_funcs intel_lvds_connector_funcs = { .restore = intel_lvds_restore, .detect = intel_lvds_detect, .fill_modes = drm_helper_probe_single_connector_modes, + .set_property = intel_lvds_set_property, .destroy = intel_lvds_destroy, };