Skip to content

Commit

Permalink
drm/i915: add FBC_ROTATION to enum no_fbc_reason
Browse files Browse the repository at this point in the history
Because we're currently using FBC_UNSUPPORTED_MODE for two different
cases.

This commit will also allow us to write the next one without hiding
information from the user.

Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
  • Loading branch information
Paulo Zanoni authored and Daniel Vetter committed Jun 15, 2015
1 parent 31b9df1 commit 87f5ff0
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions drivers/gpu/drm/i915/i915_debugfs.c
Original file line number Diff line number Diff line change
Expand Up @@ -1632,6 +1632,9 @@ static int i915_fbc_status(struct seq_file *m, void *unused)
case FBC_CHIP_DEFAULT:
seq_puts(m, "disabled per chip default");
break;
case FBC_ROTATION:
seq_puts(m, "rotation not supported");
break;
default:
seq_puts(m, "unknown reason");
}
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/i915/i915_drv.h
Original file line number Diff line number Diff line change
Expand Up @@ -926,6 +926,7 @@ struct i915_fbc {
FBC_MULTIPLE_PIPES, /* more than one pipe active */
FBC_MODULE_PARAM,
FBC_CHIP_DEFAULT, /* disabled by default on this chip */
FBC_ROTATION, /* rotation is not supported */
} no_fbc_reason;
};

Expand Down
2 changes: 1 addition & 1 deletion drivers/gpu/drm/i915/intel_fbc.c
Original file line number Diff line number Diff line change
Expand Up @@ -587,7 +587,7 @@ void intel_fbc_update(struct drm_device *dev)
}
if (INTEL_INFO(dev)->gen <= 4 && !IS_G4X(dev) &&
crtc->primary->state->rotation != BIT(DRM_ROTATE_0)) {
if (set_no_fbc_reason(dev_priv, FBC_UNSUPPORTED_MODE))
if (set_no_fbc_reason(dev_priv, FBC_ROTATION))
DRM_DEBUG_KMS("Rotation unsupported, disabling\n");
goto out_disable;
}
Expand Down

0 comments on commit 87f5ff0

Please sign in to comment.