Merge tag 'drm-intel-next-2019-03-20' of git://anongit.freedesktop.org/drm/drm-intel...
[sfrench/cifs-2.6.git] / drivers / gpu / drm / i915 / intel_display.c
index eadc639e99acd5bd1b0f95966b5dbde50cdf4ad5..8574c212b37c4a8b85f537e7511dfdb5af05932e 100644 (file)
@@ -2659,11 +2659,11 @@ int skl_format_to_fourcc(int format, bool rgb_order, bool alpha)
        case PLANE_CTL_FORMAT_Y216:
                return DRM_FORMAT_Y216;
        case PLANE_CTL_FORMAT_Y410:
-               return DRM_FORMAT_Y410;
+               return DRM_FORMAT_XVYU2101010;
        case PLANE_CTL_FORMAT_Y412:
-               return DRM_FORMAT_Y412;
+               return DRM_FORMAT_XVYU12_16161616;
        case PLANE_CTL_FORMAT_Y416:
-               return DRM_FORMAT_Y416;
+               return DRM_FORMAT_XVYU16161616;
        default:
        case PLANE_CTL_FORMAT_XRGB_8888:
                if (rgb_order) {
@@ -3617,11 +3617,11 @@ static u32 skl_plane_ctl_format(u32 pixel_format)
                return PLANE_CTL_FORMAT_Y212;
        case DRM_FORMAT_Y216:
                return PLANE_CTL_FORMAT_Y216;
-       case DRM_FORMAT_Y410:
+       case DRM_FORMAT_XVYU2101010:
                return PLANE_CTL_FORMAT_Y410;
-       case DRM_FORMAT_Y412:
+       case DRM_FORMAT_XVYU12_16161616:
                return PLANE_CTL_FORMAT_Y412;
-       case DRM_FORMAT_Y416:
+       case DRM_FORMAT_XVYU16161616:
                return PLANE_CTL_FORMAT_Y416;
        default:
                MISSING_CASE(pixel_format);
@@ -5178,9 +5178,9 @@ static int skl_update_scaler_plane(struct intel_crtc_state *crtc_state,
        case DRM_FORMAT_Y210:
        case DRM_FORMAT_Y212:
        case DRM_FORMAT_Y216:
-       case DRM_FORMAT_Y410:
-       case DRM_FORMAT_Y412:
-       case DRM_FORMAT_Y416:
+       case DRM_FORMAT_XVYU2101010:
+       case DRM_FORMAT_XVYU12_16161616:
+       case DRM_FORMAT_XVYU16161616:
                break;
        default:
                DRM_DEBUG_KMS("[PLANE:%d:%s] FB:%d unsupported scaling format 0x%x\n",