From patchwork Fri Feb 15 21:07:47 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesse Barnes X-Patchwork-Id: 2150111 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by patchwork1.kernel.org (Postfix) with ESMTP id CD16C3FDF1 for ; Fri, 15 Feb 2013 21:08:23 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 9661BE5C7B for ; Fri, 15 Feb 2013 13:08:23 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from oproxy6-pub.bluehost.com (oproxy6-pub.bluehost.com [67.222.54.6]) by gabe.freedesktop.org (Postfix) with SMTP id D619DE5ED6 for ; Fri, 15 Feb 2013 13:07:51 -0800 (PST) Received: (qmail 20009 invoked by uid 0); 15 Feb 2013 21:07:51 -0000 Received: from unknown (HELO box514.bluehost.com) (74.220.219.114) by cpoproxy3.bluehost.com with SMTP; 15 Feb 2013 21:07:51 -0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=virtuousgeek.org; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:To:From; bh=6TMmdf7u1VJx/+yWpgWwbt8hvTD3Vl4z/bmR80SNQyU=; b=lhmIv2DfzA+aO0Y0DoKLAcoymejQNQw60vDYzRa3hThZidVJp71AFD3KQKQVQD5pBIZxSa7D4MD/M4BpDdOyk1uzXSgqMILPdcVEC0fxa57Xn4MQg0+MrfHUtfzJboMi; Received: from [67.161.37.189] (port=33493 helo=localhost.localdomain) by box514.bluehost.com with esmtpsa (TLSv1:CAMELLIA256-SHA:256) (Exim 4.80) (envelope-from ) id 1U6SVb-0003WM-9v for intel-gfx@lists.freedesktop.org; Fri, 15 Feb 2013 14:07:51 -0700 From: Jesse Barnes To: intel-gfx@lists.freedesktop.org Date: Fri, 15 Feb 2013 13:07:47 -0800 Message-Id: <1360962470-7451-4-git-send-email-jbarnes@virtuousgeek.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1360962470-7451-1-git-send-email-jbarnes@virtuousgeek.org> References: <1360962470-7451-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 3/6] drm/i915: restore cursor and sprite state when forcing a config restore X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 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 Needed for VT switchless resume. Signed-off-by: Jesse Barnes --- drivers/gpu/drm/i915/intel_display.c | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c index 3e6dadf..2bf076e 100644 --- a/drivers/gpu/drm/i915/intel_display.c +++ b/drivers/gpu/drm/i915/intel_display.c @@ -8985,6 +8985,7 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, struct drm_i915_private *dev_priv = dev->dev_private; enum pipe pipe; u32 tmp; + struct drm_plane *plane; struct intel_crtc *crtc; struct intel_encoder *encoder; struct intel_connector *connector; @@ -9081,8 +9082,20 @@ void intel_modeset_setup_hw_state(struct drm_device *dev, if (force_restore) { for_each_pipe(pipe) { - intel_crtc_restore_mode(dev_priv->pipe_to_crtc_mapping[pipe]); + struct drm_crtc *crtc = + dev_priv->pipe_to_crtc_mapping[pipe]; + struct intel_crtc *intel_crtc = to_intel_crtc(crtc); + + intel_crtc_restore_mode(crtc); + if (intel_crtc->cursor_visible) { + /* Force update for previously enabled cursor */ + intel_crtc->cursor_visible = false; + intel_crtc_update_cursor(&intel_crtc->base, + true); + } } + list_for_each_entry(plane, &dev->mode_config.plane_list, head) + intel_plane_restore(plane); i915_redisable_vga(dev); } else {