Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5ce4164 authored by Paulo Zanoni's avatar Paulo Zanoni Committed by Maarten Lankhorst
Browse files

drm/i915: rename intel_fbc_nuke to intel_fbc_recompress 



Although the term "nuke" is part of the FBC spec, it's not very
intuitive, so let's rename it to make it easier for people that are
not familiar with the spec.

Requested-by: default avatarChris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: default avatarPaulo Zanoni <paulo.r.zanoni@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1446664257-32012-2-git-send-email-paulo.r.zanoni@intel.com


Signed-off-by: default avatarMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
parent 793af070

drivers/gpu/drm/i915/intel_fbc.c

+4 −3
Original line number Diff line number Diff line
@@ -182,7 +182,8 @@ static bool g4x_fbc_enabled(struct drm_i915_private *dev_priv) 
	return I915_READ(DPFC_CONTROL) & DPFC_CTL_EN;

}



static void intel_fbc_nuke(struct drm_i915_private *dev_priv)

/* This function forces a CFB recompression through the nuke operation. */

static void intel_fbc_recompress(struct drm_i915_private *dev_priv)

{

	I915_WRITE(MSG_FBC_REND_STATE, FBC_REND_NUKE);

	POSTING_READ(MSG_FBC_REND_STATE);
@@ -231,7 +232,7 @@ static void ilk_fbc_enable(struct intel_crtc *crtc) 
		I915_WRITE(DPFC_CPU_FENCE_OFFSET, y_offset);

	}



	intel_fbc_nuke(dev_priv);

	intel_fbc_recompress(dev_priv);



	DRM_DEBUG_KMS("enabled fbc on plane %c\n", plane_name(crtc->plane));

}
@@ -310,7 +311,7 @@ static void gen7_fbc_enable(struct intel_crtc *crtc) 
		   SNB_CPU_FENCE_ENABLE | obj->fence_reg);

	I915_WRITE(DPFC_CPU_FENCE_OFFSET, get_crtc_fence_y_offset(crtc));



	intel_fbc_nuke(dev_priv);

	intel_fbc_recompress(dev_priv);



	DRM_DEBUG_KMS("enabled fbc on plane %c\n", plane_name(crtc->plane));

}