3 files changed, 12 insertions, 19 deletions

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 362a538cdedc..39a6bc69d223 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -68,10 +68,10 @@ DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
  */
 static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
 {
-        { DRM_MODE_SCALE_NON_GPU, "Non-GPU" },
-        { DRM_MODE_SCALE_FULLSCREEN, "Fullscreen" },
-        { DRM_MODE_SCALE_NO_SCALE, "No scale" },
-        { DRM_MODE_SCALE_ASPECT, "Aspect" },
+        { DRM_MODE_SCALE_NONE, "None" },
+        { DRM_MODE_SCALE_FULLSCREEN, "Full" },
+        { DRM_MODE_SCALE_CENTER, "Center" },
+        { DRM_MODE_SCALE_ASPECT, "Full aspect" },
 };
 
 static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index b59c65d19d81..5df486fbe056 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -38,14 +38,6 @@
 #include "i915_drv.h"
 #include <linux/acpi.h>
 
-/*
- * the following four scaling options are defined.
- * #define DRM_MODE_SCALE_NON_GPU       0
- * #define DRM_MODE_SCALE_FULLSCREEN    1
- * #define DRM_MODE_SCALE_NO_SCALE      2
- * #define DRM_MODE_SCALE_ASPECT        3
- */
-
 /* Private structure for the integrated LVDS support */
 struct intel_lvds_priv {
         int fitting_mode;
@@ -334,7 +326,7 @@ static bool intel_lvds_mode_fixup(struct drm_encoder *encoder,
         I915_WRITE(BCLRPAT_B, 0);
 
         switch (lvds_priv->fitting_mode) {
-        case DRM_MODE_SCALE_NO_SCALE:
+        case DRM_MODE_SCALE_CENTER:
                 /*
                  * For centered modes, we have to calculate border widths &
                  * heights and modify the values programmed into the CRTC.
@@ -670,8 +662,8 @@ static int intel_lvds_set_property(struct drm_connector *connector,
                                 connector->encoder) {
                 struct drm_crtc *crtc = connector->encoder->crtc;
                 struct intel_lvds_priv *lvds_priv = intel_output->dev_priv;
-                if (value == DRM_MODE_SCALE_NON_GPU) {
-                        DRM_DEBUG_KMS("non_GPU property is unsupported\n");
+                if (value == DRM_MODE_SCALE_NONE) {
+                        DRM_DEBUG_KMS("no scaling not supported\n");
                         return 0;
                 }
                 if (lvds_priv->fitting_mode == value) {
diff --git a/include/drm/drm_mode.h b/include/drm/drm_mode.h
index 616aeb42b773..1f908416aedb 100644
--- a/include/drm/drm_mode.h
+++ b/include/drm/drm_mode.h
@@ -68,10 +68,11 @@
 #define DRM_MODE_DPMS_OFF       3
 
 /* Scaling mode options */
-#define DRM_MODE_SCALE_NON_GPU          0
-#define DRM_MODE_SCALE_FULLSCREEN       1
-#define DRM_MODE_SCALE_NO_SCALE         2
-#define DRM_MODE_SCALE_ASPECT           3
+#define DRM_MODE_SCALE_NONE             0 /* Unmodified timing (display or
+                                             software can still scale) */
+#define DRM_MODE_SCALE_FULLSCREEN       1 /* Full screen, ignore aspect */
+#define DRM_MODE_SCALE_CENTER           2 /* Centered, no scaling */
+#define DRM_MODE_SCALE_ASPECT           3 /* Full screen, preserve aspect */
 
 /* Dithering mode options */
 #define DRM_MODE_DITHERING_OFF  0