From patchwork Fri Jun 13 20:28:04 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Wilson X-Patchwork-Id: 4351531 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id A8056BEEAA for ; Fri, 13 Jun 2014 20:28:29 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C599820254 for ; Fri, 13 Jun 2014 20:28:28 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id B5DEF2022A for ; Fri, 13 Jun 2014 20:28:27 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 14DFA6E05A; Fri, 13 Jun 2014 13:28:27 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from relay.fireflyinternet.com (hostedrelay.fireflyinternet.com [109.228.30.76]) by gabe.freedesktop.org (Postfix) with ESMTP id BB3576E05A for ; Fri, 13 Jun 2014 13:28:25 -0700 (PDT) X-Default-Received-SPF: pass (skip=forwardok (res=PASS)) x-ip-name=78.156.65.138; Received: from haswell.alporthouse.com (unverified [78.156.65.138]) by relay.fireflyinternet.com (FireflyRelay1) with ESMTP id 11286149-1305619 for multiple; Fri, 13 Jun 2014 21:29:01 +0100 From: Chris Wilson To: intel-gfx@lists.freedesktop.org Date: Fri, 13 Jun 2014 21:28:04 +0100 Message-Id: <1402691284-24458-1-git-send-email-chris@chris-wilson.co.uk> X-Mailer: git-send-email 2.0.0 X-Authenticated-User: chris.alporthouse@surfanytime.net Subject: [Intel-gfx] [PATCH] drm/i915: Attach a PSR property on eDP X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: intel-gfx-bounces@lists.freedesktop.org Sender: "Intel-gfx" X-Spam-Status: No, score=-4.8 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Let userspace know the status of Panel Self-Refresh by virtue of a property on the appropriate connector. Signed-off-by: Chris Wilson --- drivers/gpu/drm/i915/i915_drv.h | 1 + drivers/gpu/drm/i915/intel_dp.c | 13 +++++++++++++ drivers/gpu/drm/i915/intel_drv.h | 1 + drivers/gpu/drm/i915/intel_modes.c | 29 +++++++++++++++++++++++++++++ 4 files changed, 44 insertions(+) diff --git a/drivers/gpu/drm/i915/i915_drv.h b/drivers/gpu/drm/i915/i915_drv.h index bdb419c48016..92561bdde201 100644 --- a/drivers/gpu/drm/i915/i915_drv.h +++ b/drivers/gpu/drm/i915/i915_drv.h @@ -642,6 +642,7 @@ struct i915_psr { bool enabled; bool active; struct delayed_work work; + struct drm_property *property; }; enum intel_pch { diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index e3ad8a7c9fd0..583b30c68b70 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -1820,6 +1820,12 @@ static bool intel_edp_psr_match_conditions(struct intel_dp *intel_dp) return true; } +static void intel_edp_set_psr_property(struct intel_connector *connector, uint64_t val) +{ + drm_object_property_set_value(&connector->base.base, + to_i915(connector->base.dev)->psr.property, val); +} + static void intel_edp_psr_do_enable(struct intel_dp *intel_dp) { struct intel_digital_port *intel_dig_port = dp_to_dig_port(intel_dp); @@ -1835,6 +1841,8 @@ static void intel_edp_psr_do_enable(struct intel_dp *intel_dp) /* Enable PSR on the host */ intel_edp_psr_enable_source(intel_dp); + intel_edp_set_psr_property(intel_dp->attached_connector, 1); + dev_priv->psr.enabled = true; dev_priv->psr.active = true; } @@ -1931,6 +1939,7 @@ void intel_edp_psr_inactivate(struct drm_device *dev) intel_dp = enc_to_intel_dp(&encoder->base); intel_crtc = to_intel_crtc(encoder->base.crtc); + intel_edp_set_psr_property(connector, 0); dev_priv->psr.active = false; I915_WRITE(EDP_PSR_CTL(dev), I915_READ(EDP_PSR_CTL(dev)) @@ -3349,6 +3358,9 @@ intel_dp_get_dpcd(struct intel_dp *intel_dp) dev_priv->psr.sink_support = true; DRM_DEBUG_KMS("Detected EDP PSR Panel.\n"); } + if (HAS_PSR(dev)) + intel_edp_set_psr_property(intel_dp->attached_connector, + dev_priv->psr.sink_support ? dev_priv->psr.active : -1); } /* Training Pattern 3 support */ @@ -3977,6 +3989,7 @@ intel_dp_add_properties(struct intel_dp *intel_dp, struct drm_connector *connect intel_dp->color_range_auto = true; if (is_edp(intel_dp)) { + intel_attach_psr_property(connector); drm_mode_create_scaling_mode_property(connector->dev); drm_object_attach_property( &connector->base, diff --git a/drivers/gpu/drm/i915/intel_drv.h b/drivers/gpu/drm/i915/intel_drv.h index cfe140a74266..9c8524016e4b 100644 --- a/drivers/gpu/drm/i915/intel_drv.h +++ b/drivers/gpu/drm/i915/intel_drv.h @@ -905,6 +905,7 @@ int intel_connector_update_modes(struct drm_connector *connector, int intel_ddc_get_modes(struct drm_connector *c, struct i2c_adapter *adapter); void intel_attach_force_audio_property(struct drm_connector *connector); void intel_attach_broadcast_rgb_property(struct drm_connector *connector); +void intel_attach_psr_property(struct drm_connector *connector); /* intel_overlay.c */ diff --git a/drivers/gpu/drm/i915/intel_modes.c b/drivers/gpu/drm/i915/intel_modes.c index 0e860f39933d..6c14c97fa8df 100644 --- a/drivers/gpu/drm/i915/intel_modes.c +++ b/drivers/gpu/drm/i915/intel_modes.c @@ -126,3 +126,32 @@ intel_attach_broadcast_rgb_property(struct drm_connector *connector) drm_object_attach_property(&connector->base, prop, 0); } + +static const struct drm_prop_enum_list psr_names[] = { + { -1, "Unsupported" }, + { 0, "Idle" }, + { 1, "Active" }, +}; + +void +intel_attach_psr_property(struct drm_connector *connector) +{ + struct drm_device *dev = connector->dev; + struct drm_i915_private *dev_priv = dev->dev_private; + struct drm_property *prop; + + prop = dev_priv->psr.property; + if (prop == NULL) { + prop = drm_property_create_enum(dev, + DRM_MODE_PROP_ENUM | DRM_MODE_PROP_IMMUTABLE, + "Panel Self-Refresh", + psr_names, + ARRAY_SIZE(psr_names)); + if (prop == NULL) + return; + + dev_priv->psr.property = prop; + } + + drm_object_attach_property(&connector->base, prop, 0); +}