From: Joonas Lahtinen Date: Mon, 11 Mar 2019 11:11:01 +0000 (+0200) Subject: Merge tag 'topic/hdr-formats-2019-03-07' of git://anongit.freedesktop.org/drm/drm... X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=3461cbfd34063a1cb17b0cd5b6112c3b2ca43f52;p=openwrt%2Fstaging%2Fblogic.git Merge tag 'topic/hdr-formats-2019-03-07' of git://anongit.freedesktop.org/drm/drm-misc into drm-intel-next-queued Add support for Y21x and Y41x to drm core and i915, and P01x support to i915. Signed-off-by: Joonas Lahtinen From: Maarten Lankhorst Link: https://patchwork.freedesktop.org/patch/msgid/f2485309-d645-bed4-95f4-e66ff312aa05@linux.intel.com --- 3461cbfd34063a1cb17b0cd5b6112c3b2ca43f52 diff --cc drivers/gpu/drm/i915/intel_atomic_plane.c index 7961cf0e6951,dd6c09699237..9d32a6fcf840 --- a/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);