From patchwork Thu Oct 11 18:08:25 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 1583861 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 3BA343FD9C for ; Thu, 11 Oct 2012 19:18:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 3E840A08AD for ; Thu, 11 Oct 2012 12:18:05 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-we0-f177.google.com (mail-we0-f177.google.com [74.125.82.177]) by gabe.freedesktop.org (Postfix) with ESMTP id B40CDA0273 for ; Thu, 11 Oct 2012 12:16:35 -0700 (PDT) Received: by mail-we0-f177.google.com with SMTP id u50so1272984wey.36 for ; Thu, 11 Oct 2012 12:16:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; bh=d9jRWxKJAiEeJDDhjtjCmy4+8qgEX105sBF7sjC2xV0=; b=jp8CVlPYgcGJkTyqwbgM8RT0r9bJQum/XYrZeLssBxGCDzAJAUYiLUke5ZSXsV/A9g EMDiOXmd1w22Kf8Re5tBqXqHy5UDEuk+U01ciyqoG8xfxRJQvRH0uUc8s5uuuVXZpVrA SXaeDs9lw85W9MiK7wcH/5mwrwnucVuWn8ZJI= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references :x-gm-message-state; bh=d9jRWxKJAiEeJDDhjtjCmy4+8qgEX105sBF7sjC2xV0=; b=RZydFaxz6bZpROo7Ku82vEr6KO9X+kSH+TwVedH96HTIhGylNJH51Dhw/jLEbBUZdx auYjCKhRYFzuXL+xg4AGQX+fz7OVbjuHQoSzadPCFeFDd93sTvMlqQyxETQ3oORAOkXg vEd7OzVWh2BFEsbP7yrQQ843yY3VhcD+6MqAEN4qhZFMu8Kiu4QPjlQ0d8TXTjpjf9Jb TaID0FtN64icOLuTqNn4FaCCAHjNruH9l3FiNDUtkg0W9FF9Nb3O4Pf5Y4g9cHlj9vgd cptT2bprTGy7KPHlOF1HfeL0PE3g2jrvfQAiBz+bNeP/k85W33IQjow92c/WtJKmS3Bd Obdg== Received: by 10.180.95.130 with SMTP id dk2mr61033wib.18.1349982994772; Thu, 11 Oct 2012 12:16:34 -0700 (PDT) Received: from wespe.ffwll.local (178-83-130-250.dynamic.hispeed.ch. [178.83.130.250]) by mx.google.com with ESMTPS id ei1sm87266wid.7.2012.10.11.12.16.33 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 11 Oct 2012 12:16:33 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Thu, 11 Oct 2012 20:08:25 +0200 Message-Id: <1349978908-7687-4-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.7.11.2 In-Reply-To: <1349978908-7687-1-git-send-email-daniel.vetter@ffwll.ch> References: <1349978908-7687-1-git-send-email-daniel.vetter@ffwll.ch> X-Gm-Message-State: ALoCoQnDWwmraQBgu4tYTRzo+Y5AuAqAnCX+5SxMB5Etz8CxmcRvWp9AR07WTq7la2eNYbbiOZrx Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 3/6] drm/i915: don't save/restor ADPA for kms 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 We now no longer rely on this. This is step 1 on a long journey to rid us of the save/restore madness, which tends to lightly paper over many issues, and cause tons of bad things itself ... Signed-off-by: Daniel Vetter Reviewed-by: Paulo Zanoni --- drivers/gpu/drm/i915/i915_suspend.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/drivers/gpu/drm/i915/i915_suspend.c b/drivers/gpu/drm/i915/i915_suspend.c index 4776ccf..6e398a8 100644 --- a/drivers/gpu/drm/i915/i915_suspend.c +++ b/drivers/gpu/drm/i915/i915_suspend.c @@ -395,6 +395,13 @@ static void i915_save_modeset_reg(struct drm_device *dev) break; } + /* CRT state */ + if (HAS_PCH_SPLIT(dev)) { + dev_priv->saveADPA = I915_READ(PCH_ADPA); + } else { + dev_priv->saveADPA = I915_READ(ADPA); + } + return; } @@ -601,6 +608,12 @@ static void i915_restore_modeset_reg(struct drm_device *dev) if (IS_GEN2(dev)) I915_WRITE(CURSIZE, dev_priv->saveCURSIZE); + /* CRT state */ + if (HAS_PCH_SPLIT(dev)) + I915_WRITE(PCH_ADPA, dev_priv->saveADPA); + else + I915_WRITE(ADPA, dev_priv->saveADPA); + return; } @@ -615,13 +628,6 @@ static void i915_save_display(struct drm_device *dev) /* Don't save them in KMS mode */ i915_save_modeset_reg(dev); - /* CRT state */ - if (HAS_PCH_SPLIT(dev)) { - dev_priv->saveADPA = I915_READ(PCH_ADPA); - } else { - dev_priv->saveADPA = I915_READ(ADPA); - } - /* LVDS state */ if (HAS_PCH_SPLIT(dev)) { dev_priv->savePP_CONTROL = I915_READ(PCH_PP_CONTROL); @@ -719,12 +725,6 @@ static void i915_restore_display(struct drm_device *dev) /* Don't restore them in KMS mode */ i915_restore_modeset_reg(dev); - /* CRT state */ - if (HAS_PCH_SPLIT(dev)) - I915_WRITE(PCH_ADPA, dev_priv->saveADPA); - else - I915_WRITE(ADPA, dev_priv->saveADPA); - /* LVDS state */ if (INTEL_INFO(dev)->gen >= 4 && !HAS_PCH_SPLIT(dev)) I915_WRITE(BLC_PWM_CTL2, dev_priv->saveBLC_PWM_CTL2);