2008-11-07 15:05:41 -07:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2006-2008 Intel Corporation
|
|
|
|
* Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
|
|
|
|
*
|
|
|
|
* DRM core CRTC related functions
|
|
|
|
*
|
|
|
|
* Permission to use, copy, modify, distribute, and sell this software and its
|
|
|
|
* documentation for any purpose is hereby granted without fee, provided that
|
|
|
|
* the above copyright notice appear in all copies and that both that copyright
|
|
|
|
* notice and this permission notice appear in supporting documentation, and
|
|
|
|
* that the name of the copyright holders not be used in advertising or
|
|
|
|
* publicity pertaining to distribution of the software without specific,
|
|
|
|
* written prior permission. The copyright holders make no representations
|
|
|
|
* about the suitability of this software for any purpose. It is provided "as
|
|
|
|
* is" without express or implied warranty.
|
|
|
|
*
|
|
|
|
* THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
|
|
|
|
* INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
|
|
|
|
* EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY SPECIAL, INDIRECT OR
|
|
|
|
* CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
|
|
|
|
* DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
|
|
|
|
* TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE
|
|
|
|
* OF THIS SOFTWARE.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Keith Packard
|
|
|
|
* Eric Anholt <eric@anholt.net>
|
|
|
|
* Dave Airlie <airlied@linux.ie>
|
|
|
|
* Jesse Barnes <jesse.barnes@intel.com>
|
|
|
|
*/
|
|
|
|
|
2014-05-11 16:30:48 -06:00
|
|
|
#include <linux/kernel.h>
|
2011-08-30 16:16:33 -06:00
|
|
|
#include <linux/export.h>
|
2011-08-31 09:29:09 -06:00
|
|
|
#include <linux/moduleparam.h>
|
2011-08-30 16:16:33 -06:00
|
|
|
|
2012-10-02 11:01:07 -06:00
|
|
|
#include <drm/drmP.h>
|
2014-11-04 14:57:27 -07:00
|
|
|
#include <drm/drm_atomic.h>
|
2012-10-02 11:01:07 -06:00
|
|
|
#include <drm/drm_crtc.h>
|
|
|
|
#include <drm/drm_fourcc.h>
|
|
|
|
#include <drm/drm_crtc_helper.h>
|
|
|
|
#include <drm/drm_fb_helper.h>
|
2014-10-29 04:13:47 -06:00
|
|
|
#include <drm/drm_plane_helper.h>
|
2014-11-04 14:57:27 -07:00
|
|
|
#include <drm/drm_atomic_helper.h>
|
2012-10-02 11:01:07 -06:00
|
|
|
#include <drm/drm_edid.h>
|
2008-11-07 15:05:41 -07:00
|
|
|
|
2014-11-06 12:53:29 -07:00
|
|
|
/**
|
|
|
|
* DOC: overview
|
|
|
|
*
|
|
|
|
* The CRTC modeset helper library provides a default set_config implementation
|
|
|
|
* in drm_crtc_helper_set_config(). Plus a few other convenience functions using
|
|
|
|
* the same callbacks which drivers can use to e.g. restore the modeset
|
|
|
|
* configuration on resume with drm_helper_resume_force_mode().
|
|
|
|
*
|
2015-12-04 01:45:46 -07:00
|
|
|
* Note that this helper library doesn't track the current power state of CRTCs
|
|
|
|
* and encoders. It can call callbacks like ->dpms() even though the hardware is
|
|
|
|
* already in the desired state. This deficiency has been fixed in the atomic
|
|
|
|
* helpers.
|
|
|
|
*
|
2014-11-06 12:53:29 -07:00
|
|
|
* The driver callbacks are mostly compatible with the atomic modeset helpers,
|
|
|
|
* except for the handling of the primary plane: Atomic helpers require that the
|
|
|
|
* primary plane is implemented as a real standalone plane and not directly tied
|
|
|
|
* to the CRTC state. For easier transition this library provides functions to
|
|
|
|
* implement the old semantics required by the CRTC helpers using the new plane
|
|
|
|
* and atomic helper callbacks.
|
|
|
|
*
|
|
|
|
* Drivers are strongly urged to convert to the atomic helpers (by way of first
|
|
|
|
* converting to the plane helpers). New drivers must not use these functions
|
|
|
|
* but need to implement the atomic interface instead, potentially using the
|
|
|
|
* atomic helpers for that.
|
2015-12-04 01:45:44 -07:00
|
|
|
*
|
|
|
|
* These legacy modeset helpers use the same function table structures as
|
|
|
|
* all other modesetting helpers. See the documentation for struct
|
|
|
|
* &drm_crtc_helper_funcs, struct &drm_encoder_helper_funcs and struct
|
|
|
|
* &drm_connector_helper_funcs.
|
2014-11-06 12:53:29 -07:00
|
|
|
*/
|
2013-10-08 09:44:47 -06:00
|
|
|
MODULE_AUTHOR("David Airlie, Jesse Barnes");
|
|
|
|
MODULE_DESCRIPTION("DRM KMS helper");
|
|
|
|
MODULE_LICENSE("GPL and additional rights");
|
|
|
|
|
2012-11-01 07:45:16 -06:00
|
|
|
/**
|
|
|
|
* drm_helper_move_panel_connectors_to_head() - move panels to the front in the
|
|
|
|
* connector list
|
|
|
|
* @dev: drm device to operate on
|
|
|
|
*
|
|
|
|
* Some userspace presumes that the first connected connector is the main
|
|
|
|
* display, where it's supposed to display e.g. the login screen. For
|
|
|
|
* laptops, this should be the main panel. Use this function to sort all
|
|
|
|
* (eDP/LVDS) panels to the front of the connector list, instead of
|
|
|
|
* painstakingly trying to initialize them in the right order.
|
|
|
|
*/
|
2012-10-27 07:52:04 -06:00
|
|
|
void drm_helper_move_panel_connectors_to_head(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_connector *connector, *tmp;
|
|
|
|
struct list_head panel_list;
|
|
|
|
|
|
|
|
INIT_LIST_HEAD(&panel_list);
|
|
|
|
|
|
|
|
list_for_each_entry_safe(connector, tmp,
|
|
|
|
&dev->mode_config.connector_list, head) {
|
|
|
|
if (connector->connector_type == DRM_MODE_CONNECTOR_LVDS ||
|
|
|
|
connector->connector_type == DRM_MODE_CONNECTOR_eDP)
|
|
|
|
list_move_tail(&connector->head, &panel_list);
|
|
|
|
}
|
|
|
|
|
|
|
|
list_splice(&panel_list, &dev->mode_config.connector_list);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_helper_move_panel_connectors_to_head);
|
|
|
|
|
2009-05-30 21:42:28 -06:00
|
|
|
/**
|
|
|
|
* drm_helper_encoder_in_use - check if a given encoder is in use
|
|
|
|
* @encoder: encoder to check
|
|
|
|
*
|
2014-01-23 14:58:26 -07:00
|
|
|
* Checks whether @encoder is with the current mode setting output configuration
|
|
|
|
* in use by any connector. This doesn't mean that it is actually enabled since
|
|
|
|
* the DPMS state is tracked separately.
|
2009-05-30 21:42:28 -06:00
|
|
|
*
|
2014-01-23 14:58:26 -07:00
|
|
|
* Returns:
|
|
|
|
* True if @encoder is used, false otherwise.
|
2009-05-30 21:42:28 -06:00
|
|
|
*/
|
|
|
|
bool drm_helper_encoder_in_use(struct drm_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_connector *connector;
|
|
|
|
struct drm_device *dev = encoder->dev;
|
2014-01-23 14:18:47 -07:00
|
|
|
|
2014-05-11 16:30:48 -06:00
|
|
|
/*
|
|
|
|
* We can expect this mutex to be locked if we are not panicking.
|
|
|
|
* Locking is currently fubar in the panic handler.
|
|
|
|
*/
|
2014-06-05 04:28:59 -06:00
|
|
|
if (!oops_in_progress) {
|
2014-05-11 16:30:48 -06:00
|
|
|
WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
|
2014-06-05 04:28:59 -06:00
|
|
|
WARN_ON(!drm_modeset_is_locked(&dev->mode_config.connection_mutex));
|
|
|
|
}
|
2014-05-11 16:30:48 -06:00
|
|
|
|
2015-07-09 15:44:34 -06:00
|
|
|
drm_for_each_connector(connector, dev)
|
2009-05-30 21:42:28 -06:00
|
|
|
if (connector->encoder == encoder)
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_helper_encoder_in_use);
|
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
/**
|
|
|
|
* drm_helper_crtc_in_use - check if a given CRTC is in a mode_config
|
|
|
|
* @crtc: CRTC to check
|
|
|
|
*
|
2014-01-23 14:58:26 -07:00
|
|
|
* Checks whether @crtc is with the current mode setting output configuration
|
|
|
|
* in use by any connector. This doesn't mean that it is actually enabled since
|
|
|
|
* the DPMS state is tracked separately.
|
2008-11-07 15:05:41 -07:00
|
|
|
*
|
2014-01-23 14:58:26 -07:00
|
|
|
* Returns:
|
|
|
|
* True if @crtc is used, false otherwise.
|
2008-11-07 15:05:41 -07:00
|
|
|
*/
|
|
|
|
bool drm_helper_crtc_in_use(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_encoder *encoder;
|
|
|
|
struct drm_device *dev = crtc->dev;
|
2014-01-23 14:18:47 -07:00
|
|
|
|
2014-05-11 16:30:48 -06:00
|
|
|
/*
|
|
|
|
* We can expect this mutex to be locked if we are not panicking.
|
|
|
|
* Locking is currently fubar in the panic handler.
|
|
|
|
*/
|
|
|
|
if (!oops_in_progress)
|
|
|
|
WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
|
|
|
|
|
2015-07-09 15:44:35 -06:00
|
|
|
drm_for_each_encoder(encoder, dev)
|
2009-05-30 21:42:28 -06:00
|
|
|
if (encoder->crtc == crtc && drm_helper_encoder_in_use(encoder))
|
2008-11-07 15:05:41 -07:00
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_helper_crtc_in_use);
|
|
|
|
|
2010-07-01 00:49:57 -06:00
|
|
|
static void
|
|
|
|
drm_encoder_disable(struct drm_encoder *encoder)
|
|
|
|
{
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
|
2010-07-01 00:49:57 -06:00
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
drm_bridge_disable(encoder->bridge);
|
2013-08-14 14:47:37 -06:00
|
|
|
|
2010-07-01 00:49:57 -06:00
|
|
|
if (encoder_funcs->disable)
|
|
|
|
(*encoder_funcs->disable)(encoder);
|
|
|
|
else
|
|
|
|
(*encoder_funcs->dpms)(encoder, DRM_MODE_DPMS_OFF);
|
2013-08-14 14:47:37 -06:00
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
drm_bridge_post_disable(encoder->bridge);
|
2010-07-01 00:49:57 -06:00
|
|
|
}
|
|
|
|
|
2014-03-20 07:26:34 -06:00
|
|
|
static void __drm_helper_disable_unused_functions(struct drm_device *dev)
|
2008-11-07 15:05:41 -07:00
|
|
|
{
|
|
|
|
struct drm_encoder *encoder;
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
|
2014-01-23 14:18:47 -07:00
|
|
|
drm_warn_on_modeset_not_all_locked(dev);
|
|
|
|
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2010-12-20 19:47:56 -07:00
|
|
|
if (!drm_helper_encoder_in_use(encoder)) {
|
2010-07-01 00:49:57 -06:00
|
|
|
drm_encoder_disable(encoder);
|
2014-05-24 12:30:10 -06:00
|
|
|
/* disconnect encoder from any connector */
|
2009-09-01 22:00:11 -06:00
|
|
|
encoder->crtc = NULL;
|
2009-08-30 23:16:30 -06:00
|
|
|
}
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_crtc(crtc, dev) {
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
|
2008-11-07 15:05:41 -07:00
|
|
|
crtc->enabled = drm_helper_crtc_in_use(crtc);
|
|
|
|
if (!crtc->enabled) {
|
2010-06-11 15:04:35 -06:00
|
|
|
if (crtc_funcs->disable)
|
|
|
|
(*crtc_funcs->disable)(crtc);
|
|
|
|
else
|
|
|
|
(*crtc_funcs->dpms)(crtc, DRM_MODE_DPMS_OFF);
|
2014-04-01 16:22:40 -06:00
|
|
|
crtc->primary->fb = NULL;
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
2014-03-20 07:26:34 -06:00
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_helper_disable_unused_functions - disable unused objects
|
|
|
|
* @dev: DRM device
|
|
|
|
*
|
|
|
|
* This function walks through the entire mode setting configuration of @dev. It
|
2015-12-04 01:45:46 -07:00
|
|
|
* will remove any CRTC links of unused encoders and encoder links of
|
|
|
|
* disconnected connectors. Then it will disable all unused encoders and CRTCs
|
2014-03-20 07:26:34 -06:00
|
|
|
* either by calling their disable callback if available or by calling their
|
|
|
|
* dpms callback with DRM_MODE_DPMS_OFF.
|
|
|
|
*/
|
|
|
|
void drm_helper_disable_unused_functions(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
drm_modeset_lock_all(dev);
|
|
|
|
__drm_helper_disable_unused_functions(dev);
|
|
|
|
drm_modeset_unlock_all(dev);
|
|
|
|
}
|
2008-11-07 15:05:41 -07:00
|
|
|
EXPORT_SYMBOL(drm_helper_disable_unused_functions);
|
|
|
|
|
2009-02-23 17:09:34 -07:00
|
|
|
/*
|
|
|
|
* Check the CRTC we're going to map each output to vs. its current
|
|
|
|
* CRTC. If they don't match, we have to disable the output and the CRTC
|
|
|
|
* since the driver will have to re-route things.
|
|
|
|
*/
|
|
|
|
static void
|
|
|
|
drm_crtc_prepare_encoders(struct drm_device *dev)
|
|
|
|
{
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_encoder_helper_funcs *encoder_funcs;
|
2009-02-23 17:09:34 -07:00
|
|
|
struct drm_encoder *encoder;
|
|
|
|
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2009-02-23 17:09:34 -07:00
|
|
|
encoder_funcs = encoder->helper_private;
|
|
|
|
/* Disable unused encoders */
|
|
|
|
if (encoder->crtc == NULL)
|
2010-07-01 00:49:57 -06:00
|
|
|
drm_encoder_disable(encoder);
|
2009-02-23 17:09:34 -07:00
|
|
|
/* Disable encoders whose CRTC is about to change */
|
|
|
|
if (encoder_funcs->get_crtc &&
|
|
|
|
encoder->crtc != (*encoder_funcs->get_crtc)(encoder))
|
2010-07-01 00:49:57 -06:00
|
|
|
drm_encoder_disable(encoder);
|
2009-02-23 17:09:34 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
/**
|
2012-11-01 07:45:16 -06:00
|
|
|
* drm_crtc_helper_set_mode - internal helper to set a mode
|
2008-11-07 15:05:41 -07:00
|
|
|
* @crtc: CRTC to program
|
|
|
|
* @mode: mode to use
|
2012-11-09 10:26:32 -07:00
|
|
|
* @x: horizontal offset into the surface
|
|
|
|
* @y: vertical offset into the surface
|
2012-11-01 07:45:16 -06:00
|
|
|
* @old_fb: old framebuffer, for cleanup
|
2008-11-07 15:05:41 -07:00
|
|
|
*
|
|
|
|
* Try to set @mode on @crtc. Give @crtc and its associated connectors a chance
|
2012-11-01 07:45:16 -06:00
|
|
|
* to fixup or reject the mode prior to trying to set it. This is an internal
|
|
|
|
* helper that drivers could e.g. use to update properties that require the
|
|
|
|
* entire output pipe to be disabled and re-enabled in a new configuration. For
|
|
|
|
* example for changing whether audio is enabled on a hdmi link or for changing
|
|
|
|
* panel fitter or dither attributes. It is also called by the
|
|
|
|
* drm_crtc_helper_set_config() helper function to drive the mode setting
|
|
|
|
* sequence.
|
2008-11-07 15:05:41 -07:00
|
|
|
*
|
2014-01-23 14:58:26 -07:00
|
|
|
* Returns:
|
|
|
|
* True if the mode was set successfully, false otherwise.
|
2008-11-07 15:05:41 -07:00
|
|
|
*/
|
|
|
|
bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
|
|
|
|
struct drm_display_mode *mode,
|
2008-12-17 20:14:46 -07:00
|
|
|
int x, int y,
|
|
|
|
struct drm_framebuffer *old_fb)
|
2008-11-07 15:05:41 -07:00
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
2015-03-18 22:33:03 -06:00
|
|
|
struct drm_display_mode *adjusted_mode, saved_mode, saved_hwmode;
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
|
|
|
|
const struct drm_encoder_helper_funcs *encoder_funcs;
|
2008-11-07 15:05:41 -07:00
|
|
|
int saved_x, saved_y;
|
2013-10-29 09:09:44 -06:00
|
|
|
bool saved_enabled;
|
2008-11-07 15:05:41 -07:00
|
|
|
struct drm_encoder *encoder;
|
|
|
|
bool ret = true;
|
|
|
|
|
2014-01-23 14:18:47 -07:00
|
|
|
drm_warn_on_modeset_not_all_locked(dev);
|
|
|
|
|
2013-10-29 09:09:44 -06:00
|
|
|
saved_enabled = crtc->enabled;
|
2008-11-07 15:05:41 -07:00
|
|
|
crtc->enabled = drm_helper_crtc_in_use(crtc);
|
|
|
|
if (!crtc->enabled)
|
|
|
|
return true;
|
|
|
|
|
2011-01-28 04:31:56 -07:00
|
|
|
adjusted_mode = drm_mode_duplicate(dev, mode);
|
2013-10-29 09:09:44 -06:00
|
|
|
if (!adjusted_mode) {
|
|
|
|
crtc->enabled = saved_enabled;
|
2012-03-13 04:35:48 -06:00
|
|
|
return false;
|
2013-10-29 09:09:44 -06:00
|
|
|
}
|
2011-01-28 04:31:56 -07:00
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
saved_mode = crtc->mode;
|
2015-03-18 22:33:03 -06:00
|
|
|
saved_hwmode = crtc->hwmode;
|
2008-11-07 15:05:41 -07:00
|
|
|
saved_x = crtc->x;
|
|
|
|
saved_y = crtc->y;
|
|
|
|
|
|
|
|
/* Update crtc values up front so the driver can rely on them for mode
|
|
|
|
* setting.
|
|
|
|
*/
|
|
|
|
crtc->mode = *mode;
|
|
|
|
crtc->x = x;
|
|
|
|
crtc->y = y;
|
|
|
|
|
|
|
|
/* Pass our mode to the connectors and the CRTC to give them a chance to
|
|
|
|
* adjust it according to limitations or connector properties, and also
|
|
|
|
* a chance to reject the mode entirely.
|
|
|
|
*/
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2008-11-07 15:05:41 -07:00
|
|
|
|
|
|
|
if (encoder->crtc != crtc)
|
|
|
|
continue;
|
2013-08-14 14:47:37 -06:00
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
ret = drm_bridge_mode_fixup(encoder->bridge,
|
|
|
|
mode, adjusted_mode);
|
|
|
|
if (!ret) {
|
|
|
|
DRM_DEBUG_KMS("Bridge fixup failed\n");
|
|
|
|
goto done;
|
2013-08-14 14:47:37 -06:00
|
|
|
}
|
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
encoder_funcs = encoder->helper_private;
|
|
|
|
if (!(ret = encoder_funcs->mode_fixup(encoder, mode,
|
|
|
|
adjusted_mode))) {
|
2011-10-10 14:21:27 -06:00
|
|
|
DRM_DEBUG_KMS("Encoder fixup failed\n");
|
2008-11-07 15:05:41 -07:00
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!(ret = crtc_funcs->mode_fixup(crtc, mode, adjusted_mode))) {
|
2011-10-10 14:21:27 -06:00
|
|
|
DRM_DEBUG_KMS("CRTC fixup failed\n");
|
2008-11-07 15:05:41 -07:00
|
|
|
goto done;
|
|
|
|
}
|
2015-12-08 09:41:53 -07:00
|
|
|
DRM_DEBUG_KMS("[CRTC:%d:%s]\n", crtc->base.id, crtc->name);
|
2008-11-07 15:05:41 -07:00
|
|
|
|
2015-03-18 22:33:03 -06:00
|
|
|
crtc->hwmode = *adjusted_mode;
|
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
/* Prepare the encoders and CRTCs before setting the mode. */
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2008-11-07 15:05:41 -07:00
|
|
|
|
|
|
|
if (encoder->crtc != crtc)
|
|
|
|
continue;
|
2013-08-14 14:47:37 -06:00
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
drm_bridge_disable(encoder->bridge);
|
2013-08-14 14:47:37 -06:00
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
encoder_funcs = encoder->helper_private;
|
|
|
|
/* Disable the encoders as the first thing we do. */
|
|
|
|
encoder_funcs->prepare(encoder);
|
2013-08-14 14:47:37 -06:00
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
drm_bridge_post_disable(encoder->bridge);
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
|
2009-02-23 17:09:34 -07:00
|
|
|
drm_crtc_prepare_encoders(dev);
|
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
crtc_funcs->prepare(crtc);
|
|
|
|
|
|
|
|
/* Set up the DPLL and any encoders state that needs to adjust or depend
|
|
|
|
* on the DPLL.
|
|
|
|
*/
|
2009-02-11 06:25:09 -07:00
|
|
|
ret = !crtc_funcs->mode_set(crtc, mode, adjusted_mode, x, y, old_fb);
|
|
|
|
if (!ret)
|
|
|
|
goto done;
|
2008-11-07 15:05:41 -07:00
|
|
|
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2008-11-07 15:05:41 -07:00
|
|
|
|
|
|
|
if (encoder->crtc != crtc)
|
|
|
|
continue;
|
|
|
|
|
2010-07-15 13:43:25 -06:00
|
|
|
DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%d:%s]\n",
|
2014-06-03 05:56:22 -06:00
|
|
|
encoder->base.id, encoder->name,
|
2010-07-15 13:43:25 -06:00
|
|
|
mode->base.id, mode->name);
|
2008-11-07 15:05:41 -07:00
|
|
|
encoder_funcs = encoder->helper_private;
|
|
|
|
encoder_funcs->mode_set(encoder, mode, adjusted_mode);
|
2013-08-14 14:47:37 -06:00
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
drm_bridge_mode_set(encoder->bridge, mode, adjusted_mode);
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Now enable the clocks, plane, pipe, and connectors that we set up. */
|
|
|
|
crtc_funcs->commit(crtc);
|
|
|
|
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2008-11-07 15:05:41 -07:00
|
|
|
|
|
|
|
if (encoder->crtc != crtc)
|
|
|
|
continue;
|
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
drm_bridge_pre_enable(encoder->bridge);
|
2013-08-14 14:47:37 -06:00
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
encoder_funcs = encoder->helper_private;
|
|
|
|
encoder_funcs->commit(encoder);
|
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
drm_bridge_enable(encoder->bridge);
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
|
drm/vblank: Add support for precise vblank timestamping.
The DRI2 swap & sync implementation needs precise
vblank counts and precise timestamps corresponding
to those vblank counts. For conformance to the OpenML
OML_sync_control extension specification the DRM
timestamp associated with a vblank count should
correspond to the start of video scanout of the first
scanline of the video frame following the vblank
interval for that vblank count.
Therefore we need to carry around precise timestamps
for vblanks. Currently the DRM and KMS drivers generate
timestamps ad-hoc via do_gettimeofday() in some
places. The resulting timestamps are sometimes not
very precise due to interrupt handling delays, they
don't conform to OML_sync_control and some are wrong,
as they aren't taken synchronized to the vblank.
This patch implements support inside the drm core
for precise and robust timestamping. It consists
of the following interrelated pieces.
1. Vblank timestamp caching:
A per-crtc ringbuffer stores the most recent vblank
timestamps corresponding to vblank counts.
The ringbuffer can be read out lock-free via the
accessor function:
struct timeval timestamp;
vblankcount = drm_vblank_count_and_time(dev, crtcid, ×tamp).
The function returns the current vblank count and
the corresponding timestamp for start of video
scanout following the vblank interval. It can be
used anywhere between enclosing drm_vblank_get(dev, crtcid)
and drm_vblank_put(dev,crtcid) statements. It is used
inside the drmWaitVblank ioctl and in the vblank event
queueing and handling. It should be used by kms drivers for
timestamping of bufferswap completion.
The timestamp ringbuffer is reinitialized each time
vblank irq's get reenabled in drm_vblank_get()/
drm_update_vblank_count(). It is invalidated when
vblank irq's get disabled.
The ringbuffer is updated inside drm_handle_vblank()
at each vblank irq.
2. Calculation of precise vblank timestamps:
drm_get_last_vbltimestamp() is used to compute the
timestamp for the end of the most recent vblank (if
inside active scanout), or the expected end of the
current vblank interval (if called inside a vblank
interval). The function calls into a new optional kms
driver entry point dev->driver->get_vblank_timestamp()
which is supposed to provide the precise timestamp.
If a kms driver doesn't implement the entry point or
if the call fails, a simple do_gettimeofday() timestamp
is returned as crude approximation of the true vblank time.
A new drm module parameter drm.timestamp_precision_usec
allows to disable high precision timestamps (if set to
zero) or to specify the maximum acceptable error in
the timestamps in microseconds.
Kms drivers could implement their get_vblank_timestamp()
function in a gpu specific way, as long as returned
timestamps conform to OML_sync_control, e.g., by use
of gpu specific hardware timestamps.
Optionally, kms drivers can simply wrap and use the new
utility function drm_calc_vbltimestamp_from_scanoutpos().
This function calls a new optional kms driver function
dev->driver->get_scanout_position() which returns the
current horizontal and vertical video scanout position
of the crtc. The scanout position together with the
drm_display_timing of the current video mode is used
to calculate elapsed time relative to start of active scanout
for the current video frame. This elapsed time is subtracted
from the current do_gettimeofday() time to get the timestamp
corresponding to start of video scanout. Currently
non-interlaced, non-doublescan video modes, with or
without panel scaling are handled correctly. Interlaced/
doublescan modes are tbd in a future patch.
3. Filtering of redundant vblank irq's and removal of
some race-conditions in the vblank irq enable/disable path:
Some gpu's (e.g., Radeon R500/R600) send spurious vblank
irq's outside the vblank if vblank irq's get reenabled.
These get detected by use of the vblank timestamps and
filtered out to avoid miscounting of vblanks.
Some race-conditions between the vblank irq enable/disable
functions, the vblank irq handler and the gpu itself (updating
its hardware vblank counter in the "wrong" moment) are
fixed inside vblank_disable_and_save() and
drm_update_vblank_count() by use of the vblank timestamps and
a new spinlock dev->vblank_time_lock.
The time until vblank irq disable is now configurable via
a new drm module parameter drm.vblankoffdelay to allow
experimentation with timeouts that are much shorter than
the current 5 seconds and should allow longer vblank off
periods for better power savings.
Followup patches will use these new functions to
implement precise timestamping for the intel and radeon
kms drivers.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-10-22 20:20:23 -06:00
|
|
|
/* Calculate and store various constants which
|
|
|
|
* are later needed by vblank and swap-completion
|
|
|
|
* timestamping. They are derived from true hwmode.
|
|
|
|
*/
|
2013-10-26 08:16:30 -06:00
|
|
|
drm_calc_timestamping_constants(crtc, &crtc->hwmode);
|
drm/vblank: Add support for precise vblank timestamping.
The DRI2 swap & sync implementation needs precise
vblank counts and precise timestamps corresponding
to those vblank counts. For conformance to the OpenML
OML_sync_control extension specification the DRM
timestamp associated with a vblank count should
correspond to the start of video scanout of the first
scanline of the video frame following the vblank
interval for that vblank count.
Therefore we need to carry around precise timestamps
for vblanks. Currently the DRM and KMS drivers generate
timestamps ad-hoc via do_gettimeofday() in some
places. The resulting timestamps are sometimes not
very precise due to interrupt handling delays, they
don't conform to OML_sync_control and some are wrong,
as they aren't taken synchronized to the vblank.
This patch implements support inside the drm core
for precise and robust timestamping. It consists
of the following interrelated pieces.
1. Vblank timestamp caching:
A per-crtc ringbuffer stores the most recent vblank
timestamps corresponding to vblank counts.
The ringbuffer can be read out lock-free via the
accessor function:
struct timeval timestamp;
vblankcount = drm_vblank_count_and_time(dev, crtcid, ×tamp).
The function returns the current vblank count and
the corresponding timestamp for start of video
scanout following the vblank interval. It can be
used anywhere between enclosing drm_vblank_get(dev, crtcid)
and drm_vblank_put(dev,crtcid) statements. It is used
inside the drmWaitVblank ioctl and in the vblank event
queueing and handling. It should be used by kms drivers for
timestamping of bufferswap completion.
The timestamp ringbuffer is reinitialized each time
vblank irq's get reenabled in drm_vblank_get()/
drm_update_vblank_count(). It is invalidated when
vblank irq's get disabled.
The ringbuffer is updated inside drm_handle_vblank()
at each vblank irq.
2. Calculation of precise vblank timestamps:
drm_get_last_vbltimestamp() is used to compute the
timestamp for the end of the most recent vblank (if
inside active scanout), or the expected end of the
current vblank interval (if called inside a vblank
interval). The function calls into a new optional kms
driver entry point dev->driver->get_vblank_timestamp()
which is supposed to provide the precise timestamp.
If a kms driver doesn't implement the entry point or
if the call fails, a simple do_gettimeofday() timestamp
is returned as crude approximation of the true vblank time.
A new drm module parameter drm.timestamp_precision_usec
allows to disable high precision timestamps (if set to
zero) or to specify the maximum acceptable error in
the timestamps in microseconds.
Kms drivers could implement their get_vblank_timestamp()
function in a gpu specific way, as long as returned
timestamps conform to OML_sync_control, e.g., by use
of gpu specific hardware timestamps.
Optionally, kms drivers can simply wrap and use the new
utility function drm_calc_vbltimestamp_from_scanoutpos().
This function calls a new optional kms driver function
dev->driver->get_scanout_position() which returns the
current horizontal and vertical video scanout position
of the crtc. The scanout position together with the
drm_display_timing of the current video mode is used
to calculate elapsed time relative to start of active scanout
for the current video frame. This elapsed time is subtracted
from the current do_gettimeofday() time to get the timestamp
corresponding to start of video scanout. Currently
non-interlaced, non-doublescan video modes, with or
without panel scaling are handled correctly. Interlaced/
doublescan modes are tbd in a future patch.
3. Filtering of redundant vblank irq's and removal of
some race-conditions in the vblank irq enable/disable path:
Some gpu's (e.g., Radeon R500/R600) send spurious vblank
irq's outside the vblank if vblank irq's get reenabled.
These get detected by use of the vblank timestamps and
filtered out to avoid miscounting of vblanks.
Some race-conditions between the vblank irq enable/disable
functions, the vblank irq handler and the gpu itself (updating
its hardware vblank counter in the "wrong" moment) are
fixed inside vblank_disable_and_save() and
drm_update_vblank_count() by use of the vblank timestamps and
a new spinlock dev->vblank_time_lock.
The time until vblank irq disable is now configurable via
a new drm module parameter drm.vblankoffdelay to allow
experimentation with timeouts that are much shorter than
the current 5 seconds and should allow longer vblank off
periods for better power savings.
Followup patches will use these new functions to
implement precise timestamping for the intel and radeon
kms drivers.
Signed-off-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Dave Airlie <airlied@redhat.com>
2010-10-22 20:20:23 -06:00
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
/* FIXME: add subpixel order */
|
|
|
|
done:
|
2011-01-28 04:31:56 -07:00
|
|
|
drm_mode_destroy(dev, adjusted_mode);
|
2008-11-07 15:05:41 -07:00
|
|
|
if (!ret) {
|
2013-10-29 09:09:44 -06:00
|
|
|
crtc->enabled = saved_enabled;
|
2008-11-07 15:05:41 -07:00
|
|
|
crtc->mode = saved_mode;
|
2015-03-18 22:33:03 -06:00
|
|
|
crtc->hwmode = saved_hwmode;
|
2008-11-07 15:05:41 -07:00
|
|
|
crtc->x = saved_x;
|
|
|
|
crtc->y = saved_y;
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_helper_set_mode);
|
|
|
|
|
2014-04-29 03:44:39 -06:00
|
|
|
static void
|
2011-11-28 14:10:05 -07:00
|
|
|
drm_crtc_helper_disable(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
struct drm_encoder *encoder;
|
|
|
|
|
|
|
|
/* Decouple all encoders and their attached connectors from this crtc */
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2011-11-28 14:10:05 -07:00
|
|
|
if (encoder->crtc != crtc)
|
|
|
|
continue;
|
|
|
|
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_connector(connector, dev) {
|
2011-11-28 14:10:05 -07:00
|
|
|
if (connector->encoder != encoder)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
connector->encoder = NULL;
|
drm: Track the proper DPMS mode of connectors
When userspace removes the active framebuffer using DRM_IOCTL_MODE_RMFB,
or explicitly disables the CRTC (by calling drmModeSetCrtc(..., NULL)
for example), a NULL framebuffer will be passed to the .set_config()
implementation of a CRTC. The drm_crtc_helper_set_config() helper will
decide to disable a CRTC when that happens.
To do so, it calls drm_crtc_helper_disable(), which in turn will iterate
over all encoders and decouple them from their connectors and finally
call drm_helper_disable_unused_functions() to clean up and call the
.disable() or .dpms() implementation for each encoder. However, at no
point during this sequence does it track the DPMS mode of a connector,
so it will usually remain on after this.
When a connector is enabled again, drm_helper_connector_dpms() will not
notice that the DPMS mode actually changed and won't do anything, which
causes the connector to stay disabled indefinitely.
To prevent this from happening, explicitly set the connector's DPMS mode
to off when the CRTC is disabled. That way it reflects the correct state
and can be enabled again.
This solves an issue observed when terminating an X server running on
the xf86-video-modesetting driver. Without this patch, the connector
would not be enabled properly and the screen would stay dark.
Acked-by: David Airlie <airlied@linux.ie>
Signed-off-by: Thierry Reding <treding@nvidia.com>
2013-10-02 07:50:06 -06:00
|
|
|
|
|
|
|
/*
|
|
|
|
* drm_helper_disable_unused_functions() ought to be
|
|
|
|
* doing this, but since we've decoupled the encoder
|
|
|
|
* from the connector above, the required connection
|
|
|
|
* between them is henceforth no longer available.
|
|
|
|
*/
|
|
|
|
connector->dpms = DRM_MODE_DPMS_OFF;
|
2011-11-28 14:10:05 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2014-03-20 07:26:34 -06:00
|
|
|
__drm_helper_disable_unused_functions(dev);
|
2011-11-28 14:10:05 -07:00
|
|
|
}
|
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
/**
|
|
|
|
* drm_crtc_helper_set_config - set a new config from userspace
|
2012-11-01 07:45:16 -06:00
|
|
|
* @set: mode set configuration
|
2008-11-07 15:05:41 -07:00
|
|
|
*
|
2015-12-04 01:45:46 -07:00
|
|
|
* The drm_crtc_helper_set_config() helper function implements the set_config
|
|
|
|
* callback of struct &drm_crtc_funcs for drivers using the legacy CRTC helpers.
|
|
|
|
*
|
|
|
|
* It first tries to locate the best encoder for each connector by calling the
|
|
|
|
* connector ->best_encoder() (struct &drm_connector_helper_funcs) helper
|
|
|
|
* operation.
|
|
|
|
*
|
|
|
|
* After locating the appropriate encoders, the helper function will call the
|
|
|
|
* mode_fixup encoder and CRTC helper operations to adjust the requested mode,
|
|
|
|
* or reject it completely in which case an error will be returned to the
|
|
|
|
* application. If the new configuration after mode adjustment is identical to
|
|
|
|
* the current configuration the helper function will return without performing
|
|
|
|
* any other operation.
|
|
|
|
*
|
|
|
|
* If the adjusted mode is identical to the current mode but changes to the
|
|
|
|
* frame buffer need to be applied, the drm_crtc_helper_set_config() function
|
|
|
|
* will call the CRTC ->mode_set_base() (struct &drm_crtc_helper_funcs) helper
|
|
|
|
* operation.
|
|
|
|
*
|
|
|
|
* If the adjusted mode differs from the current mode, or if the
|
|
|
|
* ->mode_set_base() helper operation is not provided, the helper function
|
|
|
|
* performs a full mode set sequence by calling the ->prepare(), ->mode_set()
|
|
|
|
* and ->commit() CRTC and encoder helper operations, in that order.
|
|
|
|
* Alternatively it can also use the dpms and disable helper operations. For
|
|
|
|
* details see struct &drm_crtc_helper_funcs and struct
|
|
|
|
* &drm_encoder_helper_funcs.
|
|
|
|
*
|
|
|
|
* This function is deprecated. New drivers must implement atomic modeset
|
|
|
|
* support, for which this function is unsuitable. Instead drivers should use
|
|
|
|
* drm_atomic_helper_set_config().
|
2008-11-07 15:05:41 -07:00
|
|
|
*
|
2014-01-23 14:58:26 -07:00
|
|
|
* Returns:
|
|
|
|
* Returns 0 on success, negative errno numbers on failure.
|
2008-11-07 15:05:41 -07:00
|
|
|
*/
|
|
|
|
int drm_crtc_helper_set_config(struct drm_mode_set *set)
|
|
|
|
{
|
|
|
|
struct drm_device *dev;
|
2013-10-29 09:09:46 -06:00
|
|
|
struct drm_crtc *new_crtc;
|
2009-08-27 02:18:29 -06:00
|
|
|
struct drm_encoder *save_encoders, *new_encoder, *encoder;
|
2009-08-03 06:43:59 -06:00
|
|
|
bool mode_changed = false; /* if true do a full mode set */
|
|
|
|
bool fb_changed = false; /* if true and !mode_changed just do a flip */
|
2009-08-27 02:18:29 -06:00
|
|
|
struct drm_connector *save_connectors, *connector;
|
2008-11-07 15:05:41 -07:00
|
|
|
int count = 0, ro, fail = 0;
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_crtc_helper_funcs *crtc_funcs;
|
2011-11-07 11:39:57 -07:00
|
|
|
struct drm_mode_set save_set;
|
2012-05-17 05:27:21 -06:00
|
|
|
int ret;
|
2010-11-26 11:45:58 -07:00
|
|
|
int i;
|
2008-11-07 15:05:41 -07:00
|
|
|
|
2009-07-19 23:48:07 -06:00
|
|
|
DRM_DEBUG_KMS("\n");
|
2008-11-07 15:05:41 -07:00
|
|
|
|
2013-06-14 16:13:11 -06:00
|
|
|
BUG_ON(!set);
|
|
|
|
BUG_ON(!set->crtc);
|
|
|
|
BUG_ON(!set->crtc->helper_private);
|
2008-11-07 15:05:41 -07:00
|
|
|
|
2013-06-14 16:13:11 -06:00
|
|
|
/* Enforce sane interface api - has been abused by the fb helper. */
|
|
|
|
BUG_ON(!set->mode && set->fb);
|
|
|
|
BUG_ON(set->fb && set->num_connectors == 0);
|
2008-11-07 15:05:41 -07:00
|
|
|
|
|
|
|
crtc_funcs = set->crtc->helper_private;
|
|
|
|
|
2011-01-31 04:16:33 -07:00
|
|
|
if (!set->mode)
|
|
|
|
set->fb = NULL;
|
|
|
|
|
2010-07-15 13:43:25 -06:00
|
|
|
if (set->fb) {
|
2015-12-08 09:41:53 -07:00
|
|
|
DRM_DEBUG_KMS("[CRTC:%d:%s] [FB:%d] #connectors=%d (x y) (%i %i)\n",
|
|
|
|
set->crtc->base.id, set->crtc->name,
|
|
|
|
set->fb->base.id,
|
|
|
|
(int)set->num_connectors, set->x, set->y);
|
2010-07-15 13:43:25 -06:00
|
|
|
} else {
|
2015-12-08 09:41:53 -07:00
|
|
|
DRM_DEBUG_KMS("[CRTC:%d:%s] [NOFB]\n",
|
|
|
|
set->crtc->base.id, set->crtc->name);
|
2014-04-29 03:44:39 -06:00
|
|
|
drm_crtc_helper_disable(set->crtc);
|
|
|
|
return 0;
|
2010-07-15 13:43:25 -06:00
|
|
|
}
|
2008-11-07 15:05:41 -07:00
|
|
|
|
|
|
|
dev = set->crtc->dev;
|
|
|
|
|
2014-01-23 14:18:47 -07:00
|
|
|
drm_warn_on_modeset_not_all_locked(dev);
|
|
|
|
|
2013-10-29 09:09:46 -06:00
|
|
|
/*
|
|
|
|
* Allocate space for the backup of all (non-pointer) encoder and
|
|
|
|
* connector data.
|
|
|
|
*/
|
2009-08-27 02:18:29 -06:00
|
|
|
save_encoders = kzalloc(dev->mode_config.num_encoder *
|
|
|
|
sizeof(struct drm_encoder), GFP_KERNEL);
|
2013-10-29 09:09:46 -06:00
|
|
|
if (!save_encoders)
|
2008-11-07 15:05:41 -07:00
|
|
|
return -ENOMEM;
|
|
|
|
|
2009-08-27 02:18:29 -06:00
|
|
|
save_connectors = kzalloc(dev->mode_config.num_connector *
|
|
|
|
sizeof(struct drm_connector), GFP_KERNEL);
|
|
|
|
if (!save_connectors) {
|
|
|
|
kfree(save_encoders);
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
|
2013-10-29 09:09:46 -06:00
|
|
|
/*
|
|
|
|
* Copy data. Note that driver private data is not affected.
|
2009-08-27 02:18:29 -06:00
|
|
|
* Should anything bad happen only the expected state is
|
|
|
|
* restored, not the drivers personal bookkeeping.
|
|
|
|
*/
|
|
|
|
count = 0;
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2009-08-27 02:18:29 -06:00
|
|
|
save_encoders[count++] = *encoder;
|
|
|
|
}
|
|
|
|
|
|
|
|
count = 0;
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_connector(connector, dev) {
|
2009-08-27 02:18:29 -06:00
|
|
|
save_connectors[count++] = *connector;
|
|
|
|
}
|
|
|
|
|
2011-11-07 11:39:57 -07:00
|
|
|
save_set.crtc = set->crtc;
|
|
|
|
save_set.mode = &set->crtc->mode;
|
|
|
|
save_set.x = set->crtc->x;
|
|
|
|
save_set.y = set->crtc->y;
|
2014-04-01 16:22:40 -06:00
|
|
|
save_set.fb = set->crtc->primary->fb;
|
2011-11-07 11:39:57 -07:00
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
/* We should be able to check here if the fb has the same properties
|
|
|
|
* and then just flip_or_move it */
|
2014-04-01 16:22:40 -06:00
|
|
|
if (set->crtc->primary->fb != set->fb) {
|
2009-01-09 14:56:14 -07:00
|
|
|
/* If we have no fb then treat it as a full mode set */
|
2014-04-01 16:22:40 -06:00
|
|
|
if (set->crtc->primary->fb == NULL) {
|
2009-07-19 23:48:07 -06:00
|
|
|
DRM_DEBUG_KMS("crtc has no fb, full mode set\n");
|
2009-01-09 14:56:14 -07:00
|
|
|
mode_changed = true;
|
2009-08-03 06:43:59 -06:00
|
|
|
} else if (set->fb == NULL) {
|
|
|
|
mode_changed = true;
|
2013-04-21 17:38:47 -06:00
|
|
|
} else if (set->fb->pixel_format !=
|
2014-04-01 16:22:40 -06:00
|
|
|
set->crtc->primary->fb->pixel_format) {
|
2013-04-21 17:38:47 -06:00
|
|
|
mode_changed = true;
|
2010-02-10 21:28:58 -07:00
|
|
|
} else
|
2009-01-09 14:56:14 -07:00
|
|
|
fb_changed = true;
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
if (set->x != set->crtc->x || set->y != set->crtc->y)
|
2009-01-09 14:56:14 -07:00
|
|
|
fb_changed = true;
|
2008-11-07 15:05:41 -07:00
|
|
|
|
|
|
|
if (set->mode && !drm_mode_equal(set->mode, &set->crtc->mode)) {
|
2009-07-19 23:48:07 -06:00
|
|
|
DRM_DEBUG_KMS("modes are different, full mode set\n");
|
2008-11-07 15:05:41 -07:00
|
|
|
drm_mode_debug_printmodeline(&set->crtc->mode);
|
|
|
|
drm_mode_debug_printmodeline(set->mode);
|
2009-01-09 14:56:14 -07:00
|
|
|
mode_changed = true;
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* a) traverse passed in connector list and get encoders for them */
|
|
|
|
count = 0;
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_connector(connector, dev) {
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_connector_helper_funcs *connector_funcs =
|
2008-11-07 15:05:41 -07:00
|
|
|
connector->helper_private;
|
|
|
|
new_encoder = connector->encoder;
|
|
|
|
for (ro = 0; ro < set->num_connectors; ro++) {
|
|
|
|
if (set->connectors[ro] == connector) {
|
|
|
|
new_encoder = connector_funcs->best_encoder(connector);
|
|
|
|
/* if we can't get an encoder for a connector
|
|
|
|
we are setting now - then fail */
|
|
|
|
if (new_encoder == NULL)
|
|
|
|
/* don't break so fail path works correct */
|
|
|
|
fail = 1;
|
2013-07-19 10:57:11 -06:00
|
|
|
|
|
|
|
if (connector->dpms != DRM_MODE_DPMS_ON) {
|
|
|
|
DRM_DEBUG_KMS("connector dpms not on, full mode switch\n");
|
|
|
|
mode_changed = true;
|
|
|
|
}
|
2014-04-01 14:14:59 -06:00
|
|
|
|
|
|
|
break;
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (new_encoder != connector->encoder) {
|
2009-07-19 23:48:07 -06:00
|
|
|
DRM_DEBUG_KMS("encoder changed, full mode switch\n");
|
2009-01-09 14:56:14 -07:00
|
|
|
mode_changed = true;
|
2009-08-18 16:56:45 -06:00
|
|
|
/* If the encoder is reused for another connector, then
|
|
|
|
* the appropriate crtc will be set later.
|
|
|
|
*/
|
2009-08-31 19:39:04 -06:00
|
|
|
if (connector->encoder)
|
|
|
|
connector->encoder->crtc = NULL;
|
2008-11-07 15:05:41 -07:00
|
|
|
connector->encoder = new_encoder;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (fail) {
|
|
|
|
ret = -EINVAL;
|
2009-08-27 02:18:29 -06:00
|
|
|
goto fail;
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
count = 0;
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_connector(connector, dev) {
|
2008-11-07 15:05:41 -07:00
|
|
|
if (!connector->encoder)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (connector->encoder->crtc == set->crtc)
|
|
|
|
new_crtc = NULL;
|
|
|
|
else
|
|
|
|
new_crtc = connector->encoder->crtc;
|
|
|
|
|
|
|
|
for (ro = 0; ro < set->num_connectors; ro++) {
|
|
|
|
if (set->connectors[ro] == connector)
|
|
|
|
new_crtc = set->crtc;
|
|
|
|
}
|
2009-02-23 17:09:34 -07:00
|
|
|
|
|
|
|
/* Make sure the new CRTC will work with the encoder */
|
|
|
|
if (new_crtc &&
|
|
|
|
!drm_encoder_crtc_ok(connector->encoder, new_crtc)) {
|
|
|
|
ret = -EINVAL;
|
2009-08-27 02:18:29 -06:00
|
|
|
goto fail;
|
2009-02-23 17:09:34 -07:00
|
|
|
}
|
2008-11-07 15:05:41 -07:00
|
|
|
if (new_crtc != connector->encoder->crtc) {
|
2009-07-19 23:48:07 -06:00
|
|
|
DRM_DEBUG_KMS("crtc changed, full mode switch\n");
|
2009-01-09 14:56:14 -07:00
|
|
|
mode_changed = true;
|
2008-11-07 15:05:41 -07:00
|
|
|
connector->encoder->crtc = new_crtc;
|
|
|
|
}
|
2010-07-15 13:43:25 -06:00
|
|
|
if (new_crtc) {
|
2015-12-08 09:41:53 -07:00
|
|
|
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [CRTC:%d:%s]\n",
|
|
|
|
connector->base.id, connector->name,
|
|
|
|
new_crtc->base.id, new_crtc->name);
|
2010-07-15 13:43:25 -06:00
|
|
|
} else {
|
|
|
|
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [NOCRTC]\n",
|
2015-12-08 09:41:53 -07:00
|
|
|
connector->base.id, connector->name);
|
2010-07-15 13:43:25 -06:00
|
|
|
}
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
|
|
|
|
/* mode_set_base is not a required function */
|
2009-01-09 14:56:14 -07:00
|
|
|
if (fb_changed && !crtc_funcs->mode_set_base)
|
|
|
|
mode_changed = true;
|
2008-11-07 15:05:41 -07:00
|
|
|
|
2009-01-09 14:56:14 -07:00
|
|
|
if (mode_changed) {
|
2013-10-29 09:09:45 -06:00
|
|
|
if (drm_helper_crtc_in_use(set->crtc)) {
|
2009-07-19 23:48:07 -06:00
|
|
|
DRM_DEBUG_KMS("attempting to set mode from"
|
|
|
|
" userspace\n");
|
2008-11-07 15:05:41 -07:00
|
|
|
drm_mode_debug_printmodeline(set->mode);
|
2014-04-01 16:22:40 -06:00
|
|
|
set->crtc->primary->fb = set->fb;
|
2008-11-07 15:05:41 -07:00
|
|
|
if (!drm_crtc_helper_set_mode(set->crtc, set->mode,
|
2008-12-17 20:14:46 -07:00
|
|
|
set->x, set->y,
|
2013-10-29 09:09:42 -06:00
|
|
|
save_set.fb)) {
|
2015-12-08 09:41:53 -07:00
|
|
|
DRM_ERROR("failed to set mode on [CRTC:%d:%s]\n",
|
|
|
|
set->crtc->base.id, set->crtc->name);
|
2014-04-01 16:22:40 -06:00
|
|
|
set->crtc->primary->fb = save_set.fb;
|
2008-11-07 15:05:41 -07:00
|
|
|
ret = -EINVAL;
|
2009-08-27 02:18:29 -06:00
|
|
|
goto fail;
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
2013-07-19 10:57:11 -06:00
|
|
|
DRM_DEBUG_KMS("Setting connector DPMS state to on\n");
|
|
|
|
for (i = 0; i < set->num_connectors; i++) {
|
|
|
|
DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
|
2014-06-03 05:56:20 -06:00
|
|
|
set->connectors[i]->name);
|
2013-07-19 10:57:11 -06:00
|
|
|
set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);
|
|
|
|
}
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
2014-03-20 07:26:34 -06:00
|
|
|
__drm_helper_disable_unused_functions(dev);
|
2009-01-09 14:56:14 -07:00
|
|
|
} else if (fb_changed) {
|
2009-09-17 18:43:52 -06:00
|
|
|
set->crtc->x = set->x;
|
|
|
|
set->crtc->y = set->y;
|
2014-04-01 16:22:40 -06:00
|
|
|
set->crtc->primary->fb = set->fb;
|
2009-02-11 06:25:09 -07:00
|
|
|
ret = crtc_funcs->mode_set_base(set->crtc,
|
2013-10-29 09:09:42 -06:00
|
|
|
set->x, set->y, save_set.fb);
|
2011-01-08 08:10:41 -07:00
|
|
|
if (ret != 0) {
|
2013-10-29 09:09:43 -06:00
|
|
|
set->crtc->x = save_set.x;
|
|
|
|
set->crtc->y = save_set.y;
|
2014-04-01 16:22:40 -06:00
|
|
|
set->crtc->primary->fb = save_set.fb;
|
2009-08-27 02:18:29 -06:00
|
|
|
goto fail;
|
2011-01-08 08:10:41 -07:00
|
|
|
}
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
|
2009-08-27 02:18:29 -06:00
|
|
|
kfree(save_connectors);
|
2008-11-07 15:05:41 -07:00
|
|
|
kfree(save_encoders);
|
|
|
|
return 0;
|
|
|
|
|
2009-08-27 02:18:29 -06:00
|
|
|
fail:
|
|
|
|
/* Restore all previous data. */
|
|
|
|
count = 0;
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2009-08-27 02:18:29 -06:00
|
|
|
*encoder = save_encoders[count++];
|
2009-02-11 09:39:21 -07:00
|
|
|
}
|
2009-08-27 02:18:29 -06:00
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
count = 0;
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_connector(connector, dev) {
|
2009-08-27 02:18:29 -06:00
|
|
|
*connector = save_connectors[count++];
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
2009-08-27 02:18:29 -06:00
|
|
|
|
2011-11-07 11:39:57 -07:00
|
|
|
/* Try to restore the config */
|
|
|
|
if (mode_changed &&
|
|
|
|
!drm_crtc_helper_set_mode(save_set.crtc, save_set.mode, save_set.x,
|
|
|
|
save_set.y, save_set.fb))
|
|
|
|
DRM_ERROR("failed to restore config after modeset failure\n");
|
|
|
|
|
2009-08-27 02:18:29 -06:00
|
|
|
kfree(save_connectors);
|
2008-11-07 15:05:41 -07:00
|
|
|
kfree(save_encoders);
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_helper_set_config);
|
|
|
|
|
2009-05-30 21:42:28 -06:00
|
|
|
static int drm_helper_choose_encoder_dpms(struct drm_encoder *encoder)
|
|
|
|
{
|
|
|
|
int dpms = DRM_MODE_DPMS_OFF;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
struct drm_device *dev = encoder->dev;
|
|
|
|
|
2015-07-09 15:44:34 -06:00
|
|
|
drm_for_each_connector(connector, dev)
|
2009-05-30 21:42:28 -06:00
|
|
|
if (connector->encoder == encoder)
|
|
|
|
if (connector->dpms < dpms)
|
|
|
|
dpms = connector->dpms;
|
|
|
|
return dpms;
|
|
|
|
}
|
|
|
|
|
2013-08-14 14:47:37 -06:00
|
|
|
/* Helper which handles bridge ordering around encoder dpms */
|
|
|
|
static void drm_helper_encoder_dpms(struct drm_encoder *encoder, int mode)
|
|
|
|
{
|
|
|
|
struct drm_bridge *bridge = encoder->bridge;
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_encoder_helper_funcs *encoder_funcs;
|
2013-08-14 14:47:37 -06:00
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
if (mode == DRM_MODE_DPMS_ON)
|
|
|
|
drm_bridge_pre_enable(bridge);
|
|
|
|
else
|
|
|
|
drm_bridge_disable(bridge);
|
2013-08-14 14:47:37 -06:00
|
|
|
|
|
|
|
encoder_funcs = encoder->helper_private;
|
|
|
|
if (encoder_funcs->dpms)
|
|
|
|
encoder_funcs->dpms(encoder, mode);
|
|
|
|
|
drm: bridge: Allow daisy chaining of bridges
Allow drm_bridge objects to link to each other in order to form an encoder
chain. The requirement for creating a chain of bridges comes because the
MSM drm driver uses up its encoder and bridge objects for blocks within
the SoC itself. There isn't anything left to use if the SoC display output
is connected to an external encoder IC. Having an additional bridge
connected to the existing bridge helps here. In general, it is possible for
platforms to have multiple devices between the encoder and the
connector/panel that require some sort of configuration.
We create drm bridge helper functions corresponding to each op in
'drm_bridge_funcs'. These helpers call the corresponding
'drm_bridge_funcs' op for the entire chain of bridges. These helpers are
used internally by drm_atomic_helper.c and drm_crtc_helper.c.
The drm_bridge_enable/pre_enable helpers execute enable/pre_enable ops of
the bridge closet to the encoder, and proceed until the last bridge in the
chain is enabled. The same holds for drm_bridge_mode_set/mode_fixup
helpers. The drm_bridge_disable/post_disable helpers disable the last
bridge in the chain first, and proceed until the first bridge in the chain
is disabled.
drm_bridge_attach() remains the same. As before, the driver calling this
function should make sure it has set the links correctly. The order in
which the bridges are connected to each other determines the order in which
the calls are made. One requirement is that every bridge in the chain
should point the parent encoder object. This is required since bridge
drivers expect a valid encoder pointer in drm_bridge. For example, consider
a chain where an encoder's output is connected to bridge1, and bridge1's
output is connected to bridge2:
/* Like before, attach bridge to an encoder */
bridge1->encoder = encoder;
ret = drm_bridge_attach(dev, bridge1);
..
/*
* set the first bridge's 'next' bridge to bridge2, set its encoder
* as bridge1's encoder
*/
bridge1->next = bridge2
bridge2->encoder = bridge1->encoder;
ret = drm_bridge_attach(dev, bridge2);
...
...
This method of bridge chaining isn't intrusive and existing drivers that
use drm_bridge will behave the same way as before. The bridge helpers also
cleans up the atomic and crtc helper files a bit.
Reviewed-by: Jani Nikula <jani.nikula@linux.intel.com>
Reviewed-by: Rob Clark <robdclark@gmail.com>
Reviewed-by: Daniel Vetter <daniel@ffwll.ch>
Signed-off-by: Archit Taneja <architt@codeaurora.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2015-05-20 23:33:16 -06:00
|
|
|
if (mode == DRM_MODE_DPMS_ON)
|
|
|
|
drm_bridge_enable(bridge);
|
|
|
|
else
|
|
|
|
drm_bridge_post_disable(bridge);
|
2013-08-14 14:47:37 -06:00
|
|
|
}
|
|
|
|
|
2009-05-30 21:42:28 -06:00
|
|
|
static int drm_helper_choose_crtc_dpms(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
int dpms = DRM_MODE_DPMS_OFF;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
|
2015-07-09 15:44:34 -06:00
|
|
|
drm_for_each_connector(connector, dev)
|
2009-05-30 21:42:28 -06:00
|
|
|
if (connector->encoder && connector->encoder->crtc == crtc)
|
|
|
|
if (connector->dpms < dpms)
|
|
|
|
dpms = connector->dpms;
|
|
|
|
return dpms;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-11-01 07:45:16 -06:00
|
|
|
* drm_helper_connector_dpms() - connector dpms helper implementation
|
|
|
|
* @connector: affected connector
|
|
|
|
* @mode: DPMS mode
|
2009-05-30 21:42:28 -06:00
|
|
|
*
|
2015-12-04 01:45:46 -07:00
|
|
|
* The drm_helper_connector_dpms() helper function implements the ->dpms()
|
|
|
|
* callback of struct &drm_connector_funcs for drivers using the legacy CRTC helpers.
|
|
|
|
*
|
|
|
|
* This is the main helper function provided by the CRTC helper framework for
|
2012-11-01 07:45:16 -06:00
|
|
|
* implementing the DPMS connector attribute. It computes the new desired DPMS
|
2015-12-04 01:45:46 -07:00
|
|
|
* state for all encoders and CRTCs in the output mesh and calls the ->dpms()
|
|
|
|
* callbacks provided by the driver in struct &drm_crtc_helper_funcs and struct
|
|
|
|
* &drm_encoder_helper_funcs appropriately.
|
|
|
|
*
|
|
|
|
* This function is deprecated. New drivers must implement atomic modeset
|
|
|
|
* support, for which this function is unsuitable. Instead drivers should use
|
|
|
|
* drm_atomic_helper_connector_dpms().
|
2015-07-21 03:34:55 -06:00
|
|
|
*
|
|
|
|
* Returns:
|
|
|
|
* Always returns 0.
|
2009-05-30 21:42:28 -06:00
|
|
|
*/
|
2015-07-21 03:34:55 -06:00
|
|
|
int drm_helper_connector_dpms(struct drm_connector *connector, int mode)
|
2009-05-30 21:42:28 -06:00
|
|
|
{
|
|
|
|
struct drm_encoder *encoder = connector->encoder;
|
|
|
|
struct drm_crtc *crtc = encoder ? encoder->crtc : NULL;
|
2013-08-14 14:47:37 -06:00
|
|
|
int old_dpms, encoder_dpms = DRM_MODE_DPMS_OFF;
|
2009-05-30 21:42:28 -06:00
|
|
|
|
|
|
|
if (mode == connector->dpms)
|
2015-07-21 03:34:55 -06:00
|
|
|
return 0;
|
2009-05-30 21:42:28 -06:00
|
|
|
|
|
|
|
old_dpms = connector->dpms;
|
|
|
|
connector->dpms = mode;
|
|
|
|
|
2013-08-14 14:47:37 -06:00
|
|
|
if (encoder)
|
|
|
|
encoder_dpms = drm_helper_choose_encoder_dpms(encoder);
|
|
|
|
|
2009-05-30 21:42:28 -06:00
|
|
|
/* from off to on, do crtc then encoder */
|
|
|
|
if (mode < old_dpms) {
|
|
|
|
if (crtc) {
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
|
2009-05-30 21:42:28 -06:00
|
|
|
if (crtc_funcs->dpms)
|
|
|
|
(*crtc_funcs->dpms) (crtc,
|
|
|
|
drm_helper_choose_crtc_dpms(crtc));
|
|
|
|
}
|
2013-08-14 14:47:37 -06:00
|
|
|
if (encoder)
|
|
|
|
drm_helper_encoder_dpms(encoder, encoder_dpms);
|
2009-05-30 21:42:28 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
/* from on to off, do encoder then crtc */
|
|
|
|
if (mode > old_dpms) {
|
2013-08-14 14:47:37 -06:00
|
|
|
if (encoder)
|
|
|
|
drm_helper_encoder_dpms(encoder, encoder_dpms);
|
2009-05-30 21:42:28 -06:00
|
|
|
if (crtc) {
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
|
2009-05-30 21:42:28 -06:00
|
|
|
if (crtc_funcs->dpms)
|
|
|
|
(*crtc_funcs->dpms) (crtc,
|
|
|
|
drm_helper_choose_crtc_dpms(crtc));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-07-21 03:34:55 -06:00
|
|
|
return 0;
|
2009-05-30 21:42:28 -06:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_helper_connector_dpms);
|
|
|
|
|
2014-01-23 14:58:26 -07:00
|
|
|
/**
|
|
|
|
* drm_helper_mode_fill_fb_struct - fill out framebuffer metadata
|
|
|
|
* @fb: drm_framebuffer object to fill out
|
|
|
|
* @mode_cmd: metadata from the userspace fb creation request
|
|
|
|
*
|
|
|
|
* This helper can be used in a drivers fb_create callback to pre-fill the fb's
|
|
|
|
* metadata fields.
|
|
|
|
*/
|
2014-01-23 14:16:24 -07:00
|
|
|
void drm_helper_mode_fill_fb_struct(struct drm_framebuffer *fb,
|
2015-11-11 10:11:29 -07:00
|
|
|
const struct drm_mode_fb_cmd2 *mode_cmd)
|
2008-11-07 15:05:41 -07:00
|
|
|
{
|
2011-12-19 15:06:49 -07:00
|
|
|
int i;
|
|
|
|
|
2008-11-07 15:05:41 -07:00
|
|
|
fb->width = mode_cmd->width;
|
|
|
|
fb->height = mode_cmd->height;
|
2011-12-19 15:06:49 -07:00
|
|
|
for (i = 0; i < 4; i++) {
|
|
|
|
fb->pitches[i] = mode_cmd->pitches[i];
|
|
|
|
fb->offsets[i] = mode_cmd->offsets[i];
|
2015-02-05 07:41:52 -07:00
|
|
|
fb->modifier[i] = mode_cmd->modifier[i];
|
2011-12-19 15:06:49 -07:00
|
|
|
}
|
2011-11-29 13:02:54 -07:00
|
|
|
drm_fb_get_bpp_depth(mode_cmd->pixel_format, &fb->depth,
|
2011-11-14 15:51:28 -07:00
|
|
|
&fb->bits_per_pixel);
|
|
|
|
fb->pixel_format = mode_cmd->pixel_format;
|
2014-07-01 06:40:42 -06:00
|
|
|
fb->flags = mode_cmd->flags;
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_helper_mode_fill_fb_struct);
|
|
|
|
|
2014-01-22 08:42:02 -07:00
|
|
|
/**
|
|
|
|
* drm_helper_resume_force_mode - force-restore mode setting configuration
|
|
|
|
* @dev: drm_device which should be restored
|
|
|
|
*
|
|
|
|
* Drivers which use the mode setting helpers can use this function to
|
|
|
|
* force-restore the mode setting configuration e.g. on resume or when something
|
|
|
|
* else might have trampled over the hw state (like some overzealous old BIOSen
|
|
|
|
* tended to do).
|
2014-01-23 14:28:30 -07:00
|
|
|
*
|
|
|
|
* This helper doesn't provide a error return value since restoring the old
|
|
|
|
* config should never fail due to resource allocation issues since the driver
|
|
|
|
* has successfully set the restored configuration already. Hence this should
|
|
|
|
* boil down to the equivalent of a few dpms on calls, which also don't provide
|
|
|
|
* an error code.
|
|
|
|
*
|
|
|
|
* Drivers where simply restoring an old configuration again might fail (e.g.
|
|
|
|
* due to slight differences in allocating shared resources when the
|
|
|
|
* configuration is restored in a different order than when userspace set it up)
|
|
|
|
* need to use their own restore logic.
|
2015-12-02 09:50:04 -07:00
|
|
|
*
|
|
|
|
* This function is deprecated. New drivers should implement atomic mode-
|
|
|
|
* setting and use the atomic suspend/resume helpers.
|
|
|
|
*
|
|
|
|
* See also:
|
|
|
|
* drm_atomic_helper_suspend(), drm_atomic_helper_resume()
|
2014-01-22 08:42:02 -07:00
|
|
|
*/
|
2014-01-23 14:28:30 -07:00
|
|
|
void drm_helper_resume_force_mode(struct drm_device *dev)
|
2008-11-07 15:05:41 -07:00
|
|
|
{
|
|
|
|
struct drm_crtc *crtc;
|
2009-12-30 23:30:46 -07:00
|
|
|
struct drm_encoder *encoder;
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_crtc_helper_funcs *crtc_funcs;
|
2014-01-23 14:28:30 -07:00
|
|
|
int encoder_dpms;
|
|
|
|
bool ret;
|
2008-11-07 15:05:41 -07:00
|
|
|
|
2014-03-20 18:45:40 -06:00
|
|
|
drm_modeset_lock_all(dev);
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_crtc(crtc, dev) {
|
2008-11-07 15:05:41 -07:00
|
|
|
|
|
|
|
if (!crtc->enabled)
|
|
|
|
continue;
|
|
|
|
|
2008-12-17 20:14:46 -07:00
|
|
|
ret = drm_crtc_helper_set_mode(crtc, &crtc->mode,
|
2014-04-01 16:22:40 -06:00
|
|
|
crtc->x, crtc->y, crtc->primary->fb);
|
2008-11-07 15:05:41 -07:00
|
|
|
|
2014-01-23 14:28:30 -07:00
|
|
|
/* Restoring the old config should never fail! */
|
2008-11-07 15:05:41 -07:00
|
|
|
if (ret == false)
|
|
|
|
DRM_ERROR("failed to set mode on crtc %p\n", crtc);
|
2009-12-30 23:30:46 -07:00
|
|
|
|
|
|
|
/* Turn off outputs that were already powered off */
|
|
|
|
if (drm_helper_choose_crtc_dpms(crtc)) {
|
drm: Add modeset object iterators
And roll them out across drm_* files. The point here isn't code
prettification (it helps with that too) but that some of these lists
aren't static any more. And having macros will gives us a convenient
place to put locking checks into.
I didn't add an iterator for props since that's only used by a
list_for_each_entry_safe in the driver teardown code.
Search&replace was done with the below cocci spatch. Note that there's
a bunch more places that didn't match and which would need some manual
changes, but I've intentially left these out for this mostly automated
patch.
iterator name drm_for_each_crtc;
struct drm_crtc *crtc;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
+ drm_for_each_crtc (crtc, dev) {
...
}
@@
iterator name drm_for_each_encoder;
struct drm_encoder *encoder;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(encoder, &dev->mode_config.encoder_list, head) {
+ drm_for_each_encoder (encoder, dev) {
...
}
@@
iterator name drm_for_each_fb;
struct drm_framebuffer *fb;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(fb, &dev->mode_config.fb_list, head) {
+ drm_for_each_fb (fb, dev) {
...
}
@@
iterator name drm_for_each_connector;
struct drm_connector *connector;
struct drm_device *dev;
expression head;
@@
- list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
+ drm_for_each_connector (connector, dev) {
...
}
Reviewed-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
2015-07-09 15:44:25 -06:00
|
|
|
drm_for_each_encoder(encoder, dev) {
|
2009-12-30 23:30:46 -07:00
|
|
|
|
|
|
|
if(encoder->crtc != crtc)
|
|
|
|
continue;
|
|
|
|
|
2013-08-14 14:47:37 -06:00
|
|
|
encoder_dpms = drm_helper_choose_encoder_dpms(
|
|
|
|
encoder);
|
|
|
|
|
|
|
|
drm_helper_encoder_dpms(encoder, encoder_dpms);
|
2009-12-30 23:30:46 -07:00
|
|
|
}
|
2010-08-06 08:03:31 -06:00
|
|
|
|
|
|
|
crtc_funcs = crtc->helper_private;
|
|
|
|
if (crtc_funcs->dpms)
|
|
|
|
(*crtc_funcs->dpms) (crtc,
|
|
|
|
drm_helper_choose_crtc_dpms(crtc));
|
2009-12-30 23:30:46 -07:00
|
|
|
}
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
2014-01-23 14:28:30 -07:00
|
|
|
|
2009-07-08 00:13:13 -06:00
|
|
|
/* disable the unused connectors while restoring the modesetting */
|
2014-03-20 07:26:34 -06:00
|
|
|
__drm_helper_disable_unused_functions(dev);
|
2014-03-20 18:45:40 -06:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-07 15:05:41 -07:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_helper_resume_force_mode);
|
2014-10-29 04:13:47 -06:00
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_helper_crtc_mode_set - mode_set implementation for atomic plane helpers
|
|
|
|
* @crtc: DRM CRTC
|
|
|
|
* @mode: DRM display mode which userspace requested
|
|
|
|
* @adjusted_mode: DRM display mode adjusted by ->mode_fixup callbacks
|
|
|
|
* @x: x offset of the CRTC scanout area on the underlying framebuffer
|
|
|
|
* @y: y offset of the CRTC scanout area on the underlying framebuffer
|
|
|
|
* @old_fb: previous framebuffer
|
|
|
|
*
|
|
|
|
* This function implements a callback useable as the ->mode_set callback
|
2015-12-04 01:45:46 -07:00
|
|
|
* required by the CRTC helpers. Besides the atomic plane helper functions for
|
2014-10-29 04:13:47 -06:00
|
|
|
* the primary plane the driver must also provide the ->mode_set_nofb callback
|
2015-12-04 01:45:46 -07:00
|
|
|
* to set up the CRTC.
|
2014-10-29 04:13:47 -06:00
|
|
|
*
|
|
|
|
* This is a transitional helper useful for converting drivers to the atomic
|
|
|
|
* interfaces.
|
|
|
|
*/
|
|
|
|
int drm_helper_crtc_mode_set(struct drm_crtc *crtc, struct drm_display_mode *mode,
|
|
|
|
struct drm_display_mode *adjusted_mode, int x, int y,
|
|
|
|
struct drm_framebuffer *old_fb)
|
|
|
|
{
|
|
|
|
struct drm_crtc_state *crtc_state;
|
2015-03-11 03:51:06 -06:00
|
|
|
const struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
|
2014-10-29 04:13:47 -06:00
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (crtc->funcs->atomic_duplicate_state)
|
|
|
|
crtc_state = crtc->funcs->atomic_duplicate_state(crtc);
|
2015-07-02 08:33:53 -06:00
|
|
|
else {
|
|
|
|
if (!crtc->state)
|
|
|
|
drm_atomic_helper_crtc_reset(crtc);
|
|
|
|
|
2015-07-02 07:16:39 -06:00
|
|
|
crtc_state = drm_atomic_helper_crtc_duplicate_state(crtc);
|
2015-07-02 08:33:53 -06:00
|
|
|
}
|
2015-07-02 07:16:39 -06:00
|
|
|
|
|
|
|
if (!crtc_state)
|
|
|
|
return -ENOMEM;
|
2014-10-29 04:13:47 -06:00
|
|
|
|
|
|
|
crtc_state->planes_changed = true;
|
drm: Atomic crtc/connector updates using crtc/plane helper interfaces
So this is finally the integration of the crtc and plane helper
interfaces into the atomic helper functions.
In the check function we now have a few steps:
- First we update the output routing and figure out which crtcs need a
full mode set. Suitable encoders are selected using ->best_encoder,
with the same semantics as the crtc helpers of implicitly disabling
all connectors currently using the encoder.
- Then we pull all other connectors into the state update which feed
from a crtc which changes. This must be done do catch mode changes
and similar updates - atomic updates are differences on top of the
current state.
- Then we call all the various ->mode_fixup to compute the adjusted
mode. Note that here we have a slight semantic difference compared
to the crtc helpers: We have not yet updated the encoder->crtc link
when calling the encoder's ->mode_fixup function. But that's a
requirement when converting to atomic since we want to prepare the
entire state completely contained with the over drm_atomic_state
structure. So this must be carefully checked when converting drivers
over to atomic helpers.
- Finally we do call the atomic_check functions on planes and crtcs.
The commit function is also quite a beast:
- The only step that can fail is done first, namely pinning the
framebuffers. After that we cross the point of no return, an async
commit would push all that into the worker thread.
- The disabling of encoders and connectors is a bit tricky, since
depending upon the final state we need to select different crtc
helper functions.
- Software tracking is a bit clarified compared to the crtc helpers:
We commit the software state before starting to touch the hardware,
like crtc helpers. But since we just swap them we still have the old
state (i.e. the current hw state) around, which is really handy to
write simple disable functions. So no more
drm_crtc_helper_disable_all_unused_functions kind of fun because
we're leaving unused crtcs/encoders behind. Everything gets shut
down in-order now, which is one of the key differences of the i915
helpers compared to crtc helpers and a really nice additional
guarantee.
- Like with the plane helpers the atomic commit function waits for one
vblank to pass before calling the framebuffer cleanup function.
Compared to Rob's helper approach there's a bunch of upsides:
- All the interfaces which can fail are called in the ->check hook
(i.e. ->best_match and the various ->mode_fixup hooks). This means
that drivers can just reuse those functions and don't need to move
everything into ->atomic_check callbacks. If drivers have no need
for additional constraint checking beyong their existing crtc
helper callbacks they don't need to do anything.
- The actual commit operation is properly stage: First we prepare
framebuffers, which can potentially still fail (due to memory
exhausting). This is important for the async case, where this must
be done synchronously to correctly return errors.
- The output configuration changes (done with crtc helper functions)
and the plane update (using atomic plane helpers) are correctly
interleaved: First we shut down any crtcs that need changing, then
we update planes and finally we enable everything again. Hardware
without GO bits must be more careful with ordering, which this
sequence enables.
- Also for hardware with shared output resources (like display PLLs)
we first must shut down the old configuration before we can enable
the new one. Otherwise we can hit an impossible intermediate state
where there's not enough PLLs (which is the point behind atomic
updates).
v2:
- Ensure that users of ->check update crtc_state->enable correctly.
- Update the legacy state in crtc/plane structures. Eventually we want
to remove that, but for now the drm core still expects this (especially
the plane->fb pointer).
v3: A few changes for better async handling:
- Reorder the software side state commit so that it happens all before
we touch the hardware. This way async support becomes very easy
since we can punt all the actual hw touching to a worker thread. And
as long as we synchronize with that thread (flushing or cancelling,
depending upon what the driver can handle) before we commit the next
software state there's no need for any locking in the worker thread
at all. Which greatly simplifies things.
And as long as we synchronize with all relevant threads we can have
a lot of them (e.g. per-crtc for per-crtc updates) running in
parallel.
- Expose pre/post plane commit steps separately. We need to expose the
actual hw commit step anyway for drivers to be able to implement
asynchronous commit workers. But if we expose pre/post and plane
commit steps individually we allow drivers to selectively use atomic
helpers.
- I've forgotten to call encoder/bridge ->mode_set functions, fix
this.
v4: Add debug output and fix a mixup between current and new state
that resulted in crtcs not getting updated correctly. And in an
Oops ...
v5:
- Be kind to driver writers in the vblank wait functions.. if thing
aren't working yet, and vblank irq will never come, then let's not
block forever.. especially under console-lock.
- Correctly clear connector_state->best_encoder when disabling.
Spotted while trying to understand a report from Rob Clark.
- Only steal encoder if it actually changed, otherwise hilarity ensues
if we steal from the current connector and so set the ->crtc pointer
unexpectedly to NULL. Reported by Rob Clark.
- Bail out in disable_outputs if an output currently doesn't have a
best_encoder - this means it's already disabled.
v6: Fixupe kerneldoc as reported by Paulo. And also fix up kerneldoc
in drm_crtc.h.
v7: Take ownership of the atomic state and clean it up with
drm_atomic_state_free().
v8 Various improvements all over:
- Polish code comments and kerneldoc.
- Improve debug output to make sure all failure cases are logged.
- Treat enabled crtc with no connectors as invalid input from userspace.
- Don't ignore the return value from mode_fixup().
v9:
- Improve debug output for crtc_state->mode_changed.
v10:
- Fixup the vblank waiting code to properly balance the vblank_get/put
calls.
- Better comments when checking/computing crtc->mode_changed
v11: Fixup the encoder stealing logic: We can't look at encoder->crtc
since that's not in the atomic state structures and might be updated
asynchronously in and async commit. Instead we need to inspect all the
connector states and check whether the encoder is currently in used
and if so, on which crtc.
v12: Review from Sean:
- A few spelling fixes.
- Flatten control flow indent by converting if blocks to early
continue/return in 2 places.
- Capture connectors_for_crtc return value in int num_connectors
instead of bool has_connectors and do an explicit int->bool
conversion with !!. I think the helper is more useful for drivers if
it returns the number of connectors (e.g. to detect cloning
configurations), so decided to keep that return value.
Cc: Sean Paul <seanpaul@chromium.org>
Cc: Paulo Zanoni <przanoni@gmail.com>
Cc: Rob Clark <robdclark@gmail.com>
Reviewed-by: Sean Paul <seanpaul@chromium.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2014-09-16 09:50:47 -06:00
|
|
|
crtc_state->mode_changed = true;
|
2015-05-26 07:36:48 -06:00
|
|
|
ret = drm_atomic_set_mode_for_crtc(crtc_state, mode);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2014-10-29 04:13:47 -06:00
|
|
|
drm_mode_copy(&crtc_state->adjusted_mode, adjusted_mode);
|
|
|
|
|
|
|
|
if (crtc_funcs->atomic_check) {
|
|
|
|
ret = crtc_funcs->atomic_check(crtc, crtc_state);
|
2015-05-22 06:34:45 -06:00
|
|
|
if (ret)
|
|
|
|
goto out;
|
2014-10-29 04:13:47 -06:00
|
|
|
}
|
|
|
|
|
|
|
|
swap(crtc->state, crtc_state);
|
|
|
|
|
|
|
|
crtc_funcs->mode_set_nofb(crtc);
|
|
|
|
|
2015-05-22 06:34:45 -06:00
|
|
|
ret = drm_helper_crtc_mode_set_base(crtc, x, y, old_fb);
|
|
|
|
|
|
|
|
out:
|
2015-07-02 07:16:39 -06:00
|
|
|
if (crtc_state) {
|
|
|
|
if (crtc->funcs->atomic_destroy_state)
|
|
|
|
crtc->funcs->atomic_destroy_state(crtc, crtc_state);
|
|
|
|
else
|
|
|
|
drm_atomic_helper_crtc_destroy_state(crtc, crtc_state);
|
2014-10-29 04:13:47 -06:00
|
|
|
}
|
|
|
|
|
2015-05-22 06:34:45 -06:00
|
|
|
return ret;
|
2014-10-29 04:13:47 -06:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_helper_crtc_mode_set);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_helper_crtc_mode_set_base - mode_set_base implementation for atomic plane helpers
|
|
|
|
* @crtc: DRM CRTC
|
|
|
|
* @x: x offset of the CRTC scanout area on the underlying framebuffer
|
|
|
|
* @y: y offset of the CRTC scanout area on the underlying framebuffer
|
|
|
|
* @old_fb: previous framebuffer
|
|
|
|
*
|
|
|
|
* This function implements a callback useable as the ->mode_set_base used
|
2015-12-04 01:45:46 -07:00
|
|
|
* required by the CRTC helpers. The driver must provide the atomic plane helper
|
2014-10-29 04:13:47 -06:00
|
|
|
* functions for the primary plane.
|
|
|
|
*
|
|
|
|
* This is a transitional helper useful for converting drivers to the atomic
|
|
|
|
* interfaces.
|
|
|
|
*/
|
|
|
|
int drm_helper_crtc_mode_set_base(struct drm_crtc *crtc, int x, int y,
|
|
|
|
struct drm_framebuffer *old_fb)
|
|
|
|
{
|
|
|
|
struct drm_plane_state *plane_state;
|
|
|
|
struct drm_plane *plane = crtc->primary;
|
|
|
|
|
|
|
|
if (plane->funcs->atomic_duplicate_state)
|
|
|
|
plane_state = plane->funcs->atomic_duplicate_state(plane);
|
|
|
|
else if (plane->state)
|
2014-11-04 14:57:27 -07:00
|
|
|
plane_state = drm_atomic_helper_plane_duplicate_state(plane);
|
2014-10-29 04:13:47 -06:00
|
|
|
else
|
|
|
|
plane_state = kzalloc(sizeof(*plane_state), GFP_KERNEL);
|
|
|
|
if (!plane_state)
|
|
|
|
return -ENOMEM;
|
2014-11-27 07:49:39 -07:00
|
|
|
plane_state->plane = plane;
|
2014-10-29 04:13:47 -06:00
|
|
|
|
|
|
|
plane_state->crtc = crtc;
|
2014-11-04 14:57:27 -07:00
|
|
|
drm_atomic_set_fb_for_plane(plane_state, crtc->primary->fb);
|
2014-10-29 04:13:47 -06:00
|
|
|
plane_state->crtc_x = 0;
|
|
|
|
plane_state->crtc_y = 0;
|
|
|
|
plane_state->crtc_h = crtc->mode.vdisplay;
|
|
|
|
plane_state->crtc_w = crtc->mode.hdisplay;
|
|
|
|
plane_state->src_x = x << 16;
|
|
|
|
plane_state->src_y = y << 16;
|
|
|
|
plane_state->src_h = crtc->mode.vdisplay << 16;
|
|
|
|
plane_state->src_w = crtc->mode.hdisplay << 16;
|
|
|
|
|
|
|
|
return drm_plane_helper_commit(plane, plane_state, old_fb);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_helper_crtc_mode_set_base);
|