public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Jason Stubbs <jasonbstubbs@gmail.com>
To: Jesse Barnes <jbarnes@virtuousgeek.org>,
	Keith Packard <keithp@keithp.com>
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH] drm/i915: fix regression after clock gating init split
Date: Fri, 27 May 2011 23:44:19 +1000	[thread overview]
Message-ID: <201105272344.20084.jasonbstubbs@gmail.com> (raw)

From: Jason Stubbs <jasonbstubbs@gmail.com>

In revision 6067aaeadb5b3df26f27ac827256b1ef01e674f5, the function
intel_enable_clock_gating is split up by device. drm_i915_display_funcs then
gained a function pointer called init_clock_gating that intel_init_display
sets to the appropriate function. However, there are some code paths, notably
IS_PINEVIEW(dev), where init_clock_gating is not set and not needed. Calling
it then fails. This patch fixes it by simply adding a null-pointer check.

Signed-off-by: Jason Stubbs <jasonbstubbs@gmail.com>
---
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index f553ddf..6809339 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7559,7 +7559,8 @@ void intel_init_clock_gating(struct drm_device *dev)
 {
 	struct drm_i915_private *dev_priv = dev->dev_private;
 
-	dev_priv->display.init_clock_gating(dev);
+	if (dev_priv->display.init_clock_gating)
+		dev_priv->display.init_clock_gating(dev);
 
 	if (dev_priv->display.init_pch_clock_gating)
 		dev_priv->display.init_pch_clock_gating(dev);

             reply	other threads:[~2011-05-27 13:47 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-05-27 13:44 Jason Stubbs [this message]
2011-05-27 19:44 ` [PATCH] drm/i915: fix regression after clock gating init split Keith Packard
2011-05-28  4:26   ` Jason Stubbs
2011-05-31 16:57     ` Jesse Barnes
2011-05-28  4:26   ` Jason Stubbs
2011-05-31 16:58     ` Jesse Barnes

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=201105272344.20084.jasonbstubbs@gmail.com \
    --to=jasonbstubbs@gmail.com \
    --cc=jbarnes@virtuousgeek.org \
    --cc=keithp@keithp.com \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox