1ddd36eda1
Perhaps the most noteworthy change in this set is the implementation of a hardware VBLANK counter using host1x syncpoints. The SOR registers can now be dumped via debugfs, which can be useful while debugging. The IOVA address space maintained by the driver can also be dumped via debugfs. Other than than, these changes are mostly cleanup work, such as making register names more consistent or removing unused code (that was left over after the atomic mode-setting conversion). There's also a fix for eDP that makes the driver cope with firmware that already initialized the display (such as the firmware on the Tegra-based Chromebooks). -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAABCAAGBQJVHXUKAAoJEN0jrNd/PrOhjSUQAL9QJZBZmQmit1mroVWmWAx8 1m4/lj0bP3s1uOLzkQUwXJes0/niVie6lGmdZ9WCa3lThPErfvgYqKNpVJOYknMR iFg3HbEHgqz9T5zGNxp43g2hQrxssGEPAJXg4vE06nyS9YTOe0PZi27z9ynwapNZ Z+Gl2787mmnQE+PyQUQjT96OJv2ahnTgHtcDNMU0SWh5Dr6tI/vo5l/mHnqFOKnQ Kt/CCf+eNZ1jWCKqN5WYjxUT8kCMsMPPcnKzwhvrCXf6RqMDhr/rc47PGeak/qKR 0poIA47XlN6lPwul1P2gtyJaMiE7790aPKcgUDdpHJItPxbC9D/A8o8M+TcUqryw NHdKKEDxoo/yg+2x6ZgFk202UbVevp6cBtP+3nrfUAefPCrrkDX31ej6rWAUs7Zm POzugFON7q+85kF/yO1IEg1lov3zLIl4tCXNtprXUPFHbaBJJpMYK8joNyg2YZVh pYrV6AaKEwiVpi2h/kfhk/B32fx/KsufBR7fEPFOcJFQ6Gmi/l6GB+li00+LbrI4 8mDN6ngw7KASj03/RWXKSwGXdHqoMx2vtQPgjlNuGhHSgGzk3hZqapC7X+5WhoAw bOelbtzFABv8EA+vQN5IXd8SKdMPt4AFVGhk4B9HbZUyQLHln187p1tE1q9jSe/V D9bxrB3Wlf4Ks6Kl8OqU =HZO1 -----END PGP SIGNATURE----- Merge tag 'drm/tegra/for-4.1-rc1' of git://anongit.freedesktop.org/tegra/linux into drm-next drm/tegra: Changes for v4.1-rc1 Perhaps the most noteworthy change in this set is the implementation of a hardware VBLANK counter using host1x syncpoints. The SOR registers can now be dumped via debugfs, which can be useful while debugging. The IOVA address space maintained by the driver can also be dumped via debugfs. Other than than, these changes are mostly cleanup work, such as making register names more consistent or removing unused code (that was left over after the atomic mode-setting conversion). There's also a fix for eDP that makes the driver cope with firmware that already initialized the display (such as the firmware on the Tegra-based Chromebooks). * tag 'drm/tegra/for-4.1-rc1' of git://anongit.freedesktop.org/tegra/linux: drm/tegra: sor: Reset during initialization drm/tegra: gem: Return 64-bit offset for mmap(2) drm/tegra: hdmi: Name register fields consistently drm/tegra: hdmi: Resets are synchronous drm/tegra: dc: Document tegra_dc_state_setup_clock() drm/tegra: dc: Remove unused callbacks drm/tegra: dc: Remove unused function drm/tegra: dc: Use base atomic state helpers drm/atomic: Add helpers for state-subclassing drivers drm/tegra: dc: Implement hardware VBLANK counter gpu: host1x: Export host1x_syncpt_read() drm/tegra: sor: Dump registers via debugfs drm/tegra: sor: Registers are 32-bit drm/tegra: Provide debugfs file for the IOVA space drm/tegra: dc: Check for valid parent clock
183 lines
7.4 KiB
C
183 lines
7.4 KiB
C
/*
|
|
* Copyright (C) 2014 Red Hat
|
|
* Copyright (C) 2014 Intel Corp.
|
|
*
|
|
* 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 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 COPYRIGHT HOLDER(S) OR AUTHOR(S) 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.
|
|
*
|
|
* Authors:
|
|
* Rob Clark <robdclark@gmail.com>
|
|
* Daniel Vetter <daniel.vetter@ffwll.ch>
|
|
*/
|
|
|
|
#ifndef DRM_ATOMIC_HELPER_H_
|
|
#define DRM_ATOMIC_HELPER_H_
|
|
|
|
#include <drm/drm_crtc.h>
|
|
|
|
int drm_atomic_helper_check_modeset(struct drm_device *dev,
|
|
struct drm_atomic_state *state);
|
|
int drm_atomic_helper_check_planes(struct drm_device *dev,
|
|
struct drm_atomic_state *state);
|
|
int drm_atomic_helper_check(struct drm_device *dev,
|
|
struct drm_atomic_state *state);
|
|
int drm_atomic_helper_commit(struct drm_device *dev,
|
|
struct drm_atomic_state *state,
|
|
bool async);
|
|
|
|
void drm_atomic_helper_wait_for_vblanks(struct drm_device *dev,
|
|
struct drm_atomic_state *old_state);
|
|
|
|
void drm_atomic_helper_commit_modeset_disables(struct drm_device *dev,
|
|
struct drm_atomic_state *state);
|
|
void drm_atomic_helper_commit_modeset_enables(struct drm_device *dev,
|
|
struct drm_atomic_state *old_state);
|
|
|
|
int drm_atomic_helper_prepare_planes(struct drm_device *dev,
|
|
struct drm_atomic_state *state);
|
|
void drm_atomic_helper_commit_planes(struct drm_device *dev,
|
|
struct drm_atomic_state *state);
|
|
void drm_atomic_helper_cleanup_planes(struct drm_device *dev,
|
|
struct drm_atomic_state *old_state);
|
|
|
|
void drm_atomic_helper_swap_state(struct drm_device *dev,
|
|
struct drm_atomic_state *state);
|
|
|
|
/* implementations for legacy interfaces */
|
|
int drm_atomic_helper_update_plane(struct drm_plane *plane,
|
|
struct drm_crtc *crtc,
|
|
struct drm_framebuffer *fb,
|
|
int crtc_x, int crtc_y,
|
|
unsigned int crtc_w, unsigned int crtc_h,
|
|
uint32_t src_x, uint32_t src_y,
|
|
uint32_t src_w, uint32_t src_h);
|
|
int drm_atomic_helper_disable_plane(struct drm_plane *plane);
|
|
int drm_atomic_helper_set_config(struct drm_mode_set *set);
|
|
|
|
int drm_atomic_helper_crtc_set_property(struct drm_crtc *crtc,
|
|
struct drm_property *property,
|
|
uint64_t val);
|
|
int drm_atomic_helper_plane_set_property(struct drm_plane *plane,
|
|
struct drm_property *property,
|
|
uint64_t val);
|
|
int drm_atomic_helper_connector_set_property(struct drm_connector *connector,
|
|
struct drm_property *property,
|
|
uint64_t val);
|
|
int drm_atomic_helper_page_flip(struct drm_crtc *crtc,
|
|
struct drm_framebuffer *fb,
|
|
struct drm_pending_vblank_event *event,
|
|
uint32_t flags);
|
|
void drm_atomic_helper_connector_dpms(struct drm_connector *connector,
|
|
int mode);
|
|
|
|
/* default implementations for state handling */
|
|
void drm_atomic_helper_crtc_reset(struct drm_crtc *crtc);
|
|
void __drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc,
|
|
struct drm_crtc_state *state);
|
|
struct drm_crtc_state *
|
|
drm_atomic_helper_crtc_duplicate_state(struct drm_crtc *crtc);
|
|
void __drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
|
|
struct drm_crtc_state *state);
|
|
void drm_atomic_helper_crtc_destroy_state(struct drm_crtc *crtc,
|
|
struct drm_crtc_state *state);
|
|
|
|
void drm_atomic_helper_plane_reset(struct drm_plane *plane);
|
|
void __drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane,
|
|
struct drm_plane_state *state);
|
|
struct drm_plane_state *
|
|
drm_atomic_helper_plane_duplicate_state(struct drm_plane *plane);
|
|
void __drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,
|
|
struct drm_plane_state *state);
|
|
void drm_atomic_helper_plane_destroy_state(struct drm_plane *plane,
|
|
struct drm_plane_state *state);
|
|
|
|
void drm_atomic_helper_connector_reset(struct drm_connector *connector);
|
|
void
|
|
__drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector,
|
|
struct drm_connector_state *state);
|
|
struct drm_connector_state *
|
|
drm_atomic_helper_connector_duplicate_state(struct drm_connector *connector);
|
|
void
|
|
__drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
|
|
struct drm_connector_state *state);
|
|
void drm_atomic_helper_connector_destroy_state(struct drm_connector *connector,
|
|
struct drm_connector_state *state);
|
|
|
|
/**
|
|
* drm_atomic_crtc_for_each_plane - iterate over planes currently attached to CRTC
|
|
* @plane: the loop cursor
|
|
* @crtc: the crtc whose planes are iterated
|
|
*
|
|
* This iterates over the current state, useful (for example) when applying
|
|
* atomic state after it has been checked and swapped. To iterate over the
|
|
* planes which *will* be attached (for ->atomic_check()) see
|
|
* drm_crtc_for_each_pending_plane()
|
|
*/
|
|
#define drm_atomic_crtc_for_each_plane(plane, crtc) \
|
|
drm_for_each_plane_mask(plane, (crtc)->dev, (crtc)->state->plane_mask)
|
|
|
|
/**
|
|
* drm_crtc_atomic_state_for_each_plane - iterate over attached planes in new state
|
|
* @plane: the loop cursor
|
|
* @crtc_state: the incoming crtc-state
|
|
*
|
|
* Similar to drm_crtc_for_each_plane(), but iterates the planes that will be
|
|
* attached if the specified state is applied. Useful during (for example)
|
|
* ->atomic_check() operations, to validate the incoming state
|
|
*/
|
|
#define drm_atomic_crtc_state_for_each_plane(plane, crtc_state) \
|
|
drm_for_each_plane_mask(plane, (crtc_state)->state->dev, (crtc_state)->plane_mask)
|
|
|
|
/*
|
|
* drm_atomic_plane_disabling - check whether a plane is being disabled
|
|
* @plane: plane object
|
|
* @old_state: previous atomic state
|
|
*
|
|
* Checks the atomic state of a plane to determine whether it's being disabled
|
|
* or not. This also WARNs if it detects an invalid state (both CRTC and FB
|
|
* need to either both be NULL or both be non-NULL).
|
|
*
|
|
* RETURNS:
|
|
* True if the plane is being disabled, false otherwise.
|
|
*/
|
|
static inline bool
|
|
drm_atomic_plane_disabling(struct drm_plane *plane,
|
|
struct drm_plane_state *old_state)
|
|
{
|
|
/*
|
|
* When disabling a plane, CRTC and FB should always be NULL together.
|
|
* Anything else should be considered a bug in the atomic core, so we
|
|
* gently warn about it.
|
|
*/
|
|
WARN_ON((plane->state->crtc == NULL && plane->state->fb != NULL) ||
|
|
(plane->state->crtc != NULL && plane->state->fb == NULL));
|
|
|
|
/*
|
|
* When using the transitional helpers, old_state may be NULL. If so,
|
|
* we know nothing about the current state and have to assume that it
|
|
* might be enabled.
|
|
*
|
|
* When using the atomic helpers, old_state won't be NULL. Therefore
|
|
* this check assumes that either the driver will have reconstructed
|
|
* the correct state in ->reset() or that the driver will have taken
|
|
* appropriate measures to disable all planes.
|
|
*/
|
|
return (!old_state || old_state->crtc) && !plane->state->crtc;
|
|
}
|
|
|
|
#endif /* DRM_ATOMIC_HELPER_H_ */
|