]> git.proxmox.com Git - mirror_ubuntu-eoan-kernel.git/commitdiff
drm/i915: add FBC_ROTATION to enum no_fbc_reason
authorPaulo Zanoni <paulo.r.zanoni@intel.com>
Fri, 12 Jun 2015 17:36:19 +0000 (14:36 -0300)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 15 Jun 2015 16:36:31 +0000 (18:36 +0200)
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>
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_fbc.c

index 6c788e434255bc7c89aa2f09518df87edc047d7f..985e860691b4cf72b2753a10def0a0b1ca2a02ff 100644 (file)
@@ -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");
                }
index 617b01f560623398a2eead2c1117e2c6dcd1a26a..491ef0cfcb0b21eb19e4a4db4856488e2d8655a5 100644 (file)
@@ -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;
 };
 
index 6abb83432d4d710bb5e63322fbbb03f891ee4a5e..43704a48f20ce1c03a5903f6cceafbc75e0c1f1e 100644 (file)
@@ -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;
        }