Merge tag 'drm-misc-next-2018-07-18' of git://anongit.freedesktop.org/drm/drm-misc into drm-next
drm-misc-next for 4.19: Core Changes: - add support for DisplayPort CEC-Tunneling-over-AUX (Hans Verkuil) - more doc updates (Daniel Vetter) - fourcc: Add is_yuv field to drm_format_info (Ayan Kumar Halder) - dma-buf: correctly place BUG_ON (Michel Dänzer) Driver Changes: - more vkms support(Rodrigo Siqueira) - many fixes and small improments to all drivers Signed-off-by: Dave Airlie <airlied@redhat.com> Link: https://patchwork.freedesktop.org/patch/msgid/20180718200826.GA20165@juma
This commit is contained in:
@@ -41,20 +41,6 @@
|
||||
#include <drm/i915_drm.h>
|
||||
#include "i915_drv.h"
|
||||
|
||||
bool intel_format_is_yuv(u32 format)
|
||||
{
|
||||
switch (format) {
|
||||
case DRM_FORMAT_YUYV:
|
||||
case DRM_FORMAT_UYVY:
|
||||
case DRM_FORMAT_VYUY:
|
||||
case DRM_FORMAT_YVYU:
|
||||
case DRM_FORMAT_NV12:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
int intel_usecs_to_scanlines(const struct drm_display_mode *adjusted_mode,
|
||||
int usecs)
|
||||
{
|
||||
@@ -416,7 +402,7 @@ chv_update_csc(const struct intel_plane_state *plane_state)
|
||||
const s16 *csc = csc_matrix[plane_state->base.color_encoding];
|
||||
|
||||
/* Seems RGB data bypasses the CSC always */
|
||||
if (!intel_format_is_yuv(fb->format->format))
|
||||
if (!fb->format->is_yuv)
|
||||
return;
|
||||
|
||||
I915_WRITE_FW(SPCSCYGOFF(plane_id), SPCSC_OOFF(0) | SPCSC_IOFF(0));
|
||||
@@ -451,7 +437,7 @@ vlv_update_clrc(const struct intel_plane_state *plane_state)
|
||||
enum plane_id plane_id = plane->id;
|
||||
int contrast, brightness, sh_scale, sh_sin, sh_cos;
|
||||
|
||||
if (intel_format_is_yuv(fb->format->format) &&
|
||||
if (fb->format->is_yuv &&
|
||||
plane_state->base.color_range == DRM_COLOR_YCBCR_LIMITED_RANGE) {
|
||||
/*
|
||||
* Expand limited range to full range:
|
||||
@@ -1052,7 +1038,7 @@ intel_check_sprite_plane(struct intel_plane *plane,
|
||||
src->y1 = src_y << 16;
|
||||
src->y2 = (src_y + src_h) << 16;
|
||||
|
||||
if (intel_format_is_yuv(fb->format->format) &&
|
||||
if (fb->format->is_yuv &&
|
||||
fb->format->format != DRM_FORMAT_NV12 &&
|
||||
(src_x % 2 || src_w % 2)) {
|
||||
DRM_DEBUG_KMS("src x/w (%u, %u) must be a multiple of 2 for YUV planes\n",
|
||||
|
Reference in New Issue
Block a user