Merge tag 'drm-for-v4.14' of git://people.freedesktop.org/~airlied/linux
Pull drm updates from Dave Airlie: "This is the main drm pull request for 4.14 merge window. I'm sending this early, as my continuing journey into fatherhood is occurring really soon now, I'm going to be mostly useless for the next couple of weeks, though I may be able to read email, I doubt I'll be doing much patch applications or git sending. If anything urgent pops up I've asked Daniel/Jani/Alex/Sean to try and direct stuff towards you. Outside drm changes: Some rcar-du updates that touch the V4L tree, all acks should be in place. It adds one export to the radix tree code for new i915 use case. There are some minor AGP cleanups (don't see that too often). Changes to the vbox driver in staging to avoid breaking compilation. Summary: core: - Atomic helper fixes - Atomic UAPI fixes - Add YCBCR 4:2:0 support - Drop set_busid hook - Refactor fb_helper locking - Remove a bunch of internal APIs - Add a bunch of better default handlers - Format modifier/blob plane property added - More internal header refactoring - Make more internal API names consistent - Enhanced syncobj APIs (wait/signal/reset/create signalled) bridge: - Add Synopsys Designware MIPI DSI host bridge driver tiny: - Add Pervasive Displays RePaper displays - Add support for LEGO MINDSTORMS EV3 LCD i915: - Lots of GEN10/CNL support patches - drm syncobj support - Skylake+ watermark refactoring - GVT vGPU 48-bit ppgtt support - GVT performance improvements - NOA change ioctl - CCS (color compression) scanout support - GPU reset improvements amdgpu: - Initial hugepage support - BO migration logic rework - Vega10 improvements - Powerplay fixes - Stop reprogramming the MC - Fixes for ACP audio on stoney - SR-IOV fixes/improvements - Command submission overhead improvements amdkfd: - Non-dGPU upstreaming patches - Scratch VA ioctl - Image tiling modes - Update PM4 headers for new firmware - Drop all BUG_ONs. nouveau: - GP108 modesetting support. - Disable MSI on big endian. vmwgfx: - Add fence fd support. msm: - Runtime PM improvements exynos: - NV12MT support - Refactor KMS drivers imx-drm: - Lock scanout channel to improve memory bw - Cleanups etnaviv: - GEM object population fixes tegra: - Prep work for Tegra186 support - PRIME mmap support sunxi: - HDMI support improvements - HDMI CEC support omapdrm: - HDMI hotplug IRQ support - Big driver cleanup - OMAP5 DSI support rcar-du: - vblank fixes - VSP1 updates arcgpu: - Minor fixes stm: - Add STM32 DSI controller driver dw_hdmi: - Add support for Rockchip RK3399 - HDMI CEC support atmel-hlcdc: - Add 8-bit color support vc4: - Atomic fixes - New ioctl to attach a label to a buffer object - HDMI CEC support - Allow userspace to dictate rendering order on submit ioctl" * tag 'drm-for-v4.14' of git://people.freedesktop.org/~airlied/linux: (1074 commits) drm/syncobj: Add a signal ioctl (v3) drm/syncobj: Add a reset ioctl (v3) drm/syncobj: Add a syncobj_array_find helper drm/syncobj: Allow wait for submit and signal behavior (v5) drm/syncobj: Add a CREATE_SIGNALED flag drm/syncobj: Add a callback mechanism for replace_fence (v3) drm/syncobj: add sync obj wait interface. (v8) i915: Use drm_syncobj_fence_get drm/syncobj: Add a race-free drm_syncobj_fence_get helper (v2) drm/syncobj: Rename fence_get to find_fence drm: kirin: Add mode_valid logic to avoid mode clocks we can't generate drm/vmwgfx: Bump the version for fence FD support drm/vmwgfx: Add export fence to file descriptor support drm/vmwgfx: Add support for imported Fence File Descriptor drm/vmwgfx: Prepare to support fence fd drm/vmwgfx: Fix incorrect command header offset at restart drm/vmwgfx: Support the NOP_ERROR command drm/vmwgfx: Restart command buffers after errors drm/vmwgfx: Move irq bottom half processing to threads drm/vmwgfx: Don't use drm_irq_[un]install ...
This commit is contained in:
Linus Torvalds
@@ -115,7 +115,7 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
|
||||
{
|
||||
struct drm_device *dev = state->dev;
|
||||
struct drm_plane *plane;
|
||||
struct drm_plane_state *old_plane_state;
|
||||
struct drm_plane_state *old_plane_state, *new_plane_state;
|
||||
bool plane_disabling = false;
|
||||
int i;
|
||||
|
||||
@@ -127,15 +127,15 @@ static void imx_drm_atomic_commit_tail(struct drm_atomic_state *state)
|
||||
|
||||
drm_atomic_helper_commit_modeset_enables(dev, state);
|
||||
|
||||
for_each_plane_in_state(state, plane, old_plane_state, i) {
|
||||
if (drm_atomic_plane_disabling(old_plane_state, plane->state))
|
||||
for_each_oldnew_plane_in_state(state, plane, old_plane_state, new_plane_state, i) {
|
||||
if (drm_atomic_plane_disabling(old_plane_state, new_plane_state))
|
||||
plane_disabling = true;
|
||||
}
|
||||
|
||||
if (plane_disabling) {
|
||||
drm_atomic_helper_wait_for_vblanks(dev, state);
|
||||
|
||||
for_each_plane_in_state(state, plane, old_plane_state, i)
|
||||
for_each_old_plane_in_state(state, plane, old_plane_state, i)
|
||||
ipu_plane_disable_deferred(plane);
|
||||
|
||||
}
|
||||
@@ -182,8 +182,6 @@ static struct drm_driver imx_drm_driver = {
|
||||
.gem_free_object_unlocked = drm_gem_cma_free_object,
|
||||
.gem_vm_ops = &drm_gem_cma_vm_ops,
|
||||
.dumb_create = drm_gem_cma_dumb_create,
|
||||
.dumb_map_offset = drm_gem_cma_dumb_map_offset,
|
||||
.dumb_destroy = drm_gem_dumb_destroy,
|
||||
|
||||
.prime_handle_to_fd = drm_gem_prime_handle_to_fd,
|
||||
.prime_fd_to_handle = drm_gem_prime_fd_to_handle,
|
||||
|
||||
@@ -389,7 +389,6 @@ static int imx_ldb_encoder_atomic_check(struct drm_encoder *encoder,
|
||||
|
||||
|
||||
static const struct drm_connector_funcs imx_ldb_connector_funcs = {
|
||||
.dpms = drm_atomic_helper_connector_dpms,
|
||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||
.destroy = imx_drm_connector_destroy,
|
||||
.reset = drm_atomic_helper_connector_reset,
|
||||
|
||||
@@ -341,7 +341,6 @@ static int imx_tve_atomic_check(struct drm_encoder *encoder,
|
||||
}
|
||||
|
||||
static const struct drm_connector_funcs imx_tve_connector_funcs = {
|
||||
.dpms = drm_atomic_helper_connector_dpms,
|
||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||
.destroy = imx_drm_connector_destroy,
|
||||
.reset = drm_atomic_helper_connector_reset,
|
||||
|
||||
@@ -50,7 +50,8 @@ static inline struct ipu_crtc *to_ipu_crtc(struct drm_crtc *crtc)
|
||||
return container_of(crtc, struct ipu_crtc, base);
|
||||
}
|
||||
|
||||
static void ipu_crtc_enable(struct drm_crtc *crtc)
|
||||
static void ipu_crtc_atomic_enable(struct drm_crtc *crtc,
|
||||
struct drm_crtc_state *old_state)
|
||||
{
|
||||
struct ipu_crtc *ipu_crtc = to_ipu_crtc(crtc);
|
||||
struct ipu_soc *ipu = dev_get_drvdata(ipu_crtc->dev->parent);
|
||||
@@ -293,7 +294,7 @@ static const struct drm_crtc_helper_funcs ipu_helper_funcs = {
|
||||
.atomic_check = ipu_crtc_atomic_check,
|
||||
.atomic_begin = ipu_crtc_atomic_begin,
|
||||
.atomic_disable = ipu_crtc_atomic_disable,
|
||||
.enable = ipu_crtc_enable,
|
||||
.atomic_enable = ipu_crtc_atomic_enable,
|
||||
};
|
||||
|
||||
static void ipu_put_resources(struct ipu_crtc *ipu_crtc)
|
||||
|
||||
@@ -496,6 +496,27 @@ static int ipu_chan_assign_axi_id(int ipu_chan)
|
||||
}
|
||||
}
|
||||
|
||||
static void ipu_calculate_bursts(u32 width, u32 cpp, u32 stride,
|
||||
u8 *burstsize, u8 *num_bursts)
|
||||
{
|
||||
const unsigned int width_bytes = width * cpp;
|
||||
unsigned int npb, bursts;
|
||||
|
||||
/* Maximum number of pixels per burst without overshooting stride */
|
||||
for (npb = 64 / cpp; npb > 0; --npb) {
|
||||
if (round_up(width_bytes, npb * cpp) <= stride)
|
||||
break;
|
||||
}
|
||||
*burstsize = npb;
|
||||
|
||||
/* Maximum number of consecutive bursts without overshooting stride */
|
||||
for (bursts = 8; bursts > 1; bursts /= 2) {
|
||||
if (round_up(width_bytes, npb * cpp * bursts) <= stride)
|
||||
break;
|
||||
}
|
||||
*num_bursts = bursts;
|
||||
}
|
||||
|
||||
static void ipu_plane_atomic_update(struct drm_plane *plane,
|
||||
struct drm_plane_state *old_state)
|
||||
{
|
||||
@@ -509,6 +530,9 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
|
||||
unsigned long alpha_eba = 0;
|
||||
enum ipu_color_space ics;
|
||||
unsigned int axi_id = 0;
|
||||
const struct drm_format_info *info;
|
||||
u8 burstsize, num_bursts;
|
||||
u32 width, height;
|
||||
int active;
|
||||
|
||||
if (ipu_plane->dp_flow == IPU_DP_FLOW_SYNC_FG)
|
||||
@@ -525,8 +549,8 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
|
||||
ipu_prg_channel_configure(ipu_plane->ipu_ch, axi_id,
|
||||
drm_rect_width(&state->src) >> 16,
|
||||
drm_rect_height(&state->src) >> 16,
|
||||
state->fb->pitches[0],
|
||||
state->fb->format->format, &eba);
|
||||
fb->pitches[0],
|
||||
fb->format->format, &eba);
|
||||
}
|
||||
|
||||
if (old_state->fb && !drm_atomic_crtc_needs_modeset(crtc_state)) {
|
||||
@@ -555,7 +579,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
|
||||
ipu_dp_setup_channel(ipu_plane->dp, ics,
|
||||
IPUV3_COLORSPACE_UNKNOWN);
|
||||
/* Enable local alpha on partial plane */
|
||||
switch (state->fb->format->format) {
|
||||
switch (fb->format->format) {
|
||||
case DRM_FORMAT_ARGB1555:
|
||||
case DRM_FORMAT_ABGR1555:
|
||||
case DRM_FORMAT_RGBA5551:
|
||||
@@ -581,15 +605,21 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
|
||||
|
||||
ipu_dmfc_config_wait4eot(ipu_plane->dmfc, drm_rect_width(dst));
|
||||
|
||||
width = drm_rect_width(&state->src) >> 16;
|
||||
height = drm_rect_height(&state->src) >> 16;
|
||||
info = drm_format_info(fb->format->format);
|
||||
ipu_calculate_bursts(width, info->cpp[0], fb->pitches[0],
|
||||
&burstsize, &num_bursts);
|
||||
|
||||
ipu_cpmem_zero(ipu_plane->ipu_ch);
|
||||
ipu_cpmem_set_resolution(ipu_plane->ipu_ch,
|
||||
drm_rect_width(&state->src) >> 16,
|
||||
drm_rect_height(&state->src) >> 16);
|
||||
ipu_cpmem_set_fmt(ipu_plane->ipu_ch, state->fb->format->format);
|
||||
ipu_cpmem_set_resolution(ipu_plane->ipu_ch, width, height);
|
||||
ipu_cpmem_set_fmt(ipu_plane->ipu_ch, fb->format->format);
|
||||
ipu_cpmem_set_burstsize(ipu_plane->ipu_ch, burstsize);
|
||||
ipu_cpmem_set_high_priority(ipu_plane->ipu_ch);
|
||||
ipu_idmac_set_double_buffer(ipu_plane->ipu_ch, 1);
|
||||
ipu_cpmem_set_stride(ipu_plane->ipu_ch, state->fb->pitches[0]);
|
||||
ipu_cpmem_set_stride(ipu_plane->ipu_ch, fb->pitches[0]);
|
||||
ipu_cpmem_set_axi_id(ipu_plane->ipu_ch, axi_id);
|
||||
|
||||
switch (fb->format->format) {
|
||||
case DRM_FORMAT_YUV420:
|
||||
case DRM_FORMAT_YVU420:
|
||||
@@ -629,6 +659,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
|
||||
case DRM_FORMAT_RGBX8888_A8:
|
||||
case DRM_FORMAT_BGRX8888_A8:
|
||||
alpha_eba = drm_plane_state_to_eba(state, 1);
|
||||
num_bursts = 0;
|
||||
|
||||
dev_dbg(ipu_plane->base.dev->dev, "phys = %lu %lu, x = %d, y = %d",
|
||||
eba, alpha_eba, state->src.x1 >> 16, state->src.y1 >> 16);
|
||||
@@ -642,8 +673,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
|
||||
ipu_cpmem_set_format_passthrough(ipu_plane->alpha_ch, 8);
|
||||
ipu_cpmem_set_high_priority(ipu_plane->alpha_ch);
|
||||
ipu_idmac_set_double_buffer(ipu_plane->alpha_ch, 1);
|
||||
ipu_cpmem_set_stride(ipu_plane->alpha_ch,
|
||||
state->fb->pitches[1]);
|
||||
ipu_cpmem_set_stride(ipu_plane->alpha_ch, fb->pitches[1]);
|
||||
ipu_cpmem_set_burstsize(ipu_plane->alpha_ch, 16);
|
||||
ipu_cpmem_set_buffer(ipu_plane->alpha_ch, 0, alpha_eba);
|
||||
ipu_cpmem_set_buffer(ipu_plane->alpha_ch, 1, alpha_eba);
|
||||
@@ -655,6 +685,7 @@ static void ipu_plane_atomic_update(struct drm_plane *plane,
|
||||
}
|
||||
ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 0, eba);
|
||||
ipu_cpmem_set_buffer(ipu_plane->ipu_ch, 1, eba);
|
||||
ipu_idmac_lock_enable(ipu_plane->ipu_ch, num_bursts);
|
||||
ipu_plane_enable(ipu_plane);
|
||||
}
|
||||
|
||||
@@ -673,7 +704,7 @@ int ipu_planes_assign_pre(struct drm_device *dev,
|
||||
int available_pres = ipu_prg_max_active_channels();
|
||||
int i;
|
||||
|
||||
for_each_plane_in_state(state, plane, plane_state, i) {
|
||||
for_each_new_plane_in_state(state, plane, plane_state, i) {
|
||||
struct ipu_plane_state *ipu_state =
|
||||
to_ipu_plane_state(plane_state);
|
||||
struct ipu_plane *ipu_plane = to_ipu_plane(plane);
|
||||
@@ -716,8 +747,8 @@ struct ipu_plane *ipu_plane_init(struct drm_device *dev, struct ipu_soc *ipu,
|
||||
|
||||
ret = drm_universal_plane_init(dev, &ipu_plane->base, possible_crtcs,
|
||||
&ipu_plane_funcs, ipu_plane_formats,
|
||||
ARRAY_SIZE(ipu_plane_formats), type,
|
||||
NULL);
|
||||
ARRAY_SIZE(ipu_plane_formats),
|
||||
NULL, type, NULL);
|
||||
if (ret) {
|
||||
DRM_ERROR("failed to initialize plane\n");
|
||||
kfree(ipu_plane);
|
||||
|
||||
@@ -135,7 +135,6 @@ static int imx_pd_encoder_atomic_check(struct drm_encoder *encoder,
|
||||
}
|
||||
|
||||
static const struct drm_connector_funcs imx_pd_connector_funcs = {
|
||||
.dpms = drm_atomic_helper_connector_dpms,
|
||||
.fill_modes = drm_helper_probe_single_connector_modes,
|
||||
.destroy = imx_drm_connector_destroy,
|
||||
.reset = drm_atomic_helper_connector_reset,
|
||||
|
||||
Reference in New Issue
Block a user