mirror of
https://github.com/AuxXxilium/linux_dsm_epyc7002.git
synced 2024-12-21 09:34:51 +07:00
76ea0f334e
UAPI Changes: - drm/vc4: Expose performance counters to userspace (Boris) Cross-subsystem Changes: - MAINTAINERS: Linus to maintain panel-arm-versatile in -misc (Linus) Core Changes: - Only use swiotlb when necessary (Chunming) Driver Changes: - drm/panel: Add support for ARM Versatile panels (Linus) - pl111: Improvements around versatile panel support (Linus) ---------------------------------------- Tagged on 2018-02-06: drm-misc-next for 4.17: UAPI Changes: - Validate mode flags + type (Ville) - Deprecate unused mode flags PIXMUX, BCAST (Ville) - Deprecate unused mode types BUILTIN, CRTC_C, CLOCK_C, DEFAULT (Ville) Cross-subsystem Changes: - MAINTAINERS: s/Daniel/Maarten/ for drm-misc (Daniel) Core Changes: - gem: Export gem functions for drivers to use (Samuel) - bridge: Introduce bridge timings in drm_bridge (Linus) - dma-buf: Allow exclusive fence to be bundled in fence array when calling reservation_object_get_fences_rcu (Christian) - dp: Add training pattern 4 and HBR3 support to dp helpers (Manasi) - fourcc: Add alpha bit to formats to avoid driver format LUTs (Maxime) - mode: Various cleanups + add new device-wide .mode_valid hook (Ville) - atomic: Fix state leak when non-blocking commits fail (Leo) NOTE: IIRC, this was cross-picked to -fixes so it might fall out - crc: Allow polling on the data fd (Maarten) Driver Changes: - bridge/vga-dac: Add THS8134* support (Linus) - tinydrm: Various MIPI DBI improvements/cleanups (Noralf) - bridge/dw-mipi-dsi: Cleanups + use create_packet helper (Brian) - drm/sun4i: Add Display Engine frontend support (Maxime) - drm/sun4i: Add zpos support + increase num planes from 2 to 4 (Maxime) - various: Use drm_mode_get_hv_timing() to fill plane clip rectangle (Ville) - stm: Add 8-bit clut support, add dsi phy v1.31 support, +fixes (Phillipe) Cc: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Chunming Zhou <david1.zhou@amd.com> Cc: Samuel Li <Samuel.Li@amd.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Noralf Trønnes <noralf@tronnes.org> Cc: Brian Norris <briannorris@chromium.org> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Cc: Christian König <christian.koenig@amd.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Philippe Cornu <philippe.cornu@st.com> Cc: Leo (Sunpeng) Li <sunpeng.li@amd.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> -----BEGIN PGP SIGNATURE----- iQEzBAABCAAdFiEEfxcpfMSgdnQMs+QqlvcN/ahKBwoFAlqDUjcACgkQlvcN/ahK Bwp83Af8D805yWeS/rJ9pLaiaWmfuymMtZVl/IOEssElxFO4d+ya/S4HrcWJQwX6 KinIQiaytKKe3+TXhVRVVwg7nLBFXzaPey6SvFPCgSEa+Bm+b3v0Uk1ll59UfOzs /IhwIYIvUSCqTVAccpoT8X/85JUQ3iP41RbdfbBwUtpvL+XLl/y29Pw1dtV71ZCH I3/5zAk3odLd9LuPkyhtg+V1e8pluKlPVGZ0ElOiZ7HlKzc3ekOLNNj563LBHq8y b2txi2+h/bfBx7PU5JfP6aOKGGameE79/3UExwW0dJJAHqU728KKs/7OaDu7w0vr UlH0cY/Zc461ejPldXXx8hoKIxJ3bw== =5EUv -----END PGP SIGNATURE----- Merge tag 'drm-misc-next-2018-02-13' of git://anongit.freedesktop.org/drm/drm-misc into drm-next drm-misc-next for 4.17: UAPI Changes: - drm/vc4: Expose performance counters to userspace (Boris) Cross-subsystem Changes: - MAINTAINERS: Linus to maintain panel-arm-versatile in -misc (Linus) Core Changes: - Only use swiotlb when necessary (Chunming) Driver Changes: - drm/panel: Add support for ARM Versatile panels (Linus) - pl111: Improvements around versatile panel support (Linus) ---------------------------------------- Tagged on 2018-02-06: drm-misc-next for 4.17: UAPI Changes: - Validate mode flags + type (Ville) - Deprecate unused mode flags PIXMUX, BCAST (Ville) - Deprecate unused mode types BUILTIN, CRTC_C, CLOCK_C, DEFAULT (Ville) Cross-subsystem Changes: - MAINTAINERS: s/Daniel/Maarten/ for drm-misc (Daniel) Core Changes: - gem: Export gem functions for drivers to use (Samuel) - bridge: Introduce bridge timings in drm_bridge (Linus) - dma-buf: Allow exclusive fence to be bundled in fence array when calling reservation_object_get_fences_rcu (Christian) - dp: Add training pattern 4 and HBR3 support to dp helpers (Manasi) - fourcc: Add alpha bit to formats to avoid driver format LUTs (Maxime) - mode: Various cleanups + add new device-wide .mode_valid hook (Ville) - atomic: Fix state leak when non-blocking commits fail (Leo) NOTE: IIRC, this was cross-picked to -fixes so it might fall out - crc: Allow polling on the data fd (Maarten) Driver Changes: - bridge/vga-dac: Add THS8134* support (Linus) - tinydrm: Various MIPI DBI improvements/cleanups (Noralf) - bridge/dw-mipi-dsi: Cleanups + use create_packet helper (Brian) - drm/sun4i: Add Display Engine frontend support (Maxime) - drm/sun4i: Add zpos support + increase num planes from 2 to 4 (Maxime) - various: Use drm_mode_get_hv_timing() to fill plane clip rectangle (Ville) - stm: Add 8-bit clut support, add dsi phy v1.31 support, +fixes (Phillipe) Cc: Boris Brezillon <boris.brezillon@free-electrons.com> Cc: Chunming Zhou <david1.zhou@amd.com> Cc: Samuel Li <Samuel.Li@amd.com> Cc: Linus Walleij <linus.walleij@linaro.org> Cc: Noralf Trønnes <noralf@tronnes.org> Cc: Brian Norris <briannorris@chromium.org> Cc: Maxime Ripard <maxime.ripard@free-electrons.com> Cc: Ville Syrjala <ville.syrjala@linux.intel.com> Cc: Christian König <christian.koenig@amd.com> Cc: Manasi Navare <manasi.d.navare@intel.com> Cc: Philippe Cornu <philippe.cornu@st.com> Cc: Leo (Sunpeng) Li <sunpeng.li@amd.com> Cc: Daniel Vetter <daniel.vetter@ffwll.ch> Cc: Maarten Lankhorst <maarten.lankhorst@linux.intel.com> * tag 'drm-misc-next-2018-02-13' of git://anongit.freedesktop.org/drm/drm-misc: (115 commits) drm/radeon: only enable swiotlb path when need v2 drm/amdgpu: only enable swiotlb alloc when need v2 drm: add func to get max iomem address v2 drm/vc4: Expose performance counters to userspace drm: Print the pid when debug logging an ioctl error. drm/stm: ltdc: remove non-alpha color formats on layer 2 for older hw drm/stm: ltdc: add non-alpha color formats drm/bridge/synopsys: dsi: Add 1.31 version support drm/bridge/synopsys: dsi: Add read feature drm/pl111: Support multiple endpoints on the CLCD drm/pl111: Support variants with broken VBLANK drm/pl111: Support variants with broken clock divider drm/pl111: Handle the Versatile RGB/BGR565 mode drm/pl111: Properly detect the ARM PL110 variants drm/panel: Add support for ARM Versatile panels drm/panel: Device tree bindings for ARM Versatile panels drm/bridge: Rename argument from crtc to bridge drm/crc: Add support for polling on the data fd. drm/sun4i: Use drm_mode_get_hv_timing() to populate plane clip rectangle drm/rcar-du: Use drm_mode_get_hv_timing() to populate plane clip rectangle ...
299 lines
9.2 KiB
C
299 lines
9.2 KiB
C
/*
|
|
* Copyright © 2014 Intel Corporation
|
|
*
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
* to deal in the Software without restriction, including without limitation
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
*
|
|
* The above copyright notice and this permission notice (including the next
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
* Software.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
|
* DEALINGS IN THE SOFTWARE.
|
|
*/
|
|
|
|
/**
|
|
* DOC: atomic plane helpers
|
|
*
|
|
* The functions here are used by the atomic plane helper functions to
|
|
* implement legacy plane updates (i.e., drm_plane->update_plane() and
|
|
* drm_plane->disable_plane()). This allows plane updates to use the
|
|
* atomic state infrastructure and perform plane updates as separate
|
|
* prepare/check/commit/cleanup steps.
|
|
*/
|
|
|
|
#include <drm/drmP.h>
|
|
#include <drm/drm_atomic_helper.h>
|
|
#include <drm/drm_plane_helper.h>
|
|
#include "intel_drv.h"
|
|
|
|
/**
|
|
* intel_create_plane_state - create plane state object
|
|
* @plane: drm plane
|
|
*
|
|
* Allocates a fresh plane state for the given plane and sets some of
|
|
* the state values to sensible initial values.
|
|
*
|
|
* Returns: A newly allocated plane state, or NULL on failure
|
|
*/
|
|
struct intel_plane_state *
|
|
intel_create_plane_state(struct drm_plane *plane)
|
|
{
|
|
struct intel_plane_state *state;
|
|
|
|
state = kzalloc(sizeof(*state), GFP_KERNEL);
|
|
if (!state)
|
|
return NULL;
|
|
|
|
state->base.plane = plane;
|
|
state->base.rotation = DRM_MODE_ROTATE_0;
|
|
|
|
return state;
|
|
}
|
|
|
|
/**
|
|
* intel_plane_duplicate_state - duplicate plane state
|
|
* @plane: drm plane
|
|
*
|
|
* Allocates and returns a copy of the plane state (both common and
|
|
* Intel-specific) for the specified plane.
|
|
*
|
|
* Returns: The newly allocated plane state, or NULL on failure.
|
|
*/
|
|
struct drm_plane_state *
|
|
intel_plane_duplicate_state(struct drm_plane *plane)
|
|
{
|
|
struct drm_plane_state *state;
|
|
struct intel_plane_state *intel_state;
|
|
|
|
intel_state = kmemdup(plane->state, sizeof(*intel_state), GFP_KERNEL);
|
|
|
|
if (!intel_state)
|
|
return NULL;
|
|
|
|
state = &intel_state->base;
|
|
|
|
__drm_atomic_helper_plane_duplicate_state(plane, state);
|
|
|
|
intel_state->vma = NULL;
|
|
|
|
return state;
|
|
}
|
|
|
|
/**
|
|
* intel_plane_destroy_state - destroy plane state
|
|
* @plane: drm plane
|
|
* @state: state object to destroy
|
|
*
|
|
* Destroys the plane state (both common and Intel-specific) for the
|
|
* specified plane.
|
|
*/
|
|
void
|
|
intel_plane_destroy_state(struct drm_plane *plane,
|
|
struct drm_plane_state *state)
|
|
{
|
|
WARN_ON(to_intel_plane_state(state)->vma);
|
|
|
|
drm_atomic_helper_plane_destroy_state(plane, state);
|
|
}
|
|
|
|
int intel_plane_atomic_check_with_state(const struct intel_crtc_state *old_crtc_state,
|
|
struct intel_crtc_state *crtc_state,
|
|
const struct intel_plane_state *old_plane_state,
|
|
struct intel_plane_state *intel_state)
|
|
{
|
|
struct drm_plane *plane = intel_state->base.plane;
|
|
struct drm_i915_private *dev_priv = to_i915(plane->dev);
|
|
struct drm_plane_state *state = &intel_state->base;
|
|
struct intel_plane *intel_plane = to_intel_plane(plane);
|
|
const struct drm_display_mode *adjusted_mode =
|
|
&crtc_state->base.adjusted_mode;
|
|
int ret;
|
|
|
|
/*
|
|
* Both crtc and plane->crtc could be NULL if we're updating a
|
|
* property while the plane is disabled. We don't actually have
|
|
* anything driver-specific we need to test in that case, so
|
|
* just return success.
|
|
*/
|
|
if (!intel_state->base.crtc && !old_plane_state->base.crtc)
|
|
return 0;
|
|
|
|
if (state->fb && drm_rotation_90_or_270(state->rotation)) {
|
|
struct drm_format_name_buf format_name;
|
|
|
|
if (state->fb->modifier != I915_FORMAT_MOD_Y_TILED &&
|
|
state->fb->modifier != I915_FORMAT_MOD_Yf_TILED) {
|
|
DRM_DEBUG_KMS("Y/Yf tiling required for 90/270!\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
/*
|
|
* 90/270 is not allowed with RGB64 16:16:16:16,
|
|
* RGB 16-bit 5:6:5, and Indexed 8-bit.
|
|
* TBD: Add RGB64 case once its added in supported format list.
|
|
*/
|
|
switch (state->fb->format->format) {
|
|
case DRM_FORMAT_C8:
|
|
case DRM_FORMAT_RGB565:
|
|
DRM_DEBUG_KMS("Unsupported pixel format %s for 90/270!\n",
|
|
drm_get_format_name(state->fb->format->format,
|
|
&format_name));
|
|
return -EINVAL;
|
|
|
|
default:
|
|
break;
|
|
}
|
|
}
|
|
|
|
/* CHV ignores the mirror bit when the rotate bit is set :( */
|
|
if (IS_CHERRYVIEW(dev_priv) &&
|
|
state->rotation & DRM_MODE_ROTATE_180 &&
|
|
state->rotation & DRM_MODE_REFLECT_X) {
|
|
DRM_DEBUG_KMS("Cannot rotate and reflect at the same time\n");
|
|
return -EINVAL;
|
|
}
|
|
|
|
intel_state->base.visible = false;
|
|
ret = intel_plane->check_plane(intel_plane, crtc_state, intel_state);
|
|
if (ret)
|
|
return ret;
|
|
|
|
/*
|
|
* Y-tiling is not supported in IF-ID Interlace mode in
|
|
* GEN9 and above.
|
|
*/
|
|
if (state->fb && INTEL_GEN(dev_priv) >= 9 && crtc_state->base.enable &&
|
|
adjusted_mode->flags & DRM_MODE_FLAG_INTERLACE) {
|
|
if (state->fb->modifier == I915_FORMAT_MOD_Y_TILED ||
|
|
state->fb->modifier == I915_FORMAT_MOD_Yf_TILED) {
|
|
DRM_DEBUG_KMS("Y/Yf tiling not supported in IF-ID mode\n");
|
|
return -EINVAL;
|
|
}
|
|
}
|
|
|
|
/* FIXME pre-g4x don't work like this */
|
|
if (intel_state->base.visible)
|
|
crtc_state->active_planes |= BIT(intel_plane->id);
|
|
else
|
|
crtc_state->active_planes &= ~BIT(intel_plane->id);
|
|
|
|
return intel_plane_atomic_calc_changes(old_crtc_state,
|
|
&crtc_state->base,
|
|
old_plane_state,
|
|
state);
|
|
}
|
|
|
|
static int intel_plane_atomic_check(struct drm_plane *plane,
|
|
struct drm_plane_state *new_plane_state)
|
|
{
|
|
struct drm_atomic_state *state = new_plane_state->state;
|
|
const struct drm_plane_state *old_plane_state =
|
|
drm_atomic_get_old_plane_state(state, plane);
|
|
struct drm_crtc *crtc = new_plane_state->crtc ?: old_plane_state->crtc;
|
|
const struct drm_crtc_state *old_crtc_state;
|
|
struct drm_crtc_state *new_crtc_state;
|
|
|
|
/*
|
|
* Both crtc and plane->crtc could be NULL if we're updating a
|
|
* property while the plane is disabled. We don't actually have
|
|
* anything driver-specific we need to test in that case, so
|
|
* just return success.
|
|
*/
|
|
if (!crtc)
|
|
return 0;
|
|
|
|
old_crtc_state = drm_atomic_get_old_crtc_state(state, crtc);
|
|
new_crtc_state = drm_atomic_get_new_crtc_state(state, crtc);
|
|
|
|
return intel_plane_atomic_check_with_state(to_intel_crtc_state(old_crtc_state),
|
|
to_intel_crtc_state(new_crtc_state),
|
|
to_intel_plane_state(old_plane_state),
|
|
to_intel_plane_state(new_plane_state));
|
|
}
|
|
|
|
static void intel_plane_atomic_update(struct drm_plane *plane,
|
|
struct drm_plane_state *old_state)
|
|
{
|
|
struct intel_atomic_state *state = to_intel_atomic_state(old_state->state);
|
|
struct intel_plane *intel_plane = to_intel_plane(plane);
|
|
const struct intel_plane_state *new_plane_state =
|
|
intel_atomic_get_new_plane_state(state, intel_plane);
|
|
struct drm_crtc *crtc = new_plane_state->base.crtc ?: old_state->crtc;
|
|
|
|
if (new_plane_state->base.visible) {
|
|
const struct intel_crtc_state *new_crtc_state =
|
|
intel_atomic_get_new_crtc_state(state, to_intel_crtc(crtc));
|
|
|
|
trace_intel_update_plane(plane,
|
|
to_intel_crtc(crtc));
|
|
|
|
intel_plane->update_plane(intel_plane,
|
|
new_crtc_state, new_plane_state);
|
|
} else {
|
|
trace_intel_disable_plane(plane,
|
|
to_intel_crtc(crtc));
|
|
|
|
intel_plane->disable_plane(intel_plane, to_intel_crtc(crtc));
|
|
}
|
|
}
|
|
|
|
const struct drm_plane_helper_funcs intel_plane_helper_funcs = {
|
|
.prepare_fb = intel_prepare_plane_fb,
|
|
.cleanup_fb = intel_cleanup_plane_fb,
|
|
.atomic_check = intel_plane_atomic_check,
|
|
.atomic_update = intel_plane_atomic_update,
|
|
};
|
|
|
|
/**
|
|
* intel_plane_atomic_get_property - fetch plane property value
|
|
* @plane: plane to fetch property for
|
|
* @state: state containing the property value
|
|
* @property: property to look up
|
|
* @val: pointer to write property value into
|
|
*
|
|
* The DRM core does not store shadow copies of properties for
|
|
* atomic-capable drivers. This entrypoint is used to fetch
|
|
* the current value of a driver-specific plane property.
|
|
*/
|
|
int
|
|
intel_plane_atomic_get_property(struct drm_plane *plane,
|
|
const struct drm_plane_state *state,
|
|
struct drm_property *property,
|
|
uint64_t *val)
|
|
{
|
|
DRM_DEBUG_KMS("Unknown plane property '%s'\n", property->name);
|
|
return -EINVAL;
|
|
}
|
|
|
|
/**
|
|
* intel_plane_atomic_set_property - set plane property value
|
|
* @plane: plane to set property for
|
|
* @state: state to update property value in
|
|
* @property: property to set
|
|
* @val: value to set property to
|
|
*
|
|
* Writes the specified property value for a plane into the provided atomic
|
|
* state object.
|
|
*
|
|
* Returns 0 on success, -EINVAL on unrecognized properties
|
|
*/
|
|
int
|
|
intel_plane_atomic_set_property(struct drm_plane *plane,
|
|
struct drm_plane_state *state,
|
|
struct drm_property *property,
|
|
uint64_t val)
|
|
{
|
|
DRM_DEBUG_KMS("Unknown plane property '%s'\n", property->name);
|
|
return -EINVAL;
|
|
}
|