Pull drm updates from Dave Airlie: "This is the main drm pull request for the 5.1 merge window. The big changes I'd highlight are: - nouveau has HMM support now, there is finally an in-tree user so we can quieten down the rip it out people. - i915 now enables fastboot by default on Skylake+ - Displayport Multistream support has been refactored and should hopefully be more reliable. Core: - header cleanups aiming towards removing drmP.h - dma-buf fence seqnos to 64-bits - common helper for DP mst hotplug for radeon,i915,amdgpu + new refcounting scheme - MST i2c improvements - drm_syncobj_cb removal - ARM FB compression fourcc - P010 + P016 fourcc - allwinner tiled format modifier - i2c over aux I2C_M_STOP support - DRM_AUTH handling fixes TTM: - ref/unref renaming New driver: - ARM komeda display driver scheduler: - refactor mirror list handling - rework hw fence processing - 0 run queue entity fix bridge: - TI DS90C185 LVDS bridge - thc631lvdm83d bridge improvements - cadence + allwinner DSI ported to generic phy panels: - Sitronix ST7701 panel - Kingdisplay KD097D04 - LeMaker BL035-RGB-002 - PDA 91-00156-A0 - Innolux EE101IA-01D i915: - Enable fastboot by default on SKL+/VLV/CHV - Export RPCS configuration for ICL media driver - Coffelake PCI ID - CNL clocks setup fixes - ACPI/PMIC support for MIPI/DSI - Per-engine WA init for all engines - Shrinker locking fixes - Kerneldoc updates - Lots of ring improvements and reset fixes - Coffeelake GVT Support - VFIO GVT EDID Region support - runtime PM wakeref tracking - ILK->IVB primary plane enable delays - userptr mutex locking fixes - DSI fixes - LVDS/TV cleanups - HW readout fixes - LUT robustness fixes - ICL display and watermark fixes - gem mmap race fix amdgpu: - add scheduled dependencies interface - DCC on scanout surfaces - vega10/20 BACO support - Multiple IH rings on soc15 - XGMI locking fixes - DC i2c/aux cleanups - runtime SMU debug interface - Kexec improvmeents - SR-IOV fixes - DC freesync + ABM fixes - GDS fixes - GPUVM fixes - vega20 PCIE DPM switching fixes - Context priority handling fixes radeon: - fix missing break in evergreen parser nouveau: - SVM support via HMM msm: - QCOM Compressed modifier support exynos: - s5pv210 rotator support imx: - zpos property support - pending update fixes v3d: - cache flush improvments vc4: - reflection support - HDMI overscan support tegra: - CEC refactoring - HDMI audio fixes - Tegra186 prep work - SOR crossbar device tree fixes sun4i: - implicit fencing support - YUV and scalar support improvements - A23 support - tiling fixes atmel-hlcdc: - clipping and rotation property fixes qxl: - BO and PRIME improvements - generic fbdev emulation dw-hdmi: - HDMI 2.0 2160p - YUV420 ouput rockchip: - implicit fencing support - reflection proerties virtio-gpu: - use generic fbdev emulation tilcdc: - cpufreq vs crtc init fix rcar-du: - R8A774C0 support - D3/E3 RGB output routing fixes and DPAD0 support - RA87744 LVDS support bochs: - atomic and generic fbdev emulation - ID mismatch error on bochs load meson: - remove firmware fbs" * tag 'drm-next-2019-03-06' of git://anongit.freedesktop.org/drm/drm: (1130 commits) drm/amd/display: Use vrr friendly pageflip throttling in DC. drm/imx: only send commit done event when all state has been applied drm/imx: allow building under COMPILE_TEST drm/imx: imx-tve: depend on COMMON_CLK drm/imx: ipuv3-plane: add zpos property drm/imx: ipuv3-plane: add function to query atomic update status gpu: ipu-v3: prg: add function to get channel configure status gpu: ipu-v3: pre: add double buffer status readback drm/amdgpu: Bump amdgpu version for context priority override. drm/amdgpu/powerplay: fix typo in BACO header guards drm/amdgpu/powerplay: fix return codes in BACO code drm/amdgpu: add missing license on baco files drm/bochs: Fix the ID mismatch error drm/nouveau/dmem: use dma addresses during migration copies drm/nouveau/dmem: use physical vram addresses during migration copies drm/nouveau/dmem: extend copy function to allow direct use of physical addresses drm/nouveau/svm: new ioctl to migrate process memory to GPU memory drm/nouveau/dmem: device memory helpers for SVM drm/nouveau/svm: initial support for shared virtual memory drm/nouveau: prepare for enabling svm with existing userspace interfaces ...
Showing the changes to include/linux (4 of 1141 files). Show all
Unified · Split
| @@ -40,6 +40,7 @@ struct dma_fence_array_cb { · 39 unmodified lines | ||
| 40 | 40 | * @num_fences: number of fences in the array |
| 41 | 41 | * @num_pending: fences in the array still pending |
| 42 | 42 | * @fences: array of the fences |
| 43 | + * @work: internal irq_work function | |
| 43 | 44 | */ |
| 44 | 45 | struct dma_fence_array { |
| 45 | 46 | struct dma_fence base; |
| @@ -77,7 +77,7 @@ struct dma_fence { · 76 unmodified lines | ||
| 77 | 77 | struct list_head cb_list; |
| 78 | 78 | spinlock_t *lock; |
| 79 | 79 | u64 context; |
| 80 | − unsigned seqno; | |
| 80 | + u64 seqno; | |
| 81 | 81 | unsigned long flags; |
| 82 | 82 | ktime_t timestamp; |
| 83 | 83 | int error; |
| @@ -244,7 +244,7 @@ struct dma_fence_ops { · 160 unmodified lines | ||
| 244 | 244 | }; |
| 245 | 245 | |
| 246 | 246 | void dma_fence_init(struct dma_fence *fence, const struct dma_fence_ops *ops, |
| 247 | − spinlock_t *lock, u64 context, unsigned seqno); | |
| 247 | + spinlock_t *lock, u64 context, u64 seqno); | |
| 248 | 248 | |
| 249 | 249 | void dma_fence_release(struct kref *kref); |
| 250 | 250 | void dma_fence_free(struct dma_fence *fence); |
| @@ -414,9 +414,17 @@ dma_fence_is_signaled(struct dma_fence *fence) · 163 unmodified lines | ||
| 414 | 414 | * Returns true if f1 is chronologically later than f2. Both fences must be |
| 415 | 415 | * from the same context, since a seqno is not common across contexts. |
| 416 | 416 | */ |
| 417 | −static inline bool __dma_fence_is_later(u32 f1, u32 f2) | |
| 417 | +static inline bool __dma_fence_is_later(u64 f1, u64 f2) | |
| 418 | 418 | { |
| 419 | − return (int)(f1 - f2) > 0; | |
| 419 | + /* This is for backward compatibility with drivers which can only handle | |
| 420 | + * 32bit sequence numbers. Use a 64bit compare when any of the higher | |
| 421 | + * bits are none zero, otherwise use a 32bit compare with wrap around | |
| 422 | + * handling. | |
| 423 | + */ | |
| 424 | + if (upper_32_bits(f1) || upper_32_bits(f2)) | |
| 425 | + return f1 > f2; | |
| 426 | + | |
| 427 | + return (int)(lower_32_bits(f1) - lower_32_bits(f2)) > 0; | |
| 420 | 428 | } |
| 421 | 429 | |
| 422 | 430 | /** |
| @@ -548,21 +556,21 @@ u64 dma_fence_context_alloc(unsigned num); · 125 unmodified lines | ||
| 548 | 556 | do { \ |
| 549 | 557 | struct dma_fence *__ff = (f); \ |
| 550 | 558 | if (IS_ENABLED(CONFIG_DMA_FENCE_TRACE)) \ |
| 551 | − pr_info("f %llu#%u: " fmt, \ | |
| 559 | + pr_info("f %llu#%llu: " fmt, \ | |
| 552 | 560 | __ff->context, __ff->seqno, ##args); \ |
| 553 | 561 | } while (0) |
| 554 | 562 | |
| 555 | 563 | #define DMA_FENCE_WARN(f, fmt, args...) \ |
| 556 | 564 | do { \ |
| 557 | 565 | struct dma_fence *__ff = (f); \ |
| 558 | − pr_warn("f %llu#%u: " fmt, __ff->context, __ff->seqno, \ | |
| 566 | + pr_warn("f %llu#%llu: " fmt, __ff->context, __ff->seqno,\ | |
| 559 | 567 | ##args); \ |
| 560 | 568 | } while (0) |
| 561 | 569 | |
| 562 | 570 | #define DMA_FENCE_ERR(f, fmt, args...) \ |
| 563 | 571 | do { \ |
| 564 | 572 | struct dma_fence *__ff = (f); \ |
| 565 | − pr_err("f %llu#%u: " fmt, __ff->context, __ff->seqno, \ | |
| 573 | + pr_err("f %llu#%llu: " fmt, __ff->context, __ff->seqno, \ | |
| 566 | 574 | ##args); \ |
| 567 | 575 | } while (0) |
| 568 | 576 | |
| @@ -27,6 +27,21 @@ · 26 unmodified lines | ||
| 27 | 27 | #include <linux/types.h> |
| 28 | 28 | #include <linux/device.h> |
| 29 | 29 | |
| 30 | +enum hdmi_packet_type { | |
| 31 | + HDMI_PACKET_TYPE_NULL = 0x00, | |
| 32 | + HDMI_PACKET_TYPE_AUDIO_CLOCK_REGEN = 0x01, | |
| 33 | + HDMI_PACKET_TYPE_AUDIO_SAMPLE = 0x02, | |
| 34 | + HDMI_PACKET_TYPE_GENERAL_CONTROL = 0x03, | |
| 35 | + HDMI_PACKET_TYPE_ACP = 0x04, | |
| 36 | + HDMI_PACKET_TYPE_ISRC1 = 0x05, | |
| 37 | + HDMI_PACKET_TYPE_ISRC2 = 0x06, | |
| 38 | + HDMI_PACKET_TYPE_ONE_BIT_AUDIO_SAMPLE = 0x07, | |
| 39 | + HDMI_PACKET_TYPE_DST_AUDIO = 0x08, | |
| 40 | + HDMI_PACKET_TYPE_HBR_AUDIO_STREAM = 0x09, | |
| 41 | + HDMI_PACKET_TYPE_GAMUT_METADATA = 0x0a, | |
| 42 | + /* + enum hdmi_infoframe_type */ | |
| 43 | +}; | |
| 44 | + | |
| 30 | 45 | enum hdmi_infoframe_type { |
| 31 | 46 | HDMI_INFOFRAME_TYPE_VENDOR = 0x81, |
| 32 | 47 | HDMI_INFOFRAME_TYPE_AVI = 0x82, |
| @@ -26,4 +26,7 @@ struct intel_soc_pmic { · 25 unmodified lines | ||
| 26 | 26 | struct device *dev; |
| 27 | 27 | }; |
| 28 | 28 | |
| 29 | +int intel_soc_pmic_exec_mipi_pmic_seq_element(u16 i2c_address, u32 reg_address, | |
| 30 | + u32 value, u32 mask); | |
| 31 | + | |
| 29 | 32 | #endif /* __INTEL_SOC_PMIC_H__ */ |