From patchwork Fri Jul 1 22:22:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 939292 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p61MPmC8013742 for ; Fri, 1 Jul 2011 22:26:08 GMT Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 6AC05A0961 for ; Fri, 1 Jul 2011 15:25:48 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy8-pub.bluehost.com (oproxy8-pub.bluehost.com [69.89.22.20]) by gabe.freedesktop.org (Postfix) with SMTP id AF7679ECF9 for ; Fri, 1 Jul 2011 15:23:04 -0700 (PDT) Received: (qmail 31857 invoked by uid 0); 1 Jul 2011 22:23:04 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by oproxy8.bluehost.com with SMTP; 1 Jul 2011 22:23:04 -0000 DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=virtuousgeek.org; h=Received:From:To:Cc:Subject:Date:Message-Id:X-Mailer:In-Reply-To:References:X-Identified-User; b=a8KHhSw0CmpTjSdLaZPYEuT7G/7As1iksAZBTlq5ZCXok9hoc61WcUmLH6zSX73geS8HX3JMZL/m+99AsjsbXkRsj+E9sSsJQv72wNY2WTcq/HL35RlEnB8/gTLRmpnS; Received: from c-67-161-37-189.hsd1.ca.comcast.net ([67.161.37.189] helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:AES256-SHA:256) (Exim 4.69) (envelope-from ) id 1Qcm75-00047w-Up; Fri, 01 Jul 2011 16:23:04 -0600 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Fri, 1 Jul 2011 15:22:57 -0700 Message-Id: <1309558978-4704-8-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.4.1 In-Reply-To: <1309558978-4704-1-git-send-email-jbarnes@virtuousgeek.org> References: <1309558978-4704-1-git-send-email-jbarnes@virtuousgeek.org> X-Identified-User: {10642:box514.bluehost.com:virtuous:virtuousgeek.org} {sentby:smtp auth 67.161.37.189 authed with jbarnes@virtuousgeek.org} Subject: [Intel-gfx] [PATCH 7/8] drm/i915/dp: rename dpms_mode to receiver_configured X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.11 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org Errors-To: intel-gfx-bounces+patchwork-intel-gfx=patchwork.kernel.org@lists.freedesktop.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Fri, 01 Jul 2011 22:26:08 +0000 (UTC) Make its usage a little more clear. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_dp.c | 11 ++++++----- 1 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c index d7a8d24..ac6334d 100644 --- a/drivers/gpu/drm/i915/intel_dp.c +++ b/drivers/gpu/drm/i915/intel_dp.c @@ -50,7 +50,7 @@ struct intel_dp { bool has_audio; int force_audio; uint32_t color_range; - int dpms_mode; + bool receiver_configured; /* set if we *think* there's a receiver */ uint8_t link_bw; uint8_t lane_count; uint8_t dpcd[4]; @@ -978,7 +978,7 @@ static void intel_dp_commit(struct drm_encoder *encoder) if (is_edp(intel_dp)) ironlake_edp_backlight_on(dev); - intel_dp->dpms_mode = DRM_MODE_DPMS_ON; + intel_dp->receiver_configured = true; } static void @@ -997,6 +997,7 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode) ironlake_edp_panel_off(dev); if (is_edp(intel_dp) && !is_pch_edp(intel_dp)) ironlake_edp_pll_off(encoder); + intel_dp->receiver_configured = false; } else { if (is_edp(intel_dp)) ironlake_edp_panel_vdd_on(intel_dp); @@ -1010,8 +1011,8 @@ intel_dp_dpms(struct drm_encoder *encoder, int mode) } if (is_edp(intel_dp)) ironlake_edp_backlight_on(dev); + intel_dp->receiver_configured = true; } - intel_dp->dpms_mode = mode; } /* @@ -1823,7 +1824,7 @@ intel_dp_hot_plug(struct intel_encoder *intel_encoder) { struct intel_dp *intel_dp = container_of(intel_encoder, struct intel_dp, base); - if (intel_dp->dpms_mode == DRM_MODE_DPMS_ON) + if (intel_dp->receiver_configured) intel_dp_check_link_status(intel_dp); } @@ -1892,7 +1893,7 @@ intel_dp_init(struct drm_device *dev, int output_reg) return; intel_dp->output_reg = output_reg; - intel_dp->dpms_mode = -1; + intel_dp->receiver_configured = false; intel_connector = kzalloc(sizeof(struct intel_connector), GFP_KERNEL); if (!intel_connector) {