summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/drm/i915/i915_debugfs.c
diff options
context:
space:
mode:
authorDamien Lespiau2013-10-15 19:55:31 +0200
committerDaniel Vetter2013-10-16 13:32:11 +0200
commitcc3da175b0807a3e15f0fb3dad2bc9c7ff071440 (patch)
tree8f90ac3c9d357d0ff94698d41c0180a3b4cd1aa0 /drivers/gpu/drm/i915/i915_debugfs.c
parentdrm/i915: Sample the frame counter instead of a timestamp for CRCs (diff)
downloadkernel-qcow2-linux-cc3da175b0807a3e15f0fb3dad2bc9c7ff071440.tar.gz
kernel-qcow2-linux-cc3da175b0807a3e15f0fb3dad2bc9c7ff071440.tar.xz
kernel-qcow2-linux-cc3da175b0807a3e15f0fb3dad2bc9c7ff071440.zip
drm/i915: Make switching to the same CRC source a no-op
Signed-off-by: Damien Lespiau <damien.lespiau@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Diffstat (limited to 'drivers/gpu/drm/i915/i915_debugfs.c')
-rw-r--r--drivers/gpu/drm/i915/i915_debugfs.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 58c6fd4c8610..8c750d5110a1 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -1804,6 +1804,7 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,
enum intel_pipe_crc_source source)
{
struct drm_i915_private *dev_priv = dev->dev_private;
+ struct intel_pipe_crc *pipe_crc = &dev_priv->pipe_crc[pipe];
u32 val;
@@ -1812,7 +1813,10 @@ static int pipe_crc_set_source(struct drm_device *dev, enum pipe pipe,
if (!IS_IVYBRIDGE(dev))
return -ENODEV;
- dev_priv->pipe_crc[pipe].source = source;
+ if (pipe_crc->source == source)
+ return 0;
+
+ pipe_crc->source = source;
switch (source) {
case INTEL_PIPE_CRC_SOURCE_PLANE1: