drm/i915: extract intel_fbc_find_crtc()
I want to make this code a little more complicated, so let's extract the function first. Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com> Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com> Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
parent
0cea6502bf
commit
9510675387
|
@ -473,6 +473,32 @@ static bool set_no_fbc_reason(struct drm_i915_private *dev_priv,
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static struct drm_crtc *intel_fbc_find_crtc(struct drm_i915_private *dev_priv)
|
||||||
|
{
|
||||||
|
struct drm_device *dev = dev_priv->dev;
|
||||||
|
struct drm_crtc *crtc = NULL, *tmp_crtc;
|
||||||
|
|
||||||
|
for_each_crtc(dev, tmp_crtc) {
|
||||||
|
if (intel_crtc_active(tmp_crtc) &&
|
||||||
|
to_intel_crtc(tmp_crtc)->primary_enabled) {
|
||||||
|
if (crtc) {
|
||||||
|
if (set_no_fbc_reason(dev_priv, FBC_MULTIPLE_PIPES))
|
||||||
|
DRM_DEBUG_KMS("more than one pipe active, disabling compression\n");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
crtc = tmp_crtc;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!crtc || crtc->primary->fb == NULL) {
|
||||||
|
if (set_no_fbc_reason(dev_priv, FBC_NO_OUTPUT))
|
||||||
|
DRM_DEBUG_KMS("no output, disabling\n");
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
return crtc;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* intel_fbc_update - enable/disable FBC as needed
|
* intel_fbc_update - enable/disable FBC as needed
|
||||||
* @dev: the drm_device
|
* @dev: the drm_device
|
||||||
|
@ -495,7 +521,7 @@ static bool set_no_fbc_reason(struct drm_i915_private *dev_priv,
|
||||||
void intel_fbc_update(struct drm_device *dev)
|
void intel_fbc_update(struct drm_device *dev)
|
||||||
{
|
{
|
||||||
struct drm_i915_private *dev_priv = dev->dev_private;
|
struct drm_i915_private *dev_priv = dev->dev_private;
|
||||||
struct drm_crtc *crtc = NULL, *tmp_crtc;
|
struct drm_crtc *crtc = NULL;
|
||||||
struct intel_crtc *intel_crtc;
|
struct intel_crtc *intel_crtc;
|
||||||
struct drm_framebuffer *fb;
|
struct drm_framebuffer *fb;
|
||||||
struct drm_i915_gem_object *obj;
|
struct drm_i915_gem_object *obj;
|
||||||
|
@ -530,23 +556,9 @@ void intel_fbc_update(struct drm_device *dev)
|
||||||
* - new fb is too large to fit in compressed buffer
|
* - new fb is too large to fit in compressed buffer
|
||||||
* - going to an unsupported config (interlace, pixel multiply, etc.)
|
* - going to an unsupported config (interlace, pixel multiply, etc.)
|
||||||
*/
|
*/
|
||||||
for_each_crtc(dev, tmp_crtc) {
|
crtc = intel_fbc_find_crtc(dev_priv);
|
||||||
if (intel_crtc_active(tmp_crtc) &&
|
if (!crtc)
|
||||||
to_intel_crtc(tmp_crtc)->primary_enabled) {
|
|
||||||
if (crtc) {
|
|
||||||
if (set_no_fbc_reason(dev_priv, FBC_MULTIPLE_PIPES))
|
|
||||||
DRM_DEBUG_KMS("more than one pipe active, disabling compression\n");
|
|
||||||
goto out_disable;
|
|
||||||
}
|
|
||||||
crtc = tmp_crtc;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!crtc || crtc->primary->fb == NULL) {
|
|
||||||
if (set_no_fbc_reason(dev_priv, FBC_NO_OUTPUT))
|
|
||||||
DRM_DEBUG_KMS("no output, disabling\n");
|
|
||||||
goto out_disable;
|
goto out_disable;
|
||||||
}
|
|
||||||
|
|
||||||
intel_crtc = to_intel_crtc(crtc);
|
intel_crtc = to_intel_crtc(crtc);
|
||||||
fb = crtc->primary->fb;
|
fb = crtc->primary->fb;
|
||||||
|
|
Loading…
Reference in a new issue