Merge tag 'topic/hdr-formats-2019-03-07' of git://anongit.freedesktop.org/drm/drm...

Add support for Y21x and Y41x to drm core and i915, and P01x support to i915.

Signed-off-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/f2485309-d645-bed4-95f4-e66ff312aa05@linux.intel.com

diff --cc drivers/gpu/drm/i915/i915_reg.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_atomic_plane.c
index 7961cf0e695160e23686663c20c21cad63d337ed,dd6c096992373af6724e07d9a98725464dacc6d0..9d32a6fcf8408a07e9e0f33295485cac03d5491b
--- 1/drivers/gpu/drm/i915/intel_atomic_plane.c
--- 2/drivers/gpu/drm/i915/intel_atomic_plane.c
+++ b/drivers/gpu/drm/i915/intel_atomic_plane.c
@@@ -136,13 -135,9 +136,13 @@@ int intel_plane_atomic_check_with_state
                new_crtc_state->active_planes |= BIT(plane->id);
  
        if (new_plane_state->base.visible &&
-           new_plane_state->base.fb->format->format == DRM_FORMAT_NV12)
+           is_planar_yuv_format(new_plane_state->base.fb->format->format))
                new_crtc_state->nv12_planes |= BIT(plane->id);
  
 +      if (new_plane_state->base.visible &&
 +          new_plane_state->base.fb->format->format == DRM_FORMAT_C8)
 +              new_crtc_state->c8_planes |= BIT(plane->id);
 +
        if (new_plane_state->base.visible || old_plane_state->base.visible)
                new_crtc_state->update_planes |= BIT(plane->id);
  

diff --cc drivers/gpu/drm/i915/intel_display.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_drv.h
Simple merge

diff --cc drivers/gpu/drm/i915/intel_pm.c
Simple merge

diff --cc drivers/gpu/drm/i915/intel_sprite.c
Simple merge