mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
drm main pull request for v5.3-rc1 (sans mm changes)
-----BEGIN PGP SIGNATURE----- iQIcBAABAgAGBQJdLMSbAAoJEAx081l5xIa+udkP/iWr8mw44tWYb8Wuzc/aR91v 02X/J4S9XTQttNn/1Gpq9ItTLMf0Gc08tk1wEBBHAWi/qGaGZS2al+rv0afeuuQa aFhQzioDi7K/YZt92iEJhdx7wVMyydICTg3INmYlSP7/FyzLp6gBQRGSJ1kX5mHZ qWsFZgUOH9V5evyB6fDMleDaqFOKfcwrD7XYwbOheL/HeYQSv5AYn3VBupBFQ76L 0hclI5VzZQ5V0nnqRTNDQVA9Yl6NTl+2eXTn5vuBtwKXEI6JJw8eihZp2oZDXqfS L441w7wGbkRPzN5kjMZjs1ToPMTlMveR5kL6Sc+o3DT/HmIr1odeaSDXR/93UOLd z0CRJ6xMC8h1ThLNHp8UgbxCKqIwYPsY2wVqjsJt7lDY5jma7Yv2YJ9ocYGHN/sO DVHcU6ugbwvuC5wZZtVZl5J4hjnBZwNRGSVK+iM0tkjalgdEuSFehXT7eQ8SphF/ yI5gD1xNEwGfZ4bvZ3u/QrDCcpUAgPIUYmxEa2tPJILQWOJ9O87yc0y9Z21k9Ef1 9yDqrFV3sPqC2xj/0ufZG/18+Yt99Ykg1jQE3RGDwD/59KAeqPbOvqTKyVODV9jE qje6ScSIc2G0713uss2bcaD3k+rCB5YL2JkKrk5OWW/T2+n9T+JFaiNh7dnSFFcU gBKyeY24OyCDMwXrby0K =SI+Y -----END PGP SIGNATURE----- Merge tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm Pull drm updates from Dave Airlie: "The biggest thing in this is the AMD Navi GPU support, this again contains a bunch of header files that are large. These are the new AMD RX5700 GPUs that just recently became available. New drivers: - ST-Ericsson MCDE driver - Ingenic JZ47xx SoC UAPI change: - HDR source metadata property Core: - HDR inforframes and EDID parsing - drm hdmi infoframe unpacking - remove prime sg_table caching into dma-buf - New gem vram helpers to reduce driver code - Lots of drmP.h removal - reservation fencing fix - documentation updates - drm_fb_helper_connector removed - mode name command handler rewrite fbcon: - Remove the fbcon notifiers ttm: - forward progress fixes dma-buf: - make mmap call optional - debugfs refcount fixes - dma-fence free with pending signals fix - each dma-buf gets an inode Panels: - Lots of additional panel bindings amdgpu: - initial navi10 support - avoid hw reset - HDR metadata support - new thermal sensors for vega asics - RAS fixes - use HMM rather than MMU notifier - xgmi topology via kfd - SR-IOV fixes - driver reload fixes - DC use a core bpc attribute - Aux fixes for DC - Bandwidth calc updates for DC - Clock handling refactor - kfd VEGAM support vmwgfx: - Coherent memory support changes i915: - HDR Support - HDMI i2c link - Icelake multi-segmented gamma support - GuC firmware update - Mule Creek Canyon PCH support for EHL - EHL platform updtes - move i915.alpha_support to i915.force_probe - runtime PM refactoring - VBT parsing refactoring - DSI fixes - struct mutex dependency reduction - GEM code reorg mali-dp: - Komeda driver features msm: - dsi vs EPROBE_DEFER fixes - msm8998 snapdragon 835 support - a540 gpu support - mdp5 and dpu interconnect support exynos: - drmP.h removal tegra: - misc fixes tda998x: - audio support improvements - pixel repeated mode support - quantisation range handling corrections - HDMI vendor info fix armada: - interlace support fix - overlay/video plane register handling refactor - add gamma support rockchip: - RX3328 support panfrost: - expose perf counters via hidden ioctls vkms: - enumerate CRC sources list ast: - rework BO handling mgag200: - rework BO handling dw-hdmi: - suspend/resume support rcar-du: - R8A774A1 Soc Support - LVDS dual-link mode support - Additional formats - Misc fixes omapdrm: - DSI command mode display support stm - fb modifier support - runtime PM support sun4i: - use vmap ops vc4: - binner bo binding rework v3d: - compute shader support - resync/sync fixes - job management refactoring lima: - NULL pointer in irq handler fix - scheduler default timeout virtio: - fence seqno support - trace events bochs: - misc fixes tc458767: - IRQ/HDP handling sii902x: - HDMI audio support atmel-hlcdc: - misc fixes meson: - zpos support" * tag 'drm-next-2019-07-16' of git://anongit.freedesktop.org/drm/drm: (1815 commits) Revert "Merge branch 'vmwgfx-next' of git://people.freedesktop.org/~thomash/linux into drm-next" Revert "mm: adjust apply_to_pfn_range interface for dropped token." mm: adjust apply_to_pfn_range interface for dropped token. drm/amdgpu/navi10: add uclk activity sensor drm/amdgpu: properly guard the generic discovery code drm/amdgpu: add missing documentation on new module parameters drm/amdgpu: don't invalidate caches in RELEASE_MEM, only do the writeback drm/amd/display: avoid 64-bit division drm/amdgpu/psp11: simplify the ucode register logic drm/amdgpu: properly guard DC support in navi code drm/amd/powerplay: vega20: fix uninitialized variable use drm/amd/display: dcn20: include linux/delay.h amdgpu: make pmu support optional drm/amd/powerplay: Zero initialize current_rpm in vega20_get_fan_speed_percent drm/amd/powerplay: Zero initialize freq in smu_v11_0_get_current_clk_freq drm/amd/powerplay: Use memset to initialize metrics structs drm/amdgpu/mes10.1: Fix header guard drm/amd/powerplay: add temperature sensor support for navi10 drm/amdgpu: fix scheduler timeout calc drm/amdgpu: Prepare for hmm_range_register API change (v2) ...
This commit is contained in:
Linus Torvalds
commit
be8454afc5
1567 changed files with 475671 additions and 34502 deletions
|
|
@ -650,6 +650,150 @@ hdmi_vendor_any_infoframe_check_only(const union hdmi_vendor_any_infoframe *fram
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* hdmi_drm_infoframe_init() - initialize an HDMI Dynaminc Range and
|
||||
* mastering infoframe
|
||||
* @frame: HDMI DRM infoframe
|
||||
*
|
||||
* Returns 0 on success or a negative error code on failure.
|
||||
*/
|
||||
int hdmi_drm_infoframe_init(struct hdmi_drm_infoframe *frame)
|
||||
{
|
||||
memset(frame, 0, sizeof(*frame));
|
||||
|
||||
frame->type = HDMI_INFOFRAME_TYPE_DRM;
|
||||
frame->version = 1;
|
||||
frame->length = HDMI_DRM_INFOFRAME_SIZE;
|
||||
|
||||
return 0;
|
||||
}
|
||||
EXPORT_SYMBOL(hdmi_drm_infoframe_init);
|
||||
|
||||
static int hdmi_drm_infoframe_check_only(const struct hdmi_drm_infoframe *frame)
|
||||
{
|
||||
if (frame->type != HDMI_INFOFRAME_TYPE_DRM ||
|
||||
frame->version != 1)
|
||||
return -EINVAL;
|
||||
|
||||
if (frame->length != HDMI_DRM_INFOFRAME_SIZE)
|
||||
return -EINVAL;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* hdmi_drm_infoframe_check() - check a HDMI DRM infoframe
|
||||
* @frame: HDMI DRM infoframe
|
||||
*
|
||||
* Validates that the infoframe is consistent.
|
||||
* Returns 0 on success or a negative error code on failure.
|
||||
*/
|
||||
int hdmi_drm_infoframe_check(struct hdmi_drm_infoframe *frame)
|
||||
{
|
||||
return hdmi_drm_infoframe_check_only(frame);
|
||||
}
|
||||
EXPORT_SYMBOL(hdmi_drm_infoframe_check);
|
||||
|
||||
/**
|
||||
* hdmi_drm_infoframe_pack_only() - write HDMI DRM infoframe to binary buffer
|
||||
* @frame: HDMI DRM infoframe
|
||||
* @buffer: destination buffer
|
||||
* @size: size of buffer
|
||||
*
|
||||
* Packs the information contained in the @frame structure into a binary
|
||||
* representation that can be written into the corresponding controller
|
||||
* registers. Also computes the checksum as required by section 5.3.5 of
|
||||
* the HDMI 1.4 specification.
|
||||
*
|
||||
* Returns the number of bytes packed into the binary buffer or a negative
|
||||
* error code on failure.
|
||||
*/
|
||||
ssize_t hdmi_drm_infoframe_pack_only(const struct hdmi_drm_infoframe *frame,
|
||||
void *buffer, size_t size)
|
||||
{
|
||||
u8 *ptr = buffer;
|
||||
size_t length;
|
||||
int i;
|
||||
|
||||
length = HDMI_INFOFRAME_HEADER_SIZE + frame->length;
|
||||
|
||||
if (size < length)
|
||||
return -ENOSPC;
|
||||
|
||||
memset(buffer, 0, size);
|
||||
|
||||
ptr[0] = frame->type;
|
||||
ptr[1] = frame->version;
|
||||
ptr[2] = frame->length;
|
||||
ptr[3] = 0; /* checksum */
|
||||
|
||||
/* start infoframe payload */
|
||||
ptr += HDMI_INFOFRAME_HEADER_SIZE;
|
||||
|
||||
*ptr++ = frame->eotf;
|
||||
*ptr++ = frame->metadata_type;
|
||||
|
||||
for (i = 0; i < 3; i++) {
|
||||
*ptr++ = frame->display_primaries[i].x;
|
||||
*ptr++ = frame->display_primaries[i].x >> 8;
|
||||
*ptr++ = frame->display_primaries[i].y;
|
||||
*ptr++ = frame->display_primaries[i].y >> 8;
|
||||
}
|
||||
|
||||
*ptr++ = frame->white_point.x;
|
||||
*ptr++ = frame->white_point.x >> 8;
|
||||
|
||||
*ptr++ = frame->white_point.y;
|
||||
*ptr++ = frame->white_point.y >> 8;
|
||||
|
||||
*ptr++ = frame->max_display_mastering_luminance;
|
||||
*ptr++ = frame->max_display_mastering_luminance >> 8;
|
||||
|
||||
*ptr++ = frame->min_display_mastering_luminance;
|
||||
*ptr++ = frame->min_display_mastering_luminance >> 8;
|
||||
|
||||
*ptr++ = frame->max_cll;
|
||||
*ptr++ = frame->max_cll >> 8;
|
||||
|
||||
*ptr++ = frame->max_fall;
|
||||
*ptr++ = frame->max_fall >> 8;
|
||||
|
||||
hdmi_infoframe_set_checksum(buffer, length);
|
||||
|
||||
return length;
|
||||
}
|
||||
EXPORT_SYMBOL(hdmi_drm_infoframe_pack_only);
|
||||
|
||||
/**
|
||||
* hdmi_drm_infoframe_pack() - check a HDMI DRM infoframe,
|
||||
* and write it to binary buffer
|
||||
* @frame: HDMI DRM infoframe
|
||||
* @buffer: destination buffer
|
||||
* @size: size of buffer
|
||||
*
|
||||
* Validates that the infoframe is consistent and updates derived fields
|
||||
* (eg. length) based on other fields, after which it packs the information
|
||||
* contained in the @frame structure into a binary representation that
|
||||
* can be written into the corresponding controller registers. This function
|
||||
* also computes the checksum as required by section 5.3.5 of the HDMI 1.4
|
||||
* specification.
|
||||
*
|
||||
* Returns the number of bytes packed into the binary buffer or a negative
|
||||
* error code on failure.
|
||||
*/
|
||||
ssize_t hdmi_drm_infoframe_pack(struct hdmi_drm_infoframe *frame,
|
||||
void *buffer, size_t size)
|
||||
{
|
||||
int ret;
|
||||
|
||||
ret = hdmi_drm_infoframe_check(frame);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
return hdmi_drm_infoframe_pack_only(frame, buffer, size);
|
||||
}
|
||||
EXPORT_SYMBOL(hdmi_drm_infoframe_pack);
|
||||
|
||||
/*
|
||||
* hdmi_vendor_any_infoframe_check() - check a vendor infoframe
|
||||
*/
|
||||
|
|
@ -758,6 +902,10 @@ hdmi_infoframe_pack_only(const union hdmi_infoframe *frame, void *buffer, size_t
|
|||
length = hdmi_avi_infoframe_pack_only(&frame->avi,
|
||||
buffer, size);
|
||||
break;
|
||||
case HDMI_INFOFRAME_TYPE_DRM:
|
||||
length = hdmi_drm_infoframe_pack_only(&frame->drm,
|
||||
buffer, size);
|
||||
break;
|
||||
case HDMI_INFOFRAME_TYPE_SPD:
|
||||
length = hdmi_spd_infoframe_pack_only(&frame->spd,
|
||||
buffer, size);
|
||||
|
|
@ -806,6 +954,9 @@ hdmi_infoframe_pack(union hdmi_infoframe *frame,
|
|||
case HDMI_INFOFRAME_TYPE_AVI:
|
||||
length = hdmi_avi_infoframe_pack(&frame->avi, buffer, size);
|
||||
break;
|
||||
case HDMI_INFOFRAME_TYPE_DRM:
|
||||
length = hdmi_drm_infoframe_pack(&frame->drm, buffer, size);
|
||||
break;
|
||||
case HDMI_INFOFRAME_TYPE_SPD:
|
||||
length = hdmi_spd_infoframe_pack(&frame->spd, buffer, size);
|
||||
break;
|
||||
|
|
@ -838,6 +989,8 @@ static const char *hdmi_infoframe_type_get_name(enum hdmi_infoframe_type type)
|
|||
return "Source Product Description (SPD)";
|
||||
case HDMI_INFOFRAME_TYPE_AUDIO:
|
||||
return "Audio";
|
||||
case HDMI_INFOFRAME_TYPE_DRM:
|
||||
return "Dynamic Range and Mastering";
|
||||
}
|
||||
return "Reserved";
|
||||
}
|
||||
|
|
@ -1038,12 +1191,6 @@ hdmi_content_type_get_name(enum hdmi_content_type content_type)
|
|||
return "Invalid";
|
||||
}
|
||||
|
||||
/**
|
||||
* hdmi_avi_infoframe_log() - log info of HDMI AVI infoframe
|
||||
* @level: logging level
|
||||
* @dev: device
|
||||
* @frame: HDMI AVI infoframe
|
||||
*/
|
||||
static void hdmi_avi_infoframe_log(const char *level,
|
||||
struct device *dev,
|
||||
const struct hdmi_avi_infoframe *frame)
|
||||
|
|
@ -1115,12 +1262,6 @@ static const char *hdmi_spd_sdi_get_name(enum hdmi_spd_sdi sdi)
|
|||
return "Reserved";
|
||||
}
|
||||
|
||||
/**
|
||||
* hdmi_spd_infoframe_log() - log info of HDMI SPD infoframe
|
||||
* @level: logging level
|
||||
* @dev: device
|
||||
* @frame: HDMI SPD infoframe
|
||||
*/
|
||||
static void hdmi_spd_infoframe_log(const char *level,
|
||||
struct device *dev,
|
||||
const struct hdmi_spd_infoframe *frame)
|
||||
|
|
@ -1251,12 +1392,6 @@ hdmi_audio_coding_type_ext_get_name(enum hdmi_audio_coding_type_ext ctx)
|
|||
return "Reserved";
|
||||
}
|
||||
|
||||
/**
|
||||
* hdmi_audio_infoframe_log() - log info of HDMI AUDIO infoframe
|
||||
* @level: logging level
|
||||
* @dev: device
|
||||
* @frame: HDMI AUDIO infoframe
|
||||
*/
|
||||
static void hdmi_audio_infoframe_log(const char *level,
|
||||
struct device *dev,
|
||||
const struct hdmi_audio_infoframe *frame)
|
||||
|
|
@ -1284,6 +1419,34 @@ static void hdmi_audio_infoframe_log(const char *level,
|
|||
frame->downmix_inhibit ? "Yes" : "No");
|
||||
}
|
||||
|
||||
static void hdmi_drm_infoframe_log(const char *level,
|
||||
struct device *dev,
|
||||
const struct hdmi_drm_infoframe *frame)
|
||||
{
|
||||
int i;
|
||||
|
||||
hdmi_infoframe_log_header(level, dev,
|
||||
(struct hdmi_any_infoframe *)frame);
|
||||
hdmi_log("length: %d\n", frame->length);
|
||||
hdmi_log("metadata type: %d\n", frame->metadata_type);
|
||||
hdmi_log("eotf: %d\n", frame->eotf);
|
||||
for (i = 0; i < 3; i++) {
|
||||
hdmi_log("x[%d]: %d\n", i, frame->display_primaries[i].x);
|
||||
hdmi_log("y[%d]: %d\n", i, frame->display_primaries[i].y);
|
||||
}
|
||||
|
||||
hdmi_log("white point x: %d\n", frame->white_point.x);
|
||||
hdmi_log("white point y: %d\n", frame->white_point.y);
|
||||
|
||||
hdmi_log("max_display_mastering_luminance: %d\n",
|
||||
frame->max_display_mastering_luminance);
|
||||
hdmi_log("min_display_mastering_luminance: %d\n",
|
||||
frame->min_display_mastering_luminance);
|
||||
|
||||
hdmi_log("max_cll: %d\n", frame->max_cll);
|
||||
hdmi_log("max_fall: %d\n", frame->max_fall);
|
||||
}
|
||||
|
||||
static const char *
|
||||
hdmi_3d_structure_get_name(enum hdmi_3d_structure s3d_struct)
|
||||
{
|
||||
|
|
@ -1313,12 +1476,6 @@ hdmi_3d_structure_get_name(enum hdmi_3d_structure s3d_struct)
|
|||
return "Reserved";
|
||||
}
|
||||
|
||||
/**
|
||||
* hdmi_vendor_infoframe_log() - log info of HDMI VENDOR infoframe
|
||||
* @level: logging level
|
||||
* @dev: device
|
||||
* @frame: HDMI VENDOR infoframe
|
||||
*/
|
||||
static void
|
||||
hdmi_vendor_any_infoframe_log(const char *level,
|
||||
struct device *dev,
|
||||
|
|
@ -1372,6 +1529,9 @@ void hdmi_infoframe_log(const char *level,
|
|||
case HDMI_INFOFRAME_TYPE_VENDOR:
|
||||
hdmi_vendor_any_infoframe_log(level, dev, &frame->vendor);
|
||||
break;
|
||||
case HDMI_INFOFRAME_TYPE_DRM:
|
||||
hdmi_drm_infoframe_log(level, dev, &frame->drm);
|
||||
break;
|
||||
}
|
||||
}
|
||||
EXPORT_SYMBOL(hdmi_infoframe_log);
|
||||
|
|
@ -1614,6 +1774,70 @@ hdmi_vendor_any_infoframe_unpack(union hdmi_vendor_any_infoframe *frame,
|
|||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* hdmi_drm_infoframe_unpack() - unpack binary buffer to a HDMI DRM infoframe
|
||||
* @frame: HDMI DRM infoframe
|
||||
* @buffer: source buffer
|
||||
* @size: size of buffer
|
||||
*
|
||||
* Unpacks the information contained in binary @buffer into a structured
|
||||
* @frame of the HDMI Dynamic Range and Mastering (DRM) information frame.
|
||||
* Also verifies the checksum as required by section 5.3.5 of the HDMI 1.4
|
||||
* specification.
|
||||
*
|
||||
* Returns 0 on success or a negative error code on failure.
|
||||
*/
|
||||
static int hdmi_drm_infoframe_unpack(struct hdmi_drm_infoframe *frame,
|
||||
const void *buffer, size_t size)
|
||||
{
|
||||
const u8 *ptr = buffer;
|
||||
const u8 *temp;
|
||||
u8 x_lsb, x_msb;
|
||||
u8 y_lsb, y_msb;
|
||||
int ret;
|
||||
int i;
|
||||
|
||||
if (size < HDMI_INFOFRAME_SIZE(DRM))
|
||||
return -EINVAL;
|
||||
|
||||
if (ptr[0] != HDMI_INFOFRAME_TYPE_DRM ||
|
||||
ptr[1] != 1 ||
|
||||
ptr[2] != HDMI_DRM_INFOFRAME_SIZE)
|
||||
return -EINVAL;
|
||||
|
||||
if (hdmi_infoframe_checksum(buffer, HDMI_INFOFRAME_SIZE(DRM)) != 0)
|
||||
return -EINVAL;
|
||||
|
||||
ret = hdmi_drm_infoframe_init(frame);
|
||||
if (ret)
|
||||
return ret;
|
||||
|
||||
ptr += HDMI_INFOFRAME_HEADER_SIZE;
|
||||
|
||||
frame->eotf = ptr[0] & 0x7;
|
||||
frame->metadata_type = ptr[1] & 0x7;
|
||||
|
||||
temp = ptr + 2;
|
||||
for (i = 0; i < 3; i++) {
|
||||
x_lsb = *temp++;
|
||||
x_msb = *temp++;
|
||||
frame->display_primaries[i].x = (x_msb << 8) | x_lsb;
|
||||
y_lsb = *temp++;
|
||||
y_msb = *temp++;
|
||||
frame->display_primaries[i].y = (y_msb << 8) | y_lsb;
|
||||
}
|
||||
|
||||
frame->white_point.x = (ptr[15] << 8) | ptr[14];
|
||||
frame->white_point.y = (ptr[17] << 8) | ptr[16];
|
||||
|
||||
frame->max_display_mastering_luminance = (ptr[19] << 8) | ptr[18];
|
||||
frame->min_display_mastering_luminance = (ptr[21] << 8) | ptr[20];
|
||||
frame->max_cll = (ptr[23] << 8) | ptr[22];
|
||||
frame->max_fall = (ptr[25] << 8) | ptr[24];
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* hdmi_infoframe_unpack() - unpack binary buffer to a HDMI infoframe
|
||||
* @frame: HDMI infoframe
|
||||
|
|
@ -1640,6 +1864,9 @@ int hdmi_infoframe_unpack(union hdmi_infoframe *frame,
|
|||
case HDMI_INFOFRAME_TYPE_AVI:
|
||||
ret = hdmi_avi_infoframe_unpack(&frame->avi, buffer, size);
|
||||
break;
|
||||
case HDMI_INFOFRAME_TYPE_DRM:
|
||||
ret = hdmi_drm_infoframe_unpack(&frame->drm, buffer, size);
|
||||
break;
|
||||
case HDMI_INFOFRAME_TYPE_SPD:
|
||||
ret = hdmi_spd_infoframe_unpack(&frame->spd, buffer, size);
|
||||
break;
|
||||
|
|
|
|||
Loading…
Reference in a new issue