2008-11-08 06:05:41 +08:00
|
|
|
/*
|
|
|
|
* Copyright (c) 2006-2008 Intel Corporation
|
|
|
|
* Copyright (c) 2007 Dave Airlie <airlied@linux.ie>
|
|
|
|
* Copyright (c) 2008 Red Hat Inc.
|
|
|
|
*
|
|
|
|
* 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>
|
|
|
|
*/
|
|
|
|
#include <linux/list.h>
|
include cleanup: Update gfp.h and slab.h includes to prepare for breaking implicit slab.h inclusion from percpu.h
percpu.h is included by sched.h and module.h and thus ends up being
included when building most .c files. percpu.h includes slab.h which
in turn includes gfp.h making everything defined by the two files
universally available and complicating inclusion dependencies.
percpu.h -> slab.h dependency is about to be removed. Prepare for
this change by updating users of gfp and slab facilities include those
headers directly instead of assuming availability. As this conversion
needs to touch large number of source files, the following script is
used as the basis of conversion.
http://userweb.kernel.org/~tj/misc/slabh-sweep.py
The script does the followings.
* Scan files for gfp and slab usages and update includes such that
only the necessary includes are there. ie. if only gfp is used,
gfp.h, if slab is used, slab.h.
* When the script inserts a new include, it looks at the include
blocks and try to put the new include such that its order conforms
to its surrounding. It's put in the include block which contains
core kernel includes, in the same order that the rest are ordered -
alphabetical, Christmas tree, rev-Xmas-tree or at the end if there
doesn't seem to be any matching order.
* If the script can't find a place to put a new include (mostly
because the file doesn't have fitting include block), it prints out
an error message indicating which .h file needs to be added to the
file.
The conversion was done in the following steps.
1. The initial automatic conversion of all .c files updated slightly
over 4000 files, deleting around 700 includes and adding ~480 gfp.h
and ~3000 slab.h inclusions. The script emitted errors for ~400
files.
2. Each error was manually checked. Some didn't need the inclusion,
some needed manual addition while adding it to implementation .h or
embedding .c file was more appropriate for others. This step added
inclusions to around 150 files.
3. The script was run again and the output was compared to the edits
from #2 to make sure no file was left behind.
4. Several build tests were done and a couple of problems were fixed.
e.g. lib/decompress_*.c used malloc/free() wrappers around slab
APIs requiring slab.h to be added manually.
5. The script was run on all .h files but without automatically
editing them as sprinkling gfp.h and slab.h inclusions around .h
files could easily lead to inclusion dependency hell. Most gfp.h
inclusion directives were ignored as stuff from gfp.h was usually
wildly available and often used in preprocessor macros. Each
slab.h inclusion directive was examined and added manually as
necessary.
6. percpu.h was updated not to include slab.h.
7. Build test were done on the following configurations and failures
were fixed. CONFIG_GCOV_KERNEL was turned off for all tests (as my
distributed build env didn't work with gcov compiles) and a few
more options had to be turned off depending on archs to make things
build (like ipr on powerpc/64 which failed due to missing writeq).
* x86 and x86_64 UP and SMP allmodconfig and a custom test config.
* powerpc and powerpc64 SMP allmodconfig
* sparc and sparc64 SMP allmodconfig
* ia64 SMP allmodconfig
* s390 SMP allmodconfig
* alpha SMP allmodconfig
* um on x86_64 SMP allmodconfig
8. percpu.h modifications were reverted so that it could be applied as
a separate patch and serve as bisection point.
Given the fact that I had only a couple of failures from tests on step
6, I'm fairly confident about the coverage of this conversion patch.
If there is a breakage, it's likely to be something in one of the arch
headers which should be easily discoverable easily on most builds of
the specific arch.
Signed-off-by: Tejun Heo <tj@kernel.org>
Guess-its-ok-by: Christoph Lameter <cl@linux-foundation.org>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com>
2010-03-24 16:04:11 +08:00
|
|
|
#include <linux/slab.h>
|
2011-08-31 06:16:33 +08:00
|
|
|
#include <linux/export.h>
|
2012-10-03 01:01:07 +08:00
|
|
|
#include <drm/drmP.h>
|
|
|
|
#include <drm/drm_crtc.h>
|
|
|
|
#include <drm/drm_edid.h>
|
|
|
|
#include <drm/drm_fourcc.h>
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
/**
|
|
|
|
* drm_modeset_lock_all - take all modeset locks
|
|
|
|
* @dev: drm device
|
|
|
|
*
|
|
|
|
* This function takes all modeset locks, suitable where a more fine-grained
|
|
|
|
* scheme isn't (yet) implemented.
|
|
|
|
*/
|
|
|
|
void drm_modeset_lock_all(struct drm_device *dev)
|
|
|
|
{
|
drm: add per-crtc locks
*drumroll*
The basic idea is to protect per-crtc state which can change without
touching the output configuration with separate mutexes, i.e. all the
input side state to a crtc like framebuffers, cursor settings or plane
configuration. Holding such a crtc lock gives a read-lock on all the
other crtc state which can be changed by e.g. a modeset.
All non-crtc state is still protected by the mode_config mutex.
Callers that need to change modeset state of a crtc (e.g. dpms or
set_mode) need to grab both the mode_config lock and nested within any
crtc locks.
Note that since there can only ever be one holder of the mode_config
lock we can grab the subordinate crtc locks in any order (if we need
to grab more than one of them). Lockdep can handle such nesting with
the mutex_lock_nest_lock call correctly.
With this functions that only touch connectors/encoders but not crtcs
only need to take the mode_config lock. The biggest such case is the
output probing, which means that we can now pageflip and move cursors
while the output probe code is reading an edid.
Most cases neatly fall into the three buckets:
- Only touches connectors and similar output state and so only needs
the mode_config lock.
- Touches the global configuration and so needs all locks.
- Only touches the crtc input side and so only needs the crtc lock.
But a few cases that need special consideration:
- Load detection which requires a crtc. The mode_config lock already
prevents a modeset change, so we can use any unused crtc as we like
to do load detection. The only thing to consider is that such
temporary state changes don't leak out to userspace through ioctls
that only take the crtc look (like a pageflip). Hence the load
detect code needs to grab the crtc of any output pipes it touches
(but only if it touches state used by the pageflip or cursor
ioctls).
- Atomic pageflip when moving planes. The first case is sane hw, where
planes have a fixed association with crtcs - nothing needs to be
done there. More insane^Wflexible hw needs to have plane->crtc
mapping which is separately protect with a lock that nests within
the crtc lock. If the plane is unused we can just assign it to the
current crtc and continue. But if a plane is already in use by
another crtc we can't just reassign it.
Two solution present themselves: Either go back to a slow-path which
takes all modeset locks, potentially incure quite a hefty delay. Or
simply disallowing such changes in one atomic pageflip - in general
the vblanks of two crtcs are not synced, so there's no sane way to
atomically flip such plane changes accross more than one crtc. I'd
heavily favour the later approach, going as far as mandating it as
part of the ABI of such a new a nuclear pageflip.
And if we _really_ want such semantics, we can always get them by
introducing another pageflip mutex between the mode_config.mutex and
the individual crtc locks. Pageflips crossing more than one crtc
would then need to take that lock first, to lock out concurrent
multi-crtc pageflips.
- Optimized global modeset operations: We could just take the
mode_config lock and then lazily lock all crtc which are affected by
a modeset operation. This has the advantage that pageflip could
continue unhampered on unaffected crtc. But if e.g. global resources
like plls need to be reassigned and so affect unrelated crtcs we can
still do that - nested locking works in any order.
This patch just adds the locks and takes them in drm_modeset_lock_all,
no real locking changes yet.
v2: Need to initialize the new lock in crtc_init and lock it righ
away, for otherwise the modeset_unlock_all below will try to unlock a
not-locked mutex.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-02 09:18:25 +08:00
|
|
|
struct drm_crtc *crtc;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
mutex_lock(&dev->mode_config.mutex);
|
drm: add per-crtc locks
*drumroll*
The basic idea is to protect per-crtc state which can change without
touching the output configuration with separate mutexes, i.e. all the
input side state to a crtc like framebuffers, cursor settings or plane
configuration. Holding such a crtc lock gives a read-lock on all the
other crtc state which can be changed by e.g. a modeset.
All non-crtc state is still protected by the mode_config mutex.
Callers that need to change modeset state of a crtc (e.g. dpms or
set_mode) need to grab both the mode_config lock and nested within any
crtc locks.
Note that since there can only ever be one holder of the mode_config
lock we can grab the subordinate crtc locks in any order (if we need
to grab more than one of them). Lockdep can handle such nesting with
the mutex_lock_nest_lock call correctly.
With this functions that only touch connectors/encoders but not crtcs
only need to take the mode_config lock. The biggest such case is the
output probing, which means that we can now pageflip and move cursors
while the output probe code is reading an edid.
Most cases neatly fall into the three buckets:
- Only touches connectors and similar output state and so only needs
the mode_config lock.
- Touches the global configuration and so needs all locks.
- Only touches the crtc input side and so only needs the crtc lock.
But a few cases that need special consideration:
- Load detection which requires a crtc. The mode_config lock already
prevents a modeset change, so we can use any unused crtc as we like
to do load detection. The only thing to consider is that such
temporary state changes don't leak out to userspace through ioctls
that only take the crtc look (like a pageflip). Hence the load
detect code needs to grab the crtc of any output pipes it touches
(but only if it touches state used by the pageflip or cursor
ioctls).
- Atomic pageflip when moving planes. The first case is sane hw, where
planes have a fixed association with crtcs - nothing needs to be
done there. More insane^Wflexible hw needs to have plane->crtc
mapping which is separately protect with a lock that nests within
the crtc lock. If the plane is unused we can just assign it to the
current crtc and continue. But if a plane is already in use by
another crtc we can't just reassign it.
Two solution present themselves: Either go back to a slow-path which
takes all modeset locks, potentially incure quite a hefty delay. Or
simply disallowing such changes in one atomic pageflip - in general
the vblanks of two crtcs are not synced, so there's no sane way to
atomically flip such plane changes accross more than one crtc. I'd
heavily favour the later approach, going as far as mandating it as
part of the ABI of such a new a nuclear pageflip.
And if we _really_ want such semantics, we can always get them by
introducing another pageflip mutex between the mode_config.mutex and
the individual crtc locks. Pageflips crossing more than one crtc
would then need to take that lock first, to lock out concurrent
multi-crtc pageflips.
- Optimized global modeset operations: We could just take the
mode_config lock and then lazily lock all crtc which are affected by
a modeset operation. This has the advantage that pageflip could
continue unhampered on unaffected crtc. But if e.g. global resources
like plls need to be reassigned and so affect unrelated crtcs we can
still do that - nested locking works in any order.
This patch just adds the locks and takes them in drm_modeset_lock_all,
no real locking changes yet.
v2: Need to initialize the new lock in crtc_init and lock it righ
away, for otherwise the modeset_unlock_all below will try to unlock a
not-locked mutex.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-02 09:18:25 +08:00
|
|
|
|
|
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
|
|
|
|
mutex_lock_nest_lock(&crtc->mutex, &dev->mode_config.mutex);
|
2012-12-02 07:28:11 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_modeset_lock_all);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_modeset_unlock_all - drop all modeset locks
|
|
|
|
* @dev: device
|
|
|
|
*/
|
|
|
|
void drm_modeset_unlock_all(struct drm_device *dev)
|
|
|
|
{
|
drm: add per-crtc locks
*drumroll*
The basic idea is to protect per-crtc state which can change without
touching the output configuration with separate mutexes, i.e. all the
input side state to a crtc like framebuffers, cursor settings or plane
configuration. Holding such a crtc lock gives a read-lock on all the
other crtc state which can be changed by e.g. a modeset.
All non-crtc state is still protected by the mode_config mutex.
Callers that need to change modeset state of a crtc (e.g. dpms or
set_mode) need to grab both the mode_config lock and nested within any
crtc locks.
Note that since there can only ever be one holder of the mode_config
lock we can grab the subordinate crtc locks in any order (if we need
to grab more than one of them). Lockdep can handle such nesting with
the mutex_lock_nest_lock call correctly.
With this functions that only touch connectors/encoders but not crtcs
only need to take the mode_config lock. The biggest such case is the
output probing, which means that we can now pageflip and move cursors
while the output probe code is reading an edid.
Most cases neatly fall into the three buckets:
- Only touches connectors and similar output state and so only needs
the mode_config lock.
- Touches the global configuration and so needs all locks.
- Only touches the crtc input side and so only needs the crtc lock.
But a few cases that need special consideration:
- Load detection which requires a crtc. The mode_config lock already
prevents a modeset change, so we can use any unused crtc as we like
to do load detection. The only thing to consider is that such
temporary state changes don't leak out to userspace through ioctls
that only take the crtc look (like a pageflip). Hence the load
detect code needs to grab the crtc of any output pipes it touches
(but only if it touches state used by the pageflip or cursor
ioctls).
- Atomic pageflip when moving planes. The first case is sane hw, where
planes have a fixed association with crtcs - nothing needs to be
done there. More insane^Wflexible hw needs to have plane->crtc
mapping which is separately protect with a lock that nests within
the crtc lock. If the plane is unused we can just assign it to the
current crtc and continue. But if a plane is already in use by
another crtc we can't just reassign it.
Two solution present themselves: Either go back to a slow-path which
takes all modeset locks, potentially incure quite a hefty delay. Or
simply disallowing such changes in one atomic pageflip - in general
the vblanks of two crtcs are not synced, so there's no sane way to
atomically flip such plane changes accross more than one crtc. I'd
heavily favour the later approach, going as far as mandating it as
part of the ABI of such a new a nuclear pageflip.
And if we _really_ want such semantics, we can always get them by
introducing another pageflip mutex between the mode_config.mutex and
the individual crtc locks. Pageflips crossing more than one crtc
would then need to take that lock first, to lock out concurrent
multi-crtc pageflips.
- Optimized global modeset operations: We could just take the
mode_config lock and then lazily lock all crtc which are affected by
a modeset operation. This has the advantage that pageflip could
continue unhampered on unaffected crtc. But if e.g. global resources
like plls need to be reassigned and so affect unrelated crtcs we can
still do that - nested locking works in any order.
This patch just adds the locks and takes them in drm_modeset_lock_all,
no real locking changes yet.
v2: Need to initialize the new lock in crtc_init and lock it righ
away, for otherwise the modeset_unlock_all below will try to unlock a
not-locked mutex.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-02 09:18:25 +08:00
|
|
|
struct drm_crtc *crtc;
|
|
|
|
|
|
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
|
|
|
|
mutex_unlock(&crtc->mutex);
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
mutex_unlock(&dev->mode_config.mutex);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_modeset_unlock_all);
|
|
|
|
|
2013-01-21 00:32:21 +08:00
|
|
|
/**
|
|
|
|
* drm_warn_on_modeset_not_all_locked - check that all modeset locks are locked
|
|
|
|
* @dev: device
|
|
|
|
*/
|
|
|
|
void drm_warn_on_modeset_not_all_locked(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
|
|
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
|
|
|
|
WARN_ON(!mutex_is_locked(&crtc->mutex));
|
|
|
|
|
|
|
|
WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_warn_on_modeset_not_all_locked);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
/* Avoid boilerplate. I'm tired of typing. */
|
|
|
|
#define DRM_ENUM_NAME_FN(fnname, list) \
|
|
|
|
char *fnname(int val) \
|
|
|
|
{ \
|
|
|
|
int i; \
|
|
|
|
for (i = 0; i < ARRAY_SIZE(list); i++) { \
|
|
|
|
if (list[i].type == val) \
|
|
|
|
return list[i].name; \
|
|
|
|
} \
|
|
|
|
return "(unknown)"; \
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Global properties
|
|
|
|
*/
|
|
|
|
static struct drm_prop_enum_list drm_dpms_enum_list[] =
|
|
|
|
{ { DRM_MODE_DPMS_ON, "On" },
|
|
|
|
{ DRM_MODE_DPMS_STANDBY, "Standby" },
|
|
|
|
{ DRM_MODE_DPMS_SUSPEND, "Suspend" },
|
|
|
|
{ DRM_MODE_DPMS_OFF, "Off" }
|
|
|
|
};
|
|
|
|
|
|
|
|
DRM_ENUM_NAME_FN(drm_get_dpms_name, drm_dpms_enum_list)
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Optional properties
|
|
|
|
*/
|
|
|
|
static struct drm_prop_enum_list drm_scaling_mode_enum_list[] =
|
|
|
|
{
|
2009-07-02 01:04:40 +08:00
|
|
|
{ DRM_MODE_SCALE_NONE, "None" },
|
|
|
|
{ DRM_MODE_SCALE_FULLSCREEN, "Full" },
|
|
|
|
{ DRM_MODE_SCALE_CENTER, "Center" },
|
|
|
|
{ DRM_MODE_SCALE_ASPECT, "Full aspect" },
|
2008-11-08 06:05:41 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct drm_prop_enum_list drm_dithering_mode_enum_list[] =
|
|
|
|
{
|
|
|
|
{ DRM_MODE_DITHERING_OFF, "Off" },
|
|
|
|
{ DRM_MODE_DITHERING_ON, "On" },
|
2010-07-16 13:09:17 +08:00
|
|
|
{ DRM_MODE_DITHERING_AUTO, "Automatic" },
|
2008-11-08 06:05:41 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Non-global properties, but "required" for certain connectors.
|
|
|
|
*/
|
|
|
|
static struct drm_prop_enum_list drm_dvi_i_select_enum_list[] =
|
|
|
|
{
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_Automatic, "Automatic" }, /* DVI-I and TV-out */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_DVID, "DVI-D" }, /* DVI-I */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_DVIA, "DVI-A" }, /* DVI-I */
|
|
|
|
};
|
|
|
|
|
|
|
|
DRM_ENUM_NAME_FN(drm_get_dvi_i_select_name, drm_dvi_i_select_enum_list)
|
|
|
|
|
|
|
|
static struct drm_prop_enum_list drm_dvi_i_subconnector_enum_list[] =
|
|
|
|
{
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_Unknown, "Unknown" }, /* DVI-I and TV-out */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_DVID, "DVI-D" }, /* DVI-I */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_DVIA, "DVI-A" }, /* DVI-I */
|
|
|
|
};
|
|
|
|
|
|
|
|
DRM_ENUM_NAME_FN(drm_get_dvi_i_subconnector_name,
|
|
|
|
drm_dvi_i_subconnector_enum_list)
|
|
|
|
|
|
|
|
static struct drm_prop_enum_list drm_tv_select_enum_list[] =
|
|
|
|
{
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_Automatic, "Automatic" }, /* DVI-I and TV-out */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_SVIDEO, "SVIDEO" }, /* TV-out */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
|
2009-08-02 10:19:19 +08:00
|
|
|
{ DRM_MODE_SUBCONNECTOR_SCART, "SCART" }, /* TV-out */
|
2008-11-08 06:05:41 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
DRM_ENUM_NAME_FN(drm_get_tv_select_name, drm_tv_select_enum_list)
|
|
|
|
|
|
|
|
static struct drm_prop_enum_list drm_tv_subconnector_enum_list[] =
|
|
|
|
{
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_Unknown, "Unknown" }, /* DVI-I and TV-out */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_Composite, "Composite" }, /* TV-out */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_SVIDEO, "SVIDEO" }, /* TV-out */
|
|
|
|
{ DRM_MODE_SUBCONNECTOR_Component, "Component" }, /* TV-out */
|
2009-08-02 10:19:19 +08:00
|
|
|
{ DRM_MODE_SUBCONNECTOR_SCART, "SCART" }, /* TV-out */
|
2008-11-08 06:05:41 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
DRM_ENUM_NAME_FN(drm_get_tv_subconnector_name,
|
|
|
|
drm_tv_subconnector_enum_list)
|
|
|
|
|
2009-12-04 07:25:47 +08:00
|
|
|
static struct drm_prop_enum_list drm_dirty_info_enum_list[] = {
|
|
|
|
{ DRM_MODE_DIRTY_OFF, "Off" },
|
|
|
|
{ DRM_MODE_DIRTY_ON, "On" },
|
|
|
|
{ DRM_MODE_DIRTY_ANNOTATE, "Annotate" },
|
|
|
|
};
|
|
|
|
|
|
|
|
DRM_ENUM_NAME_FN(drm_get_dirty_info_name,
|
|
|
|
drm_dirty_info_enum_list)
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
struct drm_conn_prop_enum_list {
|
|
|
|
int type;
|
|
|
|
char *name;
|
|
|
|
int count;
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Connector and encoder types.
|
|
|
|
*/
|
|
|
|
static struct drm_conn_prop_enum_list drm_connector_enum_list[] =
|
|
|
|
{ { DRM_MODE_CONNECTOR_Unknown, "Unknown", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_VGA, "VGA", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_DVII, "DVI-I", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_DVID, "DVI-D", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_DVIA, "DVI-A", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_Composite, "Composite", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_SVIDEO, "SVIDEO", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_LVDS, "LVDS", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_Component, "Component", 0 },
|
2010-12-09 08:09:42 +08:00
|
|
|
{ DRM_MODE_CONNECTOR_9PinDIN, "DIN", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_DisplayPort, "DP", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_HDMIA, "HDMI-A", 0 },
|
|
|
|
{ DRM_MODE_CONNECTOR_HDMIB, "HDMI-B", 0 },
|
2009-08-02 10:19:18 +08:00
|
|
|
{ DRM_MODE_CONNECTOR_TV, "TV", 0 },
|
2010-12-09 08:09:42 +08:00
|
|
|
{ DRM_MODE_CONNECTOR_eDP, "eDP", 0 },
|
2011-10-22 16:36:19 +08:00
|
|
|
{ DRM_MODE_CONNECTOR_VIRTUAL, "Virtual", 0},
|
2008-11-08 06:05:41 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
static struct drm_prop_enum_list drm_encoder_enum_list[] =
|
|
|
|
{ { DRM_MODE_ENCODER_NONE, "None" },
|
|
|
|
{ DRM_MODE_ENCODER_DAC, "DAC" },
|
|
|
|
{ DRM_MODE_ENCODER_TMDS, "TMDS" },
|
|
|
|
{ DRM_MODE_ENCODER_LVDS, "LVDS" },
|
|
|
|
{ DRM_MODE_ENCODER_TVDAC, "TV" },
|
2011-10-22 16:36:19 +08:00
|
|
|
{ DRM_MODE_ENCODER_VIRTUAL, "Virtual" },
|
2008-11-08 06:05:41 +08:00
|
|
|
};
|
|
|
|
|
|
|
|
char *drm_get_encoder_name(struct drm_encoder *encoder)
|
|
|
|
{
|
|
|
|
static char buf[32];
|
|
|
|
|
|
|
|
snprintf(buf, 32, "%s-%d",
|
|
|
|
drm_encoder_enum_list[encoder->encoder_type].name,
|
|
|
|
encoder->base.id);
|
|
|
|
return buf;
|
|
|
|
}
|
2009-09-07 13:45:33 +08:00
|
|
|
EXPORT_SYMBOL(drm_get_encoder_name);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
char *drm_get_connector_name(struct drm_connector *connector)
|
|
|
|
{
|
|
|
|
static char buf[32];
|
|
|
|
|
|
|
|
snprintf(buf, 32, "%s-%d",
|
|
|
|
drm_connector_enum_list[connector->connector_type].name,
|
|
|
|
connector->connector_type_id);
|
|
|
|
return buf;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_get_connector_name);
|
|
|
|
|
|
|
|
char *drm_get_connector_status_name(enum drm_connector_status status)
|
|
|
|
{
|
|
|
|
if (status == connector_status_connected)
|
|
|
|
return "connected";
|
|
|
|
else if (status == connector_status_disconnected)
|
|
|
|
return "disconnected";
|
|
|
|
else
|
|
|
|
return "unknown";
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-12-02 07:09:18 +08:00
|
|
|
* drm_mode_object_get - allocate a new modeset identifier
|
2008-11-08 06:05:41 +08:00
|
|
|
* @dev: DRM device
|
2012-12-02 07:09:18 +08:00
|
|
|
* @obj: object pointer, used to generate unique ID
|
|
|
|
* @obj_type: object type
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Create a unique identifier based on @ptr in @dev's identifier space. Used
|
|
|
|
* for tracking modes, CRTCs and connectors.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* New unique (relative to other objects in @dev) integer identifier for the
|
|
|
|
* object.
|
|
|
|
*/
|
|
|
|
static int drm_mode_object_get(struct drm_device *dev,
|
|
|
|
struct drm_mode_object *obj, uint32_t obj_type)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
2009-01-19 15:21:45 +08:00
|
|
|
mutex_lock(&dev->mode_config.idr_mutex);
|
2013-02-28 09:04:08 +08:00
|
|
|
ret = idr_alloc(&dev->mode_config.crtc_idr, obj, 1, 0, GFP_KERNEL);
|
|
|
|
if (ret >= 0) {
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
/*
|
|
|
|
* Set up the object linking under the protection of the idr
|
|
|
|
* lock so that other users can't see inconsistent state.
|
|
|
|
*/
|
2013-02-28 09:04:08 +08:00
|
|
|
obj->id = ret;
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
obj->type = obj_type;
|
|
|
|
}
|
2009-01-19 15:21:45 +08:00
|
|
|
mutex_unlock(&dev->mode_config.idr_mutex);
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
|
2013-02-28 09:04:08 +08:00
|
|
|
return ret < 0 ? ret : 0;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
2012-12-02 07:09:18 +08:00
|
|
|
* drm_mode_object_put - free a modeset identifer
|
2008-11-08 06:05:41 +08:00
|
|
|
* @dev: DRM device
|
2012-12-02 07:09:18 +08:00
|
|
|
* @object: object to free
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Free @id from @dev's unique identifier pool.
|
|
|
|
*/
|
|
|
|
static void drm_mode_object_put(struct drm_device *dev,
|
|
|
|
struct drm_mode_object *object)
|
|
|
|
{
|
2009-01-19 15:21:45 +08:00
|
|
|
mutex_lock(&dev->mode_config.idr_mutex);
|
2008-11-08 06:05:41 +08:00
|
|
|
idr_remove(&dev->mode_config.crtc_idr, object->id);
|
2009-01-19 15:21:45 +08:00
|
|
|
mutex_unlock(&dev->mode_config.idr_mutex);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
2012-12-03 04:53:40 +08:00
|
|
|
/**
|
|
|
|
* drm_mode_object_find - look up a drm object with static lifetime
|
|
|
|
* @dev: drm device
|
|
|
|
* @id: id of the mode object
|
|
|
|
* @type: type of the mode object
|
|
|
|
*
|
|
|
|
* Note that framebuffers cannot be looked up with this functions - since those
|
|
|
|
* are reference counted, they need special treatment.
|
|
|
|
*/
|
2009-09-16 04:57:31 +08:00
|
|
|
struct drm_mode_object *drm_mode_object_find(struct drm_device *dev,
|
|
|
|
uint32_t id, uint32_t type)
|
2008-11-08 06:05:41 +08:00
|
|
|
{
|
2009-01-19 15:21:45 +08:00
|
|
|
struct drm_mode_object *obj = NULL;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-12-03 04:53:40 +08:00
|
|
|
/* Framebuffers are reference counted and need their own lookup
|
|
|
|
* function.*/
|
|
|
|
WARN_ON(type == DRM_MODE_OBJECT_FB);
|
|
|
|
|
2009-01-19 15:21:45 +08:00
|
|
|
mutex_lock(&dev->mode_config.idr_mutex);
|
2008-11-08 06:05:41 +08:00
|
|
|
obj = idr_find(&dev->mode_config.crtc_idr, id);
|
|
|
|
if (!obj || (obj->type != type) || (obj->id != id))
|
2009-01-19 15:21:45 +08:00
|
|
|
obj = NULL;
|
|
|
|
mutex_unlock(&dev->mode_config.idr_mutex);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
return obj;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_object_find);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_framebuffer_init - initialize a framebuffer
|
|
|
|
* @dev: DRM device
|
2012-12-02 07:09:18 +08:00
|
|
|
* @fb: framebuffer to be initialized
|
|
|
|
* @funcs: ... with these functions
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Allocates an ID for the framebuffer's parent mode object, sets its mode
|
|
|
|
* functions & device file and adds it to the master fd list.
|
|
|
|
*
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
* IMPORTANT:
|
|
|
|
* This functions publishes the fb and makes it available for concurrent access
|
|
|
|
* by other users. Which means by this point the fb _must_ be fully set up -
|
|
|
|
* since all the fb attributes are invariant over its lifetime, no further
|
|
|
|
* locking but only correct reference counting is required.
|
|
|
|
*
|
2008-11-08 06:05:41 +08:00
|
|
|
* RETURNS:
|
tree-wide: fix assorted typos all over the place
That is "success", "unknown", "through", "performance", "[re|un]mapping"
, "access", "default", "reasonable", "[con]currently", "temperature"
, "channel", "[un]used", "application", "example","hierarchy", "therefore"
, "[over|under]flow", "contiguous", "threshold", "enough" and others.
Signed-off-by: André Goddard Rosa <andre.goddard@gmail.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2009-11-14 23:09:05 +08:00
|
|
|
* Zero on success, error code on failure.
|
2008-11-08 06:05:41 +08:00
|
|
|
*/
|
|
|
|
int drm_framebuffer_init(struct drm_device *dev, struct drm_framebuffer *fb,
|
|
|
|
const struct drm_framebuffer_funcs *funcs)
|
|
|
|
{
|
|
|
|
int ret;
|
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_lock(&dev->mode_config.fb_lock);
|
2012-09-06 05:48:38 +08:00
|
|
|
kref_init(&fb->refcount);
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
INIT_LIST_HEAD(&fb->filp_head);
|
|
|
|
fb->dev = dev;
|
|
|
|
fb->funcs = funcs;
|
2012-09-06 05:48:38 +08:00
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
ret = drm_mode_object_get(dev, &fb->base, DRM_MODE_OBJECT_FB);
|
2012-03-13 18:35:48 +08:00
|
|
|
if (ret)
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
goto out;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
/* Grab the idr reference. */
|
|
|
|
drm_framebuffer_reference(fb);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
dev->mode_config.num_fb++;
|
|
|
|
list_add(&fb->head, &dev->mode_config.fb_list);
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
out:
|
|
|
|
mutex_unlock(&dev->mode_config.fb_lock);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_framebuffer_init);
|
|
|
|
|
2012-09-06 05:48:38 +08:00
|
|
|
static void drm_framebuffer_free(struct kref *kref)
|
|
|
|
{
|
|
|
|
struct drm_framebuffer *fb =
|
|
|
|
container_of(kref, struct drm_framebuffer, refcount);
|
|
|
|
fb->funcs->destroy(fb);
|
|
|
|
}
|
|
|
|
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
static struct drm_framebuffer *__drm_framebuffer_lookup(struct drm_device *dev,
|
|
|
|
uint32_t id)
|
|
|
|
{
|
|
|
|
struct drm_mode_object *obj = NULL;
|
|
|
|
struct drm_framebuffer *fb;
|
|
|
|
|
|
|
|
mutex_lock(&dev->mode_config.idr_mutex);
|
|
|
|
obj = idr_find(&dev->mode_config.crtc_idr, id);
|
|
|
|
if (!obj || (obj->type != DRM_MODE_OBJECT_FB) || (obj->id != id))
|
|
|
|
fb = NULL;
|
|
|
|
else
|
|
|
|
fb = obj_to_fb(obj);
|
|
|
|
mutex_unlock(&dev->mode_config.idr_mutex);
|
|
|
|
|
|
|
|
return fb;
|
|
|
|
}
|
|
|
|
|
2012-12-03 04:53:40 +08:00
|
|
|
/**
|
|
|
|
* drm_framebuffer_lookup - look up a drm framebuffer and grab a reference
|
|
|
|
* @dev: drm device
|
|
|
|
* @id: id of the fb object
|
|
|
|
*
|
|
|
|
* If successful, this grabs an additional reference to the framebuffer -
|
|
|
|
* callers need to make sure to eventually unreference the returned framebuffer
|
|
|
|
* again.
|
|
|
|
*/
|
|
|
|
struct drm_framebuffer *drm_framebuffer_lookup(struct drm_device *dev,
|
|
|
|
uint32_t id)
|
|
|
|
{
|
|
|
|
struct drm_framebuffer *fb;
|
|
|
|
|
|
|
|
mutex_lock(&dev->mode_config.fb_lock);
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
fb = __drm_framebuffer_lookup(dev, id);
|
2012-12-03 04:53:40 +08:00
|
|
|
if (fb)
|
|
|
|
kref_get(&fb->refcount);
|
|
|
|
mutex_unlock(&dev->mode_config.fb_lock);
|
|
|
|
|
|
|
|
return fb;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_framebuffer_lookup);
|
|
|
|
|
2012-09-06 05:48:38 +08:00
|
|
|
/**
|
|
|
|
* drm_framebuffer_unreference - unref a framebuffer
|
2012-12-02 07:09:18 +08:00
|
|
|
* @fb: framebuffer to unref
|
|
|
|
*
|
|
|
|
* This functions decrements the fb's refcount and frees it if it drops to zero.
|
2012-09-06 05:48:38 +08:00
|
|
|
*/
|
|
|
|
void drm_framebuffer_unreference(struct drm_framebuffer *fb)
|
|
|
|
{
|
|
|
|
DRM_DEBUG("FB ID: %d\n", fb->base.id);
|
|
|
|
kref_put(&fb->refcount, drm_framebuffer_free);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_framebuffer_unreference);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_framebuffer_reference - incr the fb refcnt
|
2012-12-02 07:09:18 +08:00
|
|
|
* @fb: framebuffer
|
2012-09-06 05:48:38 +08:00
|
|
|
*/
|
|
|
|
void drm_framebuffer_reference(struct drm_framebuffer *fb)
|
|
|
|
{
|
|
|
|
DRM_DEBUG("FB ID: %d\n", fb->base.id);
|
|
|
|
kref_get(&fb->refcount);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_framebuffer_reference);
|
|
|
|
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
static void drm_framebuffer_free_bug(struct kref *kref)
|
|
|
|
{
|
|
|
|
BUG();
|
|
|
|
}
|
|
|
|
|
2012-12-11 07:59:24 +08:00
|
|
|
static void __drm_framebuffer_unreference(struct drm_framebuffer *fb)
|
|
|
|
{
|
|
|
|
DRM_DEBUG("FB ID: %d\n", fb->base.id);
|
|
|
|
kref_put(&fb->refcount, drm_framebuffer_free_bug);
|
|
|
|
}
|
|
|
|
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
/* dev->mode_config.fb_lock must be held! */
|
|
|
|
static void __drm_framebuffer_unregister(struct drm_device *dev,
|
|
|
|
struct drm_framebuffer *fb)
|
|
|
|
{
|
|
|
|
mutex_lock(&dev->mode_config.idr_mutex);
|
|
|
|
idr_remove(&dev->mode_config.crtc_idr, fb->base.id);
|
|
|
|
mutex_unlock(&dev->mode_config.idr_mutex);
|
|
|
|
|
|
|
|
fb->base.id = 0;
|
|
|
|
|
2012-12-11 07:59:24 +08:00
|
|
|
__drm_framebuffer_unreference(fb);
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
}
|
|
|
|
|
drm: revamp framebuffer cleanup interfaces
We have two classes of framebuffer
- Created by the driver (atm only for fbdev), and the driver holds
onto the last reference count until destruction.
- Created by userspace and associated with a given fd. These
framebuffers will be reaped when their assoiciated fb is closed.
Now these two cases are set up differently, the framebuffers are on
different lists and hence destruction needs to clean up different
things. Also, for userspace framebuffers we remove them from any
current usage, whereas for internal framebuffers it is assumed that
the driver has done this already.
Long story short, we need two different ways to cleanup such drivers.
Three functions are involved in total:
- drm_framebuffer_remove: Convenience function which removes the fb
from all active usage and then drops the passed-in reference.
- drm_framebuffer_unregister_private: Will remove driver-private
framebuffers from relevant lists and drop the corresponding
references. Should be called for driver-private framebuffers before
dropping the last reference (or like for a lot of the drivers where
the fbdev is embedded someplace else, before doing the cleanup
manually).
- drm_framebuffer_cleanup: Final cleanup for both classes of fbs,
should be called by the driver's ->destroy callback once the last
reference is gone.
This patch just rolls out the new interfaces and updates all drivers
(by adding calls to drm_framebuffer_unregister_private at all the
right places)- no functional changes yet. Follow-on patches will move
drm core code around and update the lifetime management for
framebuffers, so that we are no longer required to keep framebuffers
alive by locking mode_config.mutex.
I've also updated the kerneldoc already.
vmwgfx seems to again be a bit special, at least I haven't figured out
how the fbdev support in that driver works. It smells like it's
external though.
v2: The i915 driver creates another private framebuffer in the
load-detect code. Adjust its cleanup code, too.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 03:42:17 +08:00
|
|
|
/**
|
|
|
|
* drm_framebuffer_unregister_private - unregister a private fb from the lookup idr
|
|
|
|
* @fb: fb to unregister
|
|
|
|
*
|
|
|
|
* Drivers need to call this when cleaning up driver-private framebuffers, e.g.
|
|
|
|
* those used for fbdev. Note that the caller must hold a reference of it's own,
|
|
|
|
* i.e. the object may not be destroyed through this call (since it'll lead to a
|
|
|
|
* locking inversion).
|
|
|
|
*/
|
|
|
|
void drm_framebuffer_unregister_private(struct drm_framebuffer *fb)
|
|
|
|
{
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
struct drm_device *dev = fb->dev;
|
|
|
|
|
|
|
|
mutex_lock(&dev->mode_config.fb_lock);
|
|
|
|
/* Mark fb as reaped and drop idr ref. */
|
|
|
|
__drm_framebuffer_unregister(dev, fb);
|
|
|
|
mutex_unlock(&dev->mode_config.fb_lock);
|
drm: revamp framebuffer cleanup interfaces
We have two classes of framebuffer
- Created by the driver (atm only for fbdev), and the driver holds
onto the last reference count until destruction.
- Created by userspace and associated with a given fd. These
framebuffers will be reaped when their assoiciated fb is closed.
Now these two cases are set up differently, the framebuffers are on
different lists and hence destruction needs to clean up different
things. Also, for userspace framebuffers we remove them from any
current usage, whereas for internal framebuffers it is assumed that
the driver has done this already.
Long story short, we need two different ways to cleanup such drivers.
Three functions are involved in total:
- drm_framebuffer_remove: Convenience function which removes the fb
from all active usage and then drops the passed-in reference.
- drm_framebuffer_unregister_private: Will remove driver-private
framebuffers from relevant lists and drop the corresponding
references. Should be called for driver-private framebuffers before
dropping the last reference (or like for a lot of the drivers where
the fbdev is embedded someplace else, before doing the cleanup
manually).
- drm_framebuffer_cleanup: Final cleanup for both classes of fbs,
should be called by the driver's ->destroy callback once the last
reference is gone.
This patch just rolls out the new interfaces and updates all drivers
(by adding calls to drm_framebuffer_unregister_private at all the
right places)- no functional changes yet. Follow-on patches will move
drm core code around and update the lifetime management for
framebuffers, so that we are no longer required to keep framebuffers
alive by locking mode_config.mutex.
I've also updated the kerneldoc already.
vmwgfx seems to again be a bit special, at least I haven't figured out
how the fbdev support in that driver works. It smells like it's
external though.
v2: The i915 driver creates another private framebuffer in the
load-detect code. Adjust its cleanup code, too.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 03:42:17 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_framebuffer_unregister_private);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
/**
|
|
|
|
* drm_framebuffer_cleanup - remove a framebuffer object
|
|
|
|
* @fb: framebuffer to remove
|
|
|
|
*
|
drm: revamp framebuffer cleanup interfaces
We have two classes of framebuffer
- Created by the driver (atm only for fbdev), and the driver holds
onto the last reference count until destruction.
- Created by userspace and associated with a given fd. These
framebuffers will be reaped when their assoiciated fb is closed.
Now these two cases are set up differently, the framebuffers are on
different lists and hence destruction needs to clean up different
things. Also, for userspace framebuffers we remove them from any
current usage, whereas for internal framebuffers it is assumed that
the driver has done this already.
Long story short, we need two different ways to cleanup such drivers.
Three functions are involved in total:
- drm_framebuffer_remove: Convenience function which removes the fb
from all active usage and then drops the passed-in reference.
- drm_framebuffer_unregister_private: Will remove driver-private
framebuffers from relevant lists and drop the corresponding
references. Should be called for driver-private framebuffers before
dropping the last reference (or like for a lot of the drivers where
the fbdev is embedded someplace else, before doing the cleanup
manually).
- drm_framebuffer_cleanup: Final cleanup for both classes of fbs,
should be called by the driver's ->destroy callback once the last
reference is gone.
This patch just rolls out the new interfaces and updates all drivers
(by adding calls to drm_framebuffer_unregister_private at all the
right places)- no functional changes yet. Follow-on patches will move
drm core code around and update the lifetime management for
framebuffers, so that we are no longer required to keep framebuffers
alive by locking mode_config.mutex.
I've also updated the kerneldoc already.
vmwgfx seems to again be a bit special, at least I haven't figured out
how the fbdev support in that driver works. It smells like it's
external though.
v2: The i915 driver creates another private framebuffer in the
load-detect code. Adjust its cleanup code, too.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 03:42:17 +08:00
|
|
|
* Cleanup references to a user-created framebuffer. This function is intended
|
|
|
|
* to be used from the drivers ->destroy callback.
|
|
|
|
*
|
|
|
|
* Note that this function does not remove the fb from active usuage - if it is
|
|
|
|
* still used anywhere, hilarity can ensue since userspace could call getfb on
|
|
|
|
* the id and get back -EINVAL. Obviously no concern at driver unload time.
|
|
|
|
*
|
|
|
|
* Also, the framebuffer will not be removed from the lookup idr - for
|
|
|
|
* user-created framebuffers this will happen in in the rmfb ioctl. For
|
|
|
|
* driver-private objects (e.g. for fbdev) drivers need to explicitly call
|
|
|
|
* drm_framebuffer_unregister_private.
|
2008-11-08 06:05:41 +08:00
|
|
|
*/
|
|
|
|
void drm_framebuffer_cleanup(struct drm_framebuffer *fb)
|
2012-09-06 05:48:38 +08:00
|
|
|
{
|
|
|
|
struct drm_device *dev = fb->dev;
|
drm: review locking rules in drm_crtc.c
- config_cleanup was confused: It claimed that callers need to hold
the modeset lock, but the connector|encoder_cleanup helpers grabbed
that themselves (note that crtc_cleanup did _not_ grab the modeset
lock). Which resulted in all drivers _not_ hodling the lock. Since
this is for single-threaded cleanup code, drop the requirement from
docs and also drop the lock_grabbing from all _cleanup functions.
- Kill the LOCKING section in the doctype, since clearly we're not
good enough to keep them up-to-date. And misleading locking
documentation is worse than useless (see e.g. the comment in the
vmgfx driver about the cleanup mess). And since for most functions
the very first line either grabs the lock or has a WARN_ON(!locked)
the documentation doesn't really add anything.
- Instead put in some effort into explaining the only two special
cases a bit better: config_init and config_cleanup are both called
from single-threaded setup/teardown code, so don't do any locking.
It's the driver's job though to enforce this.
- Where lacking, add a WARN_ON(!is_locked). Not many places though,
since locking around fbdev setup/teardown is through-roughly screwed
up, and so will break almost every single WARN annotation I've tried
to add.
- Add a drm_modeset_is_locked helper - the Grate Modset Locking Rework
will use the compiler to assist in the big reorg by renaming the
mode lock, so start encapsulating things. Unfortunately this ended
up in the "wrong" header file since it needs the definition of
struct drm_device.
v2: Drop most WARNS again - we hit them all over the place, mostly in
the setup and teardown sequences. And trying to fix it up leads to
nice deadlocks, since the locking in the setup code is really
inconsistent.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-02 06:43:11 +08:00
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_lock(&dev->mode_config.fb_lock);
|
2012-09-06 05:48:38 +08:00
|
|
|
list_del(&fb->head);
|
|
|
|
dev->mode_config.num_fb--;
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_unlock(&dev->mode_config.fb_lock);
|
2012-09-06 05:48:38 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_framebuffer_cleanup);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_framebuffer_remove - remove and unreference a framebuffer object
|
|
|
|
* @fb: framebuffer to remove
|
|
|
|
*
|
|
|
|
* Scans all the CRTCs and planes in @dev's mode_config. If they're
|
drm: revamp framebuffer cleanup interfaces
We have two classes of framebuffer
- Created by the driver (atm only for fbdev), and the driver holds
onto the last reference count until destruction.
- Created by userspace and associated with a given fd. These
framebuffers will be reaped when their assoiciated fb is closed.
Now these two cases are set up differently, the framebuffers are on
different lists and hence destruction needs to clean up different
things. Also, for userspace framebuffers we remove them from any
current usage, whereas for internal framebuffers it is assumed that
the driver has done this already.
Long story short, we need two different ways to cleanup such drivers.
Three functions are involved in total:
- drm_framebuffer_remove: Convenience function which removes the fb
from all active usage and then drops the passed-in reference.
- drm_framebuffer_unregister_private: Will remove driver-private
framebuffers from relevant lists and drop the corresponding
references. Should be called for driver-private framebuffers before
dropping the last reference (or like for a lot of the drivers where
the fbdev is embedded someplace else, before doing the cleanup
manually).
- drm_framebuffer_cleanup: Final cleanup for both classes of fbs,
should be called by the driver's ->destroy callback once the last
reference is gone.
This patch just rolls out the new interfaces and updates all drivers
(by adding calls to drm_framebuffer_unregister_private at all the
right places)- no functional changes yet. Follow-on patches will move
drm core code around and update the lifetime management for
framebuffers, so that we are no longer required to keep framebuffers
alive by locking mode_config.mutex.
I've also updated the kerneldoc already.
vmwgfx seems to again be a bit special, at least I haven't figured out
how the fbdev support in that driver works. It smells like it's
external though.
v2: The i915 driver creates another private framebuffer in the
load-detect code. Adjust its cleanup code, too.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 03:42:17 +08:00
|
|
|
* using @fb, removes it, setting it to NULL. Then drops the reference to the
|
2012-12-11 23:51:35 +08:00
|
|
|
* passed-in framebuffer. Might take the modeset locks.
|
|
|
|
*
|
|
|
|
* Note that this function optimizes the cleanup away if the caller holds the
|
|
|
|
* last reference to the framebuffer. It is also guaranteed to not take the
|
|
|
|
* modeset locks in this case.
|
2012-09-06 05:48:38 +08:00
|
|
|
*/
|
|
|
|
void drm_framebuffer_remove(struct drm_framebuffer *fb)
|
2008-11-08 06:05:41 +08:00
|
|
|
{
|
|
|
|
struct drm_device *dev = fb->dev;
|
|
|
|
struct drm_crtc *crtc;
|
2011-11-15 06:51:27 +08:00
|
|
|
struct drm_plane *plane;
|
2009-08-17 11:11:23 +08:00
|
|
|
struct drm_mode_set set;
|
|
|
|
int ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
WARN_ON(!list_empty(&fb->filp_head));
|
drm: review locking rules in drm_crtc.c
- config_cleanup was confused: It claimed that callers need to hold
the modeset lock, but the connector|encoder_cleanup helpers grabbed
that themselves (note that crtc_cleanup did _not_ grab the modeset
lock). Which resulted in all drivers _not_ hodling the lock. Since
this is for single-threaded cleanup code, drop the requirement from
docs and also drop the lock_grabbing from all _cleanup functions.
- Kill the LOCKING section in the doctype, since clearly we're not
good enough to keep them up-to-date. And misleading locking
documentation is worse than useless (see e.g. the comment in the
vmgfx driver about the cleanup mess). And since for most functions
the very first line either grabs the lock or has a WARN_ON(!locked)
the documentation doesn't really add anything.
- Instead put in some effort into explaining the only two special
cases a bit better: config_init and config_cleanup are both called
from single-threaded setup/teardown code, so don't do any locking.
It's the driver's job though to enforce this.
- Where lacking, add a WARN_ON(!is_locked). Not many places though,
since locking around fbdev setup/teardown is through-roughly screwed
up, and so will break almost every single WARN annotation I've tried
to add.
- Add a drm_modeset_is_locked helper - the Grate Modset Locking Rework
will use the compiler to assist in the big reorg by renaming the
mode lock, so start encapsulating things. Unfortunately this ended
up in the "wrong" header file since it needs the definition of
struct drm_device.
v2: Drop most WARNS again - we hit them all over the place, mostly in
the setup and teardown sequences. And trying to fix it up leads to
nice deadlocks, since the locking in the setup code is really
inconsistent.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-02 06:43:11 +08:00
|
|
|
|
2012-12-11 23:51:35 +08:00
|
|
|
/*
|
|
|
|
* drm ABI mandates that we remove any deleted framebuffers from active
|
|
|
|
* useage. But since most sane clients only remove framebuffers they no
|
|
|
|
* longer need, try to optimize this away.
|
|
|
|
*
|
|
|
|
* Since we're holding a reference ourselves, observing a refcount of 1
|
|
|
|
* means that we're the last holder and can skip it. Also, the refcount
|
|
|
|
* can never increase from 1 again, so we don't need any barriers or
|
|
|
|
* locks.
|
|
|
|
*
|
|
|
|
* Note that userspace could try to race with use and instate a new
|
|
|
|
* usage _after_ we've cleared all current ones. End result will be an
|
|
|
|
* in-use fb with fb-id == 0. Userspace is allowed to shoot its own foot
|
|
|
|
* in this manner.
|
|
|
|
*/
|
|
|
|
if (atomic_read(&fb->refcount.refcount) > 1) {
|
|
|
|
drm_modeset_lock_all(dev);
|
|
|
|
/* remove from any CRTC */
|
|
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head) {
|
|
|
|
if (crtc->fb == fb) {
|
|
|
|
/* should turn off the crtc */
|
|
|
|
memset(&set, 0, sizeof(struct drm_mode_set));
|
|
|
|
set.crtc = crtc;
|
|
|
|
set.fb = NULL;
|
|
|
|
ret = drm_mode_set_config_internal(&set);
|
|
|
|
if (ret)
|
|
|
|
DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc);
|
|
|
|
}
|
2009-08-17 11:11:23 +08:00
|
|
|
}
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-12-11 23:51:35 +08:00
|
|
|
list_for_each_entry(plane, &dev->mode_config.plane_list, head) {
|
|
|
|
if (plane->fb == fb) {
|
|
|
|
/* should turn off the crtc */
|
|
|
|
ret = plane->funcs->disable_plane(plane);
|
|
|
|
if (ret)
|
|
|
|
DRM_ERROR("failed to disable plane with busy fb\n");
|
|
|
|
/* disconnect the plane from the fb and crtc: */
|
|
|
|
__drm_framebuffer_unreference(plane->fb);
|
|
|
|
plane->fb = NULL;
|
|
|
|
plane->crtc = NULL;
|
|
|
|
}
|
2011-11-15 06:51:27 +08:00
|
|
|
}
|
2012-12-11 23:51:35 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
}
|
|
|
|
|
2012-09-06 05:48:38 +08:00
|
|
|
drm_framebuffer_unreference(fb);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
2012-09-06 05:48:38 +08:00
|
|
|
EXPORT_SYMBOL(drm_framebuffer_remove);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_init - Initialise a new CRTC object
|
|
|
|
* @dev: DRM device
|
|
|
|
* @crtc: CRTC object to init
|
|
|
|
* @funcs: callbacks for the new CRTC
|
|
|
|
*
|
|
|
|
* Inits a new object created as base part of an driver crtc object.
|
2012-03-13 18:35:48 +08:00
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, error code on failure.
|
2008-11-08 06:05:41 +08:00
|
|
|
*/
|
2012-03-13 18:35:48 +08:00
|
|
|
int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc,
|
2008-11-08 06:05:41 +08:00
|
|
|
const struct drm_crtc_funcs *funcs)
|
|
|
|
{
|
2012-03-13 18:35:48 +08:00
|
|
|
int ret;
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
crtc->dev = dev;
|
|
|
|
crtc->funcs = funcs;
|
2012-09-05 00:35:56 +08:00
|
|
|
crtc->invert_dimensions = false;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
drm: add per-crtc locks
*drumroll*
The basic idea is to protect per-crtc state which can change without
touching the output configuration with separate mutexes, i.e. all the
input side state to a crtc like framebuffers, cursor settings or plane
configuration. Holding such a crtc lock gives a read-lock on all the
other crtc state which can be changed by e.g. a modeset.
All non-crtc state is still protected by the mode_config mutex.
Callers that need to change modeset state of a crtc (e.g. dpms or
set_mode) need to grab both the mode_config lock and nested within any
crtc locks.
Note that since there can only ever be one holder of the mode_config
lock we can grab the subordinate crtc locks in any order (if we need
to grab more than one of them). Lockdep can handle such nesting with
the mutex_lock_nest_lock call correctly.
With this functions that only touch connectors/encoders but not crtcs
only need to take the mode_config lock. The biggest such case is the
output probing, which means that we can now pageflip and move cursors
while the output probe code is reading an edid.
Most cases neatly fall into the three buckets:
- Only touches connectors and similar output state and so only needs
the mode_config lock.
- Touches the global configuration and so needs all locks.
- Only touches the crtc input side and so only needs the crtc lock.
But a few cases that need special consideration:
- Load detection which requires a crtc. The mode_config lock already
prevents a modeset change, so we can use any unused crtc as we like
to do load detection. The only thing to consider is that such
temporary state changes don't leak out to userspace through ioctls
that only take the crtc look (like a pageflip). Hence the load
detect code needs to grab the crtc of any output pipes it touches
(but only if it touches state used by the pageflip or cursor
ioctls).
- Atomic pageflip when moving planes. The first case is sane hw, where
planes have a fixed association with crtcs - nothing needs to be
done there. More insane^Wflexible hw needs to have plane->crtc
mapping which is separately protect with a lock that nests within
the crtc lock. If the plane is unused we can just assign it to the
current crtc and continue. But if a plane is already in use by
another crtc we can't just reassign it.
Two solution present themselves: Either go back to a slow-path which
takes all modeset locks, potentially incure quite a hefty delay. Or
simply disallowing such changes in one atomic pageflip - in general
the vblanks of two crtcs are not synced, so there's no sane way to
atomically flip such plane changes accross more than one crtc. I'd
heavily favour the later approach, going as far as mandating it as
part of the ABI of such a new a nuclear pageflip.
And if we _really_ want such semantics, we can always get them by
introducing another pageflip mutex between the mode_config.mutex and
the individual crtc locks. Pageflips crossing more than one crtc
would then need to take that lock first, to lock out concurrent
multi-crtc pageflips.
- Optimized global modeset operations: We could just take the
mode_config lock and then lazily lock all crtc which are affected by
a modeset operation. This has the advantage that pageflip could
continue unhampered on unaffected crtc. But if e.g. global resources
like plls need to be reassigned and so affect unrelated crtcs we can
still do that - nested locking works in any order.
This patch just adds the locks and takes them in drm_modeset_lock_all,
no real locking changes yet.
v2: Need to initialize the new lock in crtc_init and lock it righ
away, for otherwise the modeset_unlock_all below will try to unlock a
not-locked mutex.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-02 09:18:25 +08:00
|
|
|
mutex_init(&crtc->mutex);
|
|
|
|
mutex_lock_nest_lock(&crtc->mutex, &dev->mode_config.mutex);
|
2012-03-13 18:35:48 +08:00
|
|
|
|
|
|
|
ret = drm_mode_object_get(dev, &crtc->base, DRM_MODE_OBJECT_CRTC);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-05-16 05:09:05 +08:00
|
|
|
crtc->base.properties = &crtc->properties;
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
list_add_tail(&crtc->head, &dev->mode_config.crtc_list);
|
|
|
|
dev->mode_config.num_crtc++;
|
2012-03-13 18:35:48 +08:00
|
|
|
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2012-03-13 18:35:48 +08:00
|
|
|
|
|
|
|
return ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_init);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_cleanup - Cleans up the core crtc usage.
|
|
|
|
* @crtc: CRTC to cleanup
|
|
|
|
*
|
|
|
|
* Cleanup @crtc. Removes from drm modesetting space
|
|
|
|
* does NOT free object, caller does that.
|
|
|
|
*/
|
|
|
|
void drm_crtc_cleanup(struct drm_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = crtc->dev;
|
|
|
|
|
2012-11-19 17:44:56 +08:00
|
|
|
kfree(crtc->gamma_store);
|
|
|
|
crtc->gamma_store = NULL;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
drm_mode_object_put(dev, &crtc->base);
|
|
|
|
list_del(&crtc->head);
|
|
|
|
dev->mode_config.num_crtc--;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_crtc_cleanup);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_probed_add - add a mode to a connector's probed mode list
|
|
|
|
* @connector: connector the new mode
|
|
|
|
* @mode: mode data
|
|
|
|
*
|
|
|
|
* Add @mode to @connector's mode list for later use.
|
|
|
|
*/
|
|
|
|
void drm_mode_probed_add(struct drm_connector *connector,
|
|
|
|
struct drm_display_mode *mode)
|
|
|
|
{
|
|
|
|
list_add(&mode->head, &connector->probed_modes);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_probed_add);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_remove - remove and free a mode
|
|
|
|
* @connector: connector list to modify
|
|
|
|
* @mode: mode to remove
|
|
|
|
*
|
|
|
|
* Remove @mode from @connector's mode list, then free it.
|
|
|
|
*/
|
|
|
|
void drm_mode_remove(struct drm_connector *connector,
|
|
|
|
struct drm_display_mode *mode)
|
|
|
|
{
|
|
|
|
list_del(&mode->head);
|
2012-02-01 18:38:19 +08:00
|
|
|
drm_mode_destroy(connector->dev, mode);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_remove);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_connector_init - Init a preallocated connector
|
|
|
|
* @dev: DRM device
|
|
|
|
* @connector: the connector to init
|
|
|
|
* @funcs: callbacks for this connector
|
2012-12-02 07:09:18 +08:00
|
|
|
* @connector_type: user visible type of the connector
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Initialises a preallocated connector. Connectors should be
|
|
|
|
* subclassed as part of driver connector objects.
|
2012-03-13 18:35:48 +08:00
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, error code on failure.
|
2008-11-08 06:05:41 +08:00
|
|
|
*/
|
2012-03-13 18:35:48 +08:00
|
|
|
int drm_connector_init(struct drm_device *dev,
|
|
|
|
struct drm_connector *connector,
|
|
|
|
const struct drm_connector_funcs *funcs,
|
|
|
|
int connector_type)
|
2008-11-08 06:05:41 +08:00
|
|
|
{
|
2012-03-13 18:35:48 +08:00
|
|
|
int ret;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
ret = drm_mode_object_get(dev, &connector->base, DRM_MODE_OBJECT_CONNECTOR);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
2012-05-16 05:09:01 +08:00
|
|
|
connector->base.properties = &connector->properties;
|
2008-11-08 06:05:41 +08:00
|
|
|
connector->dev = dev;
|
|
|
|
connector->funcs = funcs;
|
|
|
|
connector->connector_type = connector_type;
|
|
|
|
connector->connector_type_id =
|
|
|
|
++drm_connector_enum_list[connector_type].count; /* TODO */
|
|
|
|
INIT_LIST_HEAD(&connector->user_modes);
|
|
|
|
INIT_LIST_HEAD(&connector->probed_modes);
|
|
|
|
INIT_LIST_HEAD(&connector->modes);
|
|
|
|
connector->edid_blob_ptr = NULL;
|
2012-10-24 02:23:35 +08:00
|
|
|
connector->status = connector_status_unknown;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
list_add_tail(&connector->head, &dev->mode_config.connector_list);
|
|
|
|
dev->mode_config.num_connector++;
|
|
|
|
|
2011-10-22 16:36:19 +08:00
|
|
|
if (connector_type != DRM_MODE_CONNECTOR_VIRTUAL)
|
2012-10-12 09:50:56 +08:00
|
|
|
drm_object_attach_property(&connector->base,
|
2011-10-22 16:36:19 +08:00
|
|
|
dev->mode_config.edid_property,
|
|
|
|
0);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-10-12 09:50:56 +08:00
|
|
|
drm_object_attach_property(&connector->base,
|
2008-11-08 06:05:41 +08:00
|
|
|
dev->mode_config.dpms_property, 0);
|
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2012-03-13 18:35:48 +08:00
|
|
|
|
|
|
|
return ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_connector_init);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_connector_cleanup - cleans up an initialised connector
|
|
|
|
* @connector: connector to cleanup
|
|
|
|
*
|
|
|
|
* Cleans up the connector but doesn't free the object.
|
|
|
|
*/
|
|
|
|
void drm_connector_cleanup(struct drm_connector *connector)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = connector->dev;
|
|
|
|
struct drm_display_mode *mode, *t;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(mode, t, &connector->probed_modes, head)
|
|
|
|
drm_mode_remove(connector, mode);
|
|
|
|
|
|
|
|
list_for_each_entry_safe(mode, t, &connector->modes, head)
|
|
|
|
drm_mode_remove(connector, mode);
|
|
|
|
|
|
|
|
list_for_each_entry_safe(mode, t, &connector->user_modes, head)
|
|
|
|
drm_mode_remove(connector, mode);
|
|
|
|
|
|
|
|
drm_mode_object_put(dev, &connector->base);
|
|
|
|
list_del(&connector->head);
|
2011-08-27 10:06:21 +08:00
|
|
|
dev->mode_config.num_connector--;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_connector_cleanup);
|
|
|
|
|
2012-02-20 22:16:40 +08:00
|
|
|
void drm_connector_unplug_all(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_connector *connector;
|
|
|
|
|
|
|
|
/* taking the mode config mutex ends up in a clash with sysfs */
|
|
|
|
list_for_each_entry(connector, &dev->mode_config.connector_list, head)
|
|
|
|
drm_sysfs_connector_remove(connector);
|
|
|
|
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_connector_unplug_all);
|
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
int drm_encoder_init(struct drm_device *dev,
|
2012-02-20 22:16:40 +08:00
|
|
|
struct drm_encoder *encoder,
|
|
|
|
const struct drm_encoder_funcs *funcs,
|
|
|
|
int encoder_type)
|
2008-11-08 06:05:41 +08:00
|
|
|
{
|
2012-03-13 18:35:48 +08:00
|
|
|
int ret;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
ret = drm_mode_object_get(dev, &encoder->base, DRM_MODE_OBJECT_ENCODER);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
encoder->dev = dev;
|
2008-11-08 06:05:41 +08:00
|
|
|
encoder->encoder_type = encoder_type;
|
|
|
|
encoder->funcs = funcs;
|
|
|
|
|
|
|
|
list_add_tail(&encoder->head, &dev->mode_config.encoder_list);
|
|
|
|
dev->mode_config.num_encoder++;
|
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2012-03-13 18:35:48 +08:00
|
|
|
|
|
|
|
return ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_encoder_init);
|
|
|
|
|
|
|
|
void drm_encoder_cleanup(struct drm_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = encoder->dev;
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
drm_mode_object_put(dev, &encoder->base);
|
|
|
|
list_del(&encoder->head);
|
2011-08-27 10:06:21 +08:00
|
|
|
dev->mode_config.num_encoder--;
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_encoder_cleanup);
|
|
|
|
|
2011-11-15 06:51:27 +08:00
|
|
|
int drm_plane_init(struct drm_device *dev, struct drm_plane *plane,
|
|
|
|
unsigned long possible_crtcs,
|
|
|
|
const struct drm_plane_funcs *funcs,
|
2011-12-14 10:19:36 +08:00
|
|
|
const uint32_t *formats, uint32_t format_count,
|
|
|
|
bool priv)
|
2011-11-15 06:51:27 +08:00
|
|
|
{
|
2012-03-13 18:35:48 +08:00
|
|
|
int ret;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
ret = drm_mode_object_get(dev, &plane->base, DRM_MODE_OBJECT_PLANE);
|
|
|
|
if (ret)
|
|
|
|
goto out;
|
|
|
|
|
2012-05-17 16:23:27 +08:00
|
|
|
plane->base.properties = &plane->properties;
|
2011-11-15 06:51:27 +08:00
|
|
|
plane->dev = dev;
|
|
|
|
plane->funcs = funcs;
|
|
|
|
plane->format_types = kmalloc(sizeof(uint32_t) * format_count,
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!plane->format_types) {
|
|
|
|
DRM_DEBUG_KMS("out of memory when allocating plane\n");
|
|
|
|
drm_mode_object_put(dev, &plane->base);
|
2012-03-13 18:35:48 +08:00
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
2011-11-15 06:51:27 +08:00
|
|
|
}
|
|
|
|
|
2011-11-15 06:51:28 +08:00
|
|
|
memcpy(plane->format_types, formats, format_count * sizeof(uint32_t));
|
2011-11-15 06:51:27 +08:00
|
|
|
plane->format_count = format_count;
|
|
|
|
plane->possible_crtcs = possible_crtcs;
|
|
|
|
|
2011-12-14 10:19:36 +08:00
|
|
|
/* private planes are not exposed to userspace, but depending on
|
|
|
|
* display hardware, might be convenient to allow sharing programming
|
|
|
|
* for the scanout engine with the crtc implementation.
|
|
|
|
*/
|
|
|
|
if (!priv) {
|
|
|
|
list_add_tail(&plane->head, &dev->mode_config.plane_list);
|
|
|
|
dev->mode_config.num_plane++;
|
|
|
|
} else {
|
|
|
|
INIT_LIST_HEAD(&plane->head);
|
|
|
|
}
|
2011-11-15 06:51:27 +08:00
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
return ret;
|
2011-11-15 06:51:27 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_plane_init);
|
|
|
|
|
|
|
|
void drm_plane_cleanup(struct drm_plane *plane)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = plane->dev;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
kfree(plane->format_types);
|
|
|
|
drm_mode_object_put(dev, &plane->base);
|
2011-12-14 10:19:36 +08:00
|
|
|
/* if not added to a list, it must be a private plane */
|
|
|
|
if (!list_empty(&plane->head)) {
|
|
|
|
list_del(&plane->head);
|
|
|
|
dev->mode_config.num_plane--;
|
|
|
|
}
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_plane_cleanup);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
/**
|
|
|
|
* drm_mode_create - create a new display mode
|
|
|
|
* @dev: DRM device
|
|
|
|
*
|
|
|
|
* Create a new drm_display_mode, give it an ID, and return it.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Pointer to new mode on success, NULL on error.
|
|
|
|
*/
|
|
|
|
struct drm_display_mode *drm_mode_create(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_display_mode *nmode;
|
|
|
|
|
|
|
|
nmode = kzalloc(sizeof(struct drm_display_mode), GFP_KERNEL);
|
|
|
|
if (!nmode)
|
|
|
|
return NULL;
|
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
if (drm_mode_object_get(dev, &nmode->base, DRM_MODE_OBJECT_MODE)) {
|
|
|
|
kfree(nmode);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
return nmode;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_create);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_destroy - remove a mode
|
|
|
|
* @dev: DRM device
|
|
|
|
* @mode: mode to remove
|
|
|
|
*
|
|
|
|
* Free @mode's unique identifier, then free it.
|
|
|
|
*/
|
|
|
|
void drm_mode_destroy(struct drm_device *dev, struct drm_display_mode *mode)
|
|
|
|
{
|
2012-03-13 18:35:43 +08:00
|
|
|
if (!mode)
|
|
|
|
return;
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
drm_mode_object_put(dev, &mode->base);
|
|
|
|
|
|
|
|
kfree(mode);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_destroy);
|
|
|
|
|
|
|
|
static int drm_mode_create_standard_connector_properties(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_property *edid;
|
|
|
|
struct drm_property *dpms;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Standard properties (apply to all connectors)
|
|
|
|
*/
|
|
|
|
edid = drm_property_create(dev, DRM_MODE_PROP_BLOB |
|
|
|
|
DRM_MODE_PROP_IMMUTABLE,
|
|
|
|
"EDID", 0);
|
|
|
|
dev->mode_config.edid_property = edid;
|
|
|
|
|
2012-02-06 17:58:17 +08:00
|
|
|
dpms = drm_property_create_enum(dev, 0,
|
|
|
|
"DPMS", drm_dpms_enum_list,
|
|
|
|
ARRAY_SIZE(drm_dpms_enum_list));
|
2008-11-08 06:05:41 +08:00
|
|
|
dev->mode_config.dpms_property = dpms;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_create_dvi_i_properties - create DVI-I specific connector properties
|
|
|
|
* @dev: DRM device
|
|
|
|
*
|
|
|
|
* Called by a driver the first time a DVI-I connector is made.
|
|
|
|
*/
|
|
|
|
int drm_mode_create_dvi_i_properties(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_property *dvi_i_selector;
|
|
|
|
struct drm_property *dvi_i_subconnector;
|
|
|
|
|
|
|
|
if (dev->mode_config.dvi_i_select_subconnector_property)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
dvi_i_selector =
|
2012-02-06 17:58:17 +08:00
|
|
|
drm_property_create_enum(dev, 0,
|
2008-11-08 06:05:41 +08:00
|
|
|
"select subconnector",
|
2012-02-06 17:58:17 +08:00
|
|
|
drm_dvi_i_select_enum_list,
|
2008-11-08 06:05:41 +08:00
|
|
|
ARRAY_SIZE(drm_dvi_i_select_enum_list));
|
|
|
|
dev->mode_config.dvi_i_select_subconnector_property = dvi_i_selector;
|
|
|
|
|
2012-02-06 17:58:17 +08:00
|
|
|
dvi_i_subconnector = drm_property_create_enum(dev, DRM_MODE_PROP_IMMUTABLE,
|
2008-11-08 06:05:41 +08:00
|
|
|
"subconnector",
|
2012-02-06 17:58:17 +08:00
|
|
|
drm_dvi_i_subconnector_enum_list,
|
2008-11-08 06:05:41 +08:00
|
|
|
ARRAY_SIZE(drm_dvi_i_subconnector_enum_list));
|
|
|
|
dev->mode_config.dvi_i_subconnector_property = dvi_i_subconnector;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_create_dvi_i_properties);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_create_tv_properties - create TV specific connector properties
|
|
|
|
* @dev: DRM device
|
|
|
|
* @num_modes: number of different TV formats (modes) supported
|
|
|
|
* @modes: array of pointers to strings containing name of each format
|
|
|
|
*
|
|
|
|
* Called by a driver's TV initialization routine, this function creates
|
|
|
|
* the TV specific connector properties for a given device. Caller is
|
|
|
|
* responsible for allocating a list of format names and passing them to
|
|
|
|
* this routine.
|
|
|
|
*/
|
|
|
|
int drm_mode_create_tv_properties(struct drm_device *dev, int num_modes,
|
|
|
|
char *modes[])
|
|
|
|
{
|
|
|
|
struct drm_property *tv_selector;
|
|
|
|
struct drm_property *tv_subconnector;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (dev->mode_config.tv_select_subconnector_property)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Basic connector properties
|
|
|
|
*/
|
2012-02-06 17:58:17 +08:00
|
|
|
tv_selector = drm_property_create_enum(dev, 0,
|
2008-11-08 06:05:41 +08:00
|
|
|
"select subconnector",
|
2012-02-06 17:58:17 +08:00
|
|
|
drm_tv_select_enum_list,
|
2008-11-08 06:05:41 +08:00
|
|
|
ARRAY_SIZE(drm_tv_select_enum_list));
|
|
|
|
dev->mode_config.tv_select_subconnector_property = tv_selector;
|
|
|
|
|
|
|
|
tv_subconnector =
|
2012-02-06 17:58:17 +08:00
|
|
|
drm_property_create_enum(dev, DRM_MODE_PROP_IMMUTABLE,
|
|
|
|
"subconnector",
|
|
|
|
drm_tv_subconnector_enum_list,
|
2008-11-08 06:05:41 +08:00
|
|
|
ARRAY_SIZE(drm_tv_subconnector_enum_list));
|
|
|
|
dev->mode_config.tv_subconnector_property = tv_subconnector;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Other, TV specific properties: margins & TV modes.
|
|
|
|
*/
|
|
|
|
dev->mode_config.tv_left_margin_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "left margin", 0, 100);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
dev->mode_config.tv_right_margin_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "right margin", 0, 100);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
dev->mode_config.tv_top_margin_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "top margin", 0, 100);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
dev->mode_config.tv_bottom_margin_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "bottom margin", 0, 100);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
dev->mode_config.tv_mode_property =
|
|
|
|
drm_property_create(dev, DRM_MODE_PROP_ENUM,
|
|
|
|
"mode", num_modes);
|
|
|
|
for (i = 0; i < num_modes; i++)
|
|
|
|
drm_property_add_enum(dev->mode_config.tv_mode_property, i,
|
|
|
|
i, modes[i]);
|
|
|
|
|
2009-08-02 10:19:20 +08:00
|
|
|
dev->mode_config.tv_brightness_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "brightness", 0, 100);
|
2009-08-02 10:19:20 +08:00
|
|
|
|
|
|
|
dev->mode_config.tv_contrast_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "contrast", 0, 100);
|
2009-08-02 10:19:20 +08:00
|
|
|
|
|
|
|
dev->mode_config.tv_flicker_reduction_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "flicker reduction", 0, 100);
|
2009-08-02 10:19:20 +08:00
|
|
|
|
2009-08-12 08:30:10 +08:00
|
|
|
dev->mode_config.tv_overscan_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "overscan", 0, 100);
|
2009-08-12 08:30:10 +08:00
|
|
|
|
|
|
|
dev->mode_config.tv_saturation_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "saturation", 0, 100);
|
2009-08-12 08:30:10 +08:00
|
|
|
|
|
|
|
dev->mode_config.tv_hue_property =
|
2012-02-06 17:58:18 +08:00
|
|
|
drm_property_create_range(dev, 0, "hue", 0, 100);
|
2009-08-12 08:30:10 +08:00
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_create_tv_properties);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_create_scaling_mode_property - create scaling mode property
|
|
|
|
* @dev: DRM device
|
|
|
|
*
|
|
|
|
* Called by a driver the first time it's needed, must be attached to desired
|
|
|
|
* connectors.
|
|
|
|
*/
|
|
|
|
int drm_mode_create_scaling_mode_property(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_property *scaling_mode;
|
|
|
|
|
|
|
|
if (dev->mode_config.scaling_mode_property)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
scaling_mode =
|
2012-02-06 17:58:17 +08:00
|
|
|
drm_property_create_enum(dev, 0, "scaling mode",
|
|
|
|
drm_scaling_mode_enum_list,
|
2008-11-08 06:05:41 +08:00
|
|
|
ARRAY_SIZE(drm_scaling_mode_enum_list));
|
|
|
|
|
|
|
|
dev->mode_config.scaling_mode_property = scaling_mode;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_create_scaling_mode_property);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_create_dithering_property - create dithering property
|
|
|
|
* @dev: DRM device
|
|
|
|
*
|
|
|
|
* Called by a driver the first time it's needed, must be attached to desired
|
|
|
|
* connectors.
|
|
|
|
*/
|
|
|
|
int drm_mode_create_dithering_property(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_property *dithering_mode;
|
|
|
|
|
|
|
|
if (dev->mode_config.dithering_mode_property)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
dithering_mode =
|
2012-02-06 17:58:17 +08:00
|
|
|
drm_property_create_enum(dev, 0, "dithering",
|
|
|
|
drm_dithering_mode_enum_list,
|
2008-11-08 06:05:41 +08:00
|
|
|
ARRAY_SIZE(drm_dithering_mode_enum_list));
|
|
|
|
dev->mode_config.dithering_mode_property = dithering_mode;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_create_dithering_property);
|
|
|
|
|
2009-12-04 07:25:47 +08:00
|
|
|
/**
|
|
|
|
* drm_mode_create_dirty_property - create dirty property
|
|
|
|
* @dev: DRM device
|
|
|
|
*
|
|
|
|
* Called by a driver the first time it's needed, must be attached to desired
|
|
|
|
* connectors.
|
|
|
|
*/
|
|
|
|
int drm_mode_create_dirty_info_property(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_property *dirty_info;
|
|
|
|
|
|
|
|
if (dev->mode_config.dirty_info_property)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
dirty_info =
|
2012-02-06 17:58:17 +08:00
|
|
|
drm_property_create_enum(dev, DRM_MODE_PROP_IMMUTABLE,
|
2009-12-04 07:25:47 +08:00
|
|
|
"dirty",
|
2012-02-06 17:58:17 +08:00
|
|
|
drm_dirty_info_enum_list,
|
2009-12-04 07:25:47 +08:00
|
|
|
ARRAY_SIZE(drm_dirty_info_enum_list));
|
|
|
|
dev->mode_config.dirty_info_property = dirty_info;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_create_dirty_info_property);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
/**
|
|
|
|
* drm_mode_config_init - initialize DRM mode_configuration structure
|
|
|
|
* @dev: DRM device
|
|
|
|
*
|
|
|
|
* Initialize @dev's mode_config structure, used for tracking the graphics
|
|
|
|
* configuration of @dev.
|
drm: review locking rules in drm_crtc.c
- config_cleanup was confused: It claimed that callers need to hold
the modeset lock, but the connector|encoder_cleanup helpers grabbed
that themselves (note that crtc_cleanup did _not_ grab the modeset
lock). Which resulted in all drivers _not_ hodling the lock. Since
this is for single-threaded cleanup code, drop the requirement from
docs and also drop the lock_grabbing from all _cleanup functions.
- Kill the LOCKING section in the doctype, since clearly we're not
good enough to keep them up-to-date. And misleading locking
documentation is worse than useless (see e.g. the comment in the
vmgfx driver about the cleanup mess). And since for most functions
the very first line either grabs the lock or has a WARN_ON(!locked)
the documentation doesn't really add anything.
- Instead put in some effort into explaining the only two special
cases a bit better: config_init and config_cleanup are both called
from single-threaded setup/teardown code, so don't do any locking.
It's the driver's job though to enforce this.
- Where lacking, add a WARN_ON(!is_locked). Not many places though,
since locking around fbdev setup/teardown is through-roughly screwed
up, and so will break almost every single WARN annotation I've tried
to add.
- Add a drm_modeset_is_locked helper - the Grate Modset Locking Rework
will use the compiler to assist in the big reorg by renaming the
mode lock, so start encapsulating things. Unfortunately this ended
up in the "wrong" header file since it needs the definition of
struct drm_device.
v2: Drop most WARNS again - we hit them all over the place, mostly in
the setup and teardown sequences. And trying to fix it up leads to
nice deadlocks, since the locking in the setup code is really
inconsistent.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-02 06:43:11 +08:00
|
|
|
*
|
|
|
|
* Since this initializes the modeset locks, no locking is possible. Which is no
|
|
|
|
* problem, since this should happen single threaded at init time. It is the
|
|
|
|
* driver's problem to ensure this guarantee.
|
|
|
|
*
|
2008-11-08 06:05:41 +08:00
|
|
|
*/
|
|
|
|
void drm_mode_config_init(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
mutex_init(&dev->mode_config.mutex);
|
2009-01-19 15:21:45 +08:00
|
|
|
mutex_init(&dev->mode_config.idr_mutex);
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_init(&dev->mode_config.fb_lock);
|
2008-11-08 06:05:41 +08:00
|
|
|
INIT_LIST_HEAD(&dev->mode_config.fb_list);
|
|
|
|
INIT_LIST_HEAD(&dev->mode_config.crtc_list);
|
|
|
|
INIT_LIST_HEAD(&dev->mode_config.connector_list);
|
|
|
|
INIT_LIST_HEAD(&dev->mode_config.encoder_list);
|
|
|
|
INIT_LIST_HEAD(&dev->mode_config.property_list);
|
|
|
|
INIT_LIST_HEAD(&dev->mode_config.property_blob_list);
|
2011-11-15 06:51:27 +08:00
|
|
|
INIT_LIST_HEAD(&dev->mode_config.plane_list);
|
2008-11-08 06:05:41 +08:00
|
|
|
idr_init(&dev->mode_config.crtc_idr);
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
drm_mode_create_standard_connector_properties(dev);
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
/* Just to be sure */
|
|
|
|
dev->mode_config.num_fb = 0;
|
|
|
|
dev->mode_config.num_connector = 0;
|
|
|
|
dev->mode_config.num_crtc = 0;
|
|
|
|
dev->mode_config.num_encoder = 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_config_init);
|
|
|
|
|
|
|
|
int drm_mode_group_init(struct drm_device *dev, struct drm_mode_group *group)
|
|
|
|
{
|
|
|
|
uint32_t total_objects = 0;
|
|
|
|
|
|
|
|
total_objects += dev->mode_config.num_crtc;
|
|
|
|
total_objects += dev->mode_config.num_connector;
|
|
|
|
total_objects += dev->mode_config.num_encoder;
|
|
|
|
|
|
|
|
group->id_list = kzalloc(total_objects * sizeof(uint32_t), GFP_KERNEL);
|
|
|
|
if (!group->id_list)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
group->num_crtcs = 0;
|
|
|
|
group->num_connectors = 0;
|
|
|
|
group->num_encoders = 0;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_group_init_legacy_group(struct drm_device *dev,
|
|
|
|
struct drm_mode_group *group)
|
|
|
|
{
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
struct drm_encoder *encoder;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if ((ret = drm_mode_group_init(dev, group)))
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
|
|
|
|
group->id_list[group->num_crtcs++] = crtc->base.id;
|
|
|
|
|
|
|
|
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)
|
|
|
|
group->id_list[group->num_crtcs + group->num_encoders++] =
|
|
|
|
encoder->base.id;
|
|
|
|
|
|
|
|
list_for_each_entry(connector, &dev->mode_config.connector_list, head)
|
|
|
|
group->id_list[group->num_crtcs + group->num_encoders +
|
|
|
|
group->num_connectors++] = connector->base.id;
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
2012-03-20 14:59:29 +08:00
|
|
|
EXPORT_SYMBOL(drm_mode_group_init_legacy_group);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_config_cleanup - free up DRM mode_config info
|
|
|
|
* @dev: DRM device
|
|
|
|
*
|
|
|
|
* Free up all the connectors and CRTCs associated with this DRM device, then
|
|
|
|
* free up the framebuffers and associated buffer objects.
|
|
|
|
*
|
drm: review locking rules in drm_crtc.c
- config_cleanup was confused: It claimed that callers need to hold
the modeset lock, but the connector|encoder_cleanup helpers grabbed
that themselves (note that crtc_cleanup did _not_ grab the modeset
lock). Which resulted in all drivers _not_ hodling the lock. Since
this is for single-threaded cleanup code, drop the requirement from
docs and also drop the lock_grabbing from all _cleanup functions.
- Kill the LOCKING section in the doctype, since clearly we're not
good enough to keep them up-to-date. And misleading locking
documentation is worse than useless (see e.g. the comment in the
vmgfx driver about the cleanup mess). And since for most functions
the very first line either grabs the lock or has a WARN_ON(!locked)
the documentation doesn't really add anything.
- Instead put in some effort into explaining the only two special
cases a bit better: config_init and config_cleanup are both called
from single-threaded setup/teardown code, so don't do any locking.
It's the driver's job though to enforce this.
- Where lacking, add a WARN_ON(!is_locked). Not many places though,
since locking around fbdev setup/teardown is through-roughly screwed
up, and so will break almost every single WARN annotation I've tried
to add.
- Add a drm_modeset_is_locked helper - the Grate Modset Locking Rework
will use the compiler to assist in the big reorg by renaming the
mode lock, so start encapsulating things. Unfortunately this ended
up in the "wrong" header file since it needs the definition of
struct drm_device.
v2: Drop most WARNS again - we hit them all over the place, mostly in
the setup and teardown sequences. And trying to fix it up leads to
nice deadlocks, since the locking in the setup code is really
inconsistent.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-02 06:43:11 +08:00
|
|
|
* Note that since this /should/ happen single-threaded at driver/device
|
|
|
|
* teardown time, no locking is required. It's the driver's job to ensure that
|
|
|
|
* this guarantee actually holds true.
|
|
|
|
*
|
2008-11-08 06:05:41 +08:00
|
|
|
* FIXME: cleanup any dangling user buffer objects too
|
|
|
|
*/
|
|
|
|
void drm_mode_config_cleanup(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_connector *connector, *ot;
|
|
|
|
struct drm_crtc *crtc, *ct;
|
|
|
|
struct drm_encoder *encoder, *enct;
|
|
|
|
struct drm_framebuffer *fb, *fbt;
|
|
|
|
struct drm_property *property, *pt;
|
2011-11-15 06:51:27 +08:00
|
|
|
struct drm_plane *plane, *plt;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
list_for_each_entry_safe(encoder, enct, &dev->mode_config.encoder_list,
|
|
|
|
head) {
|
|
|
|
encoder->funcs->destroy(encoder);
|
|
|
|
}
|
|
|
|
|
|
|
|
list_for_each_entry_safe(connector, ot,
|
|
|
|
&dev->mode_config.connector_list, head) {
|
|
|
|
connector->funcs->destroy(connector);
|
|
|
|
}
|
|
|
|
|
|
|
|
list_for_each_entry_safe(property, pt, &dev->mode_config.property_list,
|
|
|
|
head) {
|
|
|
|
drm_property_destroy(dev, property);
|
|
|
|
}
|
|
|
|
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
/*
|
|
|
|
* Single-threaded teardown context, so it's not required to grab the
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
* fb_lock to protect against concurrent fb_list access. Contrary, it
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
* would actually deadlock with the drm_framebuffer_cleanup function.
|
|
|
|
*
|
|
|
|
* Also, if there are any framebuffers left, that's a driver leak now,
|
|
|
|
* so politely WARN about this.
|
|
|
|
*/
|
|
|
|
WARN_ON(!list_empty(&dev->mode_config.fb_list));
|
2008-11-08 06:05:41 +08:00
|
|
|
list_for_each_entry_safe(fb, fbt, &dev->mode_config.fb_list, head) {
|
2012-09-06 05:48:38 +08:00
|
|
|
drm_framebuffer_remove(fb);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
2011-11-15 06:51:27 +08:00
|
|
|
list_for_each_entry_safe(plane, plt, &dev->mode_config.plane_list,
|
|
|
|
head) {
|
|
|
|
plane->funcs->destroy(plane);
|
|
|
|
}
|
2012-02-01 18:38:20 +08:00
|
|
|
|
2012-09-17 17:38:03 +08:00
|
|
|
list_for_each_entry_safe(crtc, ct, &dev->mode_config.crtc_list, head) {
|
|
|
|
crtc->funcs->destroy(crtc);
|
|
|
|
}
|
|
|
|
|
2012-02-01 18:38:20 +08:00
|
|
|
idr_destroy(&dev->mode_config.crtc_idr);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_config_cleanup);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_convert_to_umode - convert a drm_display_mode into a modeinfo
|
|
|
|
* @out: drm_mode_modeinfo struct to return to the user
|
|
|
|
* @in: drm_display_mode to use
|
|
|
|
*
|
|
|
|
* Convert a drm_display_mode into a drm_mode_modeinfo structure to return to
|
|
|
|
* the user.
|
|
|
|
*/
|
2012-03-13 18:35:47 +08:00
|
|
|
static void drm_crtc_convert_to_umode(struct drm_mode_modeinfo *out,
|
|
|
|
const struct drm_display_mode *in)
|
2008-11-08 06:05:41 +08:00
|
|
|
{
|
2012-03-13 18:35:40 +08:00
|
|
|
WARN(in->hdisplay > USHRT_MAX || in->hsync_start > USHRT_MAX ||
|
|
|
|
in->hsync_end > USHRT_MAX || in->htotal > USHRT_MAX ||
|
|
|
|
in->hskew > USHRT_MAX || in->vdisplay > USHRT_MAX ||
|
|
|
|
in->vsync_start > USHRT_MAX || in->vsync_end > USHRT_MAX ||
|
|
|
|
in->vtotal > USHRT_MAX || in->vscan > USHRT_MAX,
|
|
|
|
"timing values too large for mode info\n");
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
out->clock = in->clock;
|
|
|
|
out->hdisplay = in->hdisplay;
|
|
|
|
out->hsync_start = in->hsync_start;
|
|
|
|
out->hsync_end = in->hsync_end;
|
|
|
|
out->htotal = in->htotal;
|
|
|
|
out->hskew = in->hskew;
|
|
|
|
out->vdisplay = in->vdisplay;
|
|
|
|
out->vsync_start = in->vsync_start;
|
|
|
|
out->vsync_end = in->vsync_end;
|
|
|
|
out->vtotal = in->vtotal;
|
|
|
|
out->vscan = in->vscan;
|
|
|
|
out->vrefresh = in->vrefresh;
|
|
|
|
out->flags = in->flags;
|
|
|
|
out->type = in->type;
|
|
|
|
strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
|
|
|
|
out->name[DRM_DISPLAY_MODE_LEN-1] = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_crtc_convert_to_umode - convert a modeinfo into a drm_display_mode
|
|
|
|
* @out: drm_display_mode to return to the user
|
|
|
|
* @in: drm_mode_modeinfo to use
|
|
|
|
*
|
|
|
|
* Convert a drm_mode_modeinfo into a drm_display_mode structure to return to
|
|
|
|
* the caller.
|
2012-03-13 18:35:44 +08:00
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
2008-11-08 06:05:41 +08:00
|
|
|
*/
|
2012-03-13 18:35:47 +08:00
|
|
|
static int drm_crtc_convert_umode(struct drm_display_mode *out,
|
|
|
|
const struct drm_mode_modeinfo *in)
|
2008-11-08 06:05:41 +08:00
|
|
|
{
|
2012-03-13 18:35:44 +08:00
|
|
|
if (in->clock > INT_MAX || in->vrefresh > INT_MAX)
|
|
|
|
return -ERANGE;
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
out->clock = in->clock;
|
|
|
|
out->hdisplay = in->hdisplay;
|
|
|
|
out->hsync_start = in->hsync_start;
|
|
|
|
out->hsync_end = in->hsync_end;
|
|
|
|
out->htotal = in->htotal;
|
|
|
|
out->hskew = in->hskew;
|
|
|
|
out->vdisplay = in->vdisplay;
|
|
|
|
out->vsync_start = in->vsync_start;
|
|
|
|
out->vsync_end = in->vsync_end;
|
|
|
|
out->vtotal = in->vtotal;
|
|
|
|
out->vscan = in->vscan;
|
|
|
|
out->vrefresh = in->vrefresh;
|
|
|
|
out->flags = in->flags;
|
|
|
|
out->type = in->type;
|
|
|
|
strncpy(out->name, in->name, DRM_DISPLAY_MODE_LEN);
|
|
|
|
out->name[DRM_DISPLAY_MODE_LEN-1] = 0;
|
2012-03-13 18:35:44 +08:00
|
|
|
|
|
|
|
return 0;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_getresources - get graphics configuration
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Construct a set of configuration description structures and return
|
|
|
|
* them to the user, including CRTC, connector and framebuffer configuration.
|
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_getresources(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_card_res *card_res = data;
|
|
|
|
struct list_head *lh;
|
|
|
|
struct drm_framebuffer *fb;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
struct drm_encoder *encoder;
|
|
|
|
int ret = 0;
|
|
|
|
int connector_count = 0;
|
|
|
|
int crtc_count = 0;
|
|
|
|
int fb_count = 0;
|
|
|
|
int encoder_count = 0;
|
|
|
|
int copied = 0, i;
|
|
|
|
uint32_t __user *fb_id;
|
|
|
|
uint32_t __user *crtc_id;
|
|
|
|
uint32_t __user *connector_id;
|
|
|
|
uint32_t __user *encoder_id;
|
|
|
|
struct drm_mode_group *mode_group;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_lock(&file_priv->fbs_lock);
|
2008-11-08 06:05:41 +08:00
|
|
|
/*
|
|
|
|
* For the non-control nodes we need to limit the list of resources
|
|
|
|
* by IDs in the group list for this node
|
|
|
|
*/
|
|
|
|
list_for_each(lh, &file_priv->fbs)
|
|
|
|
fb_count++;
|
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
/* handle this in 4 parts */
|
|
|
|
/* FBs */
|
|
|
|
if (card_res->count_fbs >= fb_count) {
|
|
|
|
copied = 0;
|
|
|
|
fb_id = (uint32_t __user *)(unsigned long)card_res->fb_id_ptr;
|
|
|
|
list_for_each_entry(fb, &file_priv->fbs, filp_head) {
|
|
|
|
if (put_user(fb->base.id, fb_id + copied)) {
|
|
|
|
mutex_unlock(&file_priv->fbs_lock);
|
|
|
|
return -EFAULT;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
card_res->count_fbs = fb_count;
|
|
|
|
mutex_unlock(&file_priv->fbs_lock);
|
|
|
|
|
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
mode_group = &file_priv->master->minor->mode_group;
|
|
|
|
if (file_priv->master->minor->type == DRM_MINOR_CONTROL) {
|
|
|
|
|
|
|
|
list_for_each(lh, &dev->mode_config.crtc_list)
|
|
|
|
crtc_count++;
|
|
|
|
|
|
|
|
list_for_each(lh, &dev->mode_config.connector_list)
|
|
|
|
connector_count++;
|
|
|
|
|
|
|
|
list_for_each(lh, &dev->mode_config.encoder_list)
|
|
|
|
encoder_count++;
|
|
|
|
} else {
|
|
|
|
|
|
|
|
crtc_count = mode_group->num_crtcs;
|
|
|
|
connector_count = mode_group->num_connectors;
|
|
|
|
encoder_count = mode_group->num_encoders;
|
|
|
|
}
|
|
|
|
|
|
|
|
card_res->max_height = dev->mode_config.max_height;
|
|
|
|
card_res->min_height = dev->mode_config.min_height;
|
|
|
|
card_res->max_width = dev->mode_config.max_width;
|
|
|
|
card_res->min_width = dev->mode_config.min_width;
|
|
|
|
|
|
|
|
/* CRTCs */
|
|
|
|
if (card_res->count_crtcs >= crtc_count) {
|
|
|
|
copied = 0;
|
|
|
|
crtc_id = (uint32_t __user *)(unsigned long)card_res->crtc_id_ptr;
|
|
|
|
if (file_priv->master->minor->type == DRM_MINOR_CONTROL) {
|
|
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list,
|
|
|
|
head) {
|
2010-07-16 03:43:25 +08:00
|
|
|
DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);
|
2008-11-08 06:05:41 +08:00
|
|
|
if (put_user(crtc->base.id, crtc_id + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = 0; i < mode_group->num_crtcs; i++) {
|
|
|
|
if (put_user(mode_group->id_list[i],
|
|
|
|
crtc_id + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
card_res->count_crtcs = crtc_count;
|
|
|
|
|
|
|
|
/* Encoders */
|
|
|
|
if (card_res->count_encoders >= encoder_count) {
|
|
|
|
copied = 0;
|
|
|
|
encoder_id = (uint32_t __user *)(unsigned long)card_res->encoder_id_ptr;
|
|
|
|
if (file_priv->master->minor->type == DRM_MINOR_CONTROL) {
|
|
|
|
list_for_each_entry(encoder,
|
|
|
|
&dev->mode_config.encoder_list,
|
|
|
|
head) {
|
2010-07-16 03:43:25 +08:00
|
|
|
DRM_DEBUG_KMS("[ENCODER:%d:%s]\n", encoder->base.id,
|
|
|
|
drm_get_encoder_name(encoder));
|
2008-11-08 06:05:41 +08:00
|
|
|
if (put_user(encoder->base.id, encoder_id +
|
|
|
|
copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
for (i = mode_group->num_crtcs; i < mode_group->num_crtcs + mode_group->num_encoders; i++) {
|
|
|
|
if (put_user(mode_group->id_list[i],
|
|
|
|
encoder_id + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
card_res->count_encoders = encoder_count;
|
|
|
|
|
|
|
|
/* Connectors */
|
|
|
|
if (card_res->count_connectors >= connector_count) {
|
|
|
|
copied = 0;
|
|
|
|
connector_id = (uint32_t __user *)(unsigned long)card_res->connector_id_ptr;
|
|
|
|
if (file_priv->master->minor->type == DRM_MINOR_CONTROL) {
|
|
|
|
list_for_each_entry(connector,
|
|
|
|
&dev->mode_config.connector_list,
|
|
|
|
head) {
|
2010-07-16 03:43:25 +08:00
|
|
|
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
|
|
|
|
connector->base.id,
|
|
|
|
drm_get_connector_name(connector));
|
2008-11-08 06:05:41 +08:00
|
|
|
if (put_user(connector->base.id,
|
|
|
|
connector_id + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
int start = mode_group->num_crtcs +
|
|
|
|
mode_group->num_encoders;
|
|
|
|
for (i = start; i < start + mode_group->num_connectors; i++) {
|
|
|
|
if (put_user(mode_group->id_list[i],
|
|
|
|
connector_id + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
card_res->count_connectors = connector_count;
|
|
|
|
|
2010-07-16 03:43:25 +08:00
|
|
|
DRM_DEBUG_KMS("CRTC[%d] CONNECTORS[%d] ENCODERS[%d]\n", card_res->count_crtcs,
|
2008-11-08 06:05:41 +08:00
|
|
|
card_res->count_connectors, card_res->count_encoders);
|
|
|
|
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_getcrtc - get CRTC configuration
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Construct a CRTC configuration structure to return to the user.
|
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_getcrtc(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_crtc *crtc_resp = data;
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
int ret = 0;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
obj = drm_mode_object_find(dev, crtc_resp->crtc_id,
|
|
|
|
DRM_MODE_OBJECT_CRTC);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
crtc = obj_to_crtc(obj);
|
|
|
|
|
|
|
|
crtc_resp->x = crtc->x;
|
|
|
|
crtc_resp->y = crtc->y;
|
|
|
|
crtc_resp->gamma_size = crtc->gamma_size;
|
|
|
|
if (crtc->fb)
|
|
|
|
crtc_resp->fb_id = crtc->fb->base.id;
|
|
|
|
else
|
|
|
|
crtc_resp->fb_id = 0;
|
|
|
|
|
|
|
|
if (crtc->enabled) {
|
|
|
|
|
|
|
|
drm_crtc_convert_to_umode(&crtc_resp->mode, &crtc->mode);
|
|
|
|
crtc_resp->mode_valid = 1;
|
|
|
|
|
|
|
|
} else {
|
|
|
|
crtc_resp->mode_valid = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_getconnector - get connector configuration
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Construct a connector configuration structure to return to the user.
|
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_getconnector(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_get_connector *out_resp = data;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
struct drm_display_mode *mode;
|
|
|
|
int mode_count = 0;
|
|
|
|
int props_count = 0;
|
|
|
|
int encoders_count = 0;
|
|
|
|
int ret = 0;
|
|
|
|
int copied = 0;
|
|
|
|
int i;
|
|
|
|
struct drm_mode_modeinfo u_mode;
|
|
|
|
struct drm_mode_modeinfo __user *mode_ptr;
|
|
|
|
uint32_t __user *prop_ptr;
|
|
|
|
uint64_t __user *prop_values;
|
|
|
|
uint32_t __user *encoder_ptr;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
memset(&u_mode, 0, sizeof(struct drm_mode_modeinfo));
|
|
|
|
|
2010-07-16 03:43:25 +08:00
|
|
|
DRM_DEBUG_KMS("[CONNECTOR:%d:?]\n", out_resp->connector_id);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-12-12 07:35:33 +08:00
|
|
|
mutex_lock(&dev->mode_config.mutex);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
obj = drm_mode_object_find(dev, out_resp->connector_id,
|
|
|
|
DRM_MODE_OBJECT_CONNECTOR);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
connector = obj_to_connector(obj);
|
|
|
|
|
2012-05-16 05:09:04 +08:00
|
|
|
props_count = connector->properties.count;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
|
|
|
|
if (connector->encoder_ids[i] != 0) {
|
|
|
|
encoders_count++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (out_resp->count_modes == 0) {
|
|
|
|
connector->funcs->fill_modes(connector,
|
|
|
|
dev->mode_config.max_width,
|
|
|
|
dev->mode_config.max_height);
|
|
|
|
}
|
|
|
|
|
|
|
|
/* delayed so we get modes regardless of pre-fill_modes state */
|
|
|
|
list_for_each_entry(mode, &connector->modes, head)
|
|
|
|
mode_count++;
|
|
|
|
|
|
|
|
out_resp->connector_id = connector->base.id;
|
|
|
|
out_resp->connector_type = connector->connector_type;
|
|
|
|
out_resp->connector_type_id = connector->connector_type_id;
|
|
|
|
out_resp->mm_width = connector->display_info.width_mm;
|
|
|
|
out_resp->mm_height = connector->display_info.height_mm;
|
|
|
|
out_resp->subpixel = connector->display_info.subpixel_order;
|
|
|
|
out_resp->connection = connector->status;
|
|
|
|
if (connector->encoder)
|
|
|
|
out_resp->encoder_id = connector->encoder->base.id;
|
|
|
|
else
|
|
|
|
out_resp->encoder_id = 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This ioctl is called twice, once to determine how much space is
|
|
|
|
* needed, and the 2nd time to fill it.
|
|
|
|
*/
|
|
|
|
if ((out_resp->count_modes >= mode_count) && mode_count) {
|
|
|
|
copied = 0;
|
2011-12-20 06:06:42 +08:00
|
|
|
mode_ptr = (struct drm_mode_modeinfo __user *)(unsigned long)out_resp->modes_ptr;
|
2008-11-08 06:05:41 +08:00
|
|
|
list_for_each_entry(mode, &connector->modes, head) {
|
|
|
|
drm_crtc_convert_to_umode(&u_mode, mode);
|
|
|
|
if (copy_to_user(mode_ptr + copied,
|
|
|
|
&u_mode, sizeof(u_mode))) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out_resp->count_modes = mode_count;
|
|
|
|
|
|
|
|
if ((out_resp->count_props >= props_count) && props_count) {
|
|
|
|
copied = 0;
|
2011-12-20 06:06:42 +08:00
|
|
|
prop_ptr = (uint32_t __user *)(unsigned long)(out_resp->props_ptr);
|
|
|
|
prop_values = (uint64_t __user *)(unsigned long)(out_resp->prop_values_ptr);
|
2012-05-16 05:09:04 +08:00
|
|
|
for (i = 0; i < connector->properties.count; i++) {
|
|
|
|
if (put_user(connector->properties.ids[i],
|
|
|
|
prop_ptr + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-05-16 05:09:04 +08:00
|
|
|
if (put_user(connector->properties.values[i],
|
|
|
|
prop_values + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
2012-05-16 05:09:04 +08:00
|
|
|
copied++;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
}
|
|
|
|
out_resp->count_props = props_count;
|
|
|
|
|
|
|
|
if ((out_resp->count_encoders >= encoders_count) && encoders_count) {
|
|
|
|
copied = 0;
|
2011-12-20 06:06:42 +08:00
|
|
|
encoder_ptr = (uint32_t __user *)(unsigned long)(out_resp->encoders_ptr);
|
2008-11-08 06:05:41 +08:00
|
|
|
for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
|
|
|
|
if (connector->encoder_ids[i] != 0) {
|
|
|
|
if (put_user(connector->encoder_ids[i],
|
|
|
|
encoder_ptr + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out_resp->count_encoders = encoders_count;
|
|
|
|
|
|
|
|
out:
|
2012-12-12 07:35:33 +08:00
|
|
|
mutex_unlock(&dev->mode_config.mutex);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_getencoder(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_get_encoder *enc_resp = data;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_encoder *encoder;
|
|
|
|
int ret = 0;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
obj = drm_mode_object_find(dev, enc_resp->encoder_id,
|
|
|
|
DRM_MODE_OBJECT_ENCODER);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
encoder = obj_to_encoder(obj);
|
|
|
|
|
|
|
|
if (encoder->crtc)
|
|
|
|
enc_resp->crtc_id = encoder->crtc->base.id;
|
|
|
|
else
|
|
|
|
enc_resp->crtc_id = 0;
|
|
|
|
enc_resp->encoder_type = encoder->encoder_type;
|
|
|
|
enc_resp->encoder_id = encoder->base.id;
|
|
|
|
enc_resp->possible_crtcs = encoder->possible_crtcs;
|
|
|
|
enc_resp->possible_clones = encoder->possible_clones;
|
|
|
|
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-11-15 06:51:27 +08:00
|
|
|
/**
|
|
|
|
* drm_mode_getplane_res - get plane info
|
|
|
|
* @dev: DRM device
|
|
|
|
* @data: ioctl data
|
|
|
|
* @file_priv: DRM file info
|
|
|
|
*
|
|
|
|
* Return an plane count and set of IDs.
|
|
|
|
*/
|
|
|
|
int drm_mode_getplane_res(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_get_plane_res *plane_resp = data;
|
|
|
|
struct drm_mode_config *config;
|
|
|
|
struct drm_plane *plane;
|
|
|
|
uint32_t __user *plane_ptr;
|
|
|
|
int copied = 0, ret = 0;
|
|
|
|
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
config = &dev->mode_config;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This ioctl is called twice, once to determine how much space is
|
|
|
|
* needed, and the 2nd time to fill it.
|
|
|
|
*/
|
|
|
|
if (config->num_plane &&
|
|
|
|
(plane_resp->count_planes >= config->num_plane)) {
|
2011-12-20 06:06:42 +08:00
|
|
|
plane_ptr = (uint32_t __user *)(unsigned long)plane_resp->plane_id_ptr;
|
2011-11-15 06:51:27 +08:00
|
|
|
|
|
|
|
list_for_each_entry(plane, &config->plane_list, head) {
|
|
|
|
if (put_user(plane->base.id, plane_ptr + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
plane_resp->count_planes = config->num_plane;
|
|
|
|
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_getplane - get plane info
|
|
|
|
* @dev: DRM device
|
|
|
|
* @data: ioctl data
|
|
|
|
* @file_priv: DRM file info
|
|
|
|
*
|
|
|
|
* Return plane info, including formats supported, gamma size, any
|
|
|
|
* current fb, etc.
|
|
|
|
*/
|
|
|
|
int drm_mode_getplane(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_get_plane *plane_resp = data;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_plane *plane;
|
|
|
|
uint32_t __user *format_ptr;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
obj = drm_mode_object_find(dev, plane_resp->plane_id,
|
|
|
|
DRM_MODE_OBJECT_PLANE);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
plane = obj_to_plane(obj);
|
|
|
|
|
|
|
|
if (plane->crtc)
|
|
|
|
plane_resp->crtc_id = plane->crtc->base.id;
|
|
|
|
else
|
|
|
|
plane_resp->crtc_id = 0;
|
|
|
|
|
|
|
|
if (plane->fb)
|
|
|
|
plane_resp->fb_id = plane->fb->base.id;
|
|
|
|
else
|
|
|
|
plane_resp->fb_id = 0;
|
|
|
|
|
|
|
|
plane_resp->plane_id = plane->base.id;
|
|
|
|
plane_resp->possible_crtcs = plane->possible_crtcs;
|
|
|
|
plane_resp->gamma_size = plane->gamma_size;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* This ioctl is called twice, once to determine how much space is
|
|
|
|
* needed, and the 2nd time to fill it.
|
|
|
|
*/
|
|
|
|
if (plane->format_count &&
|
|
|
|
(plane_resp->count_format_types >= plane->format_count)) {
|
2011-12-20 06:06:42 +08:00
|
|
|
format_ptr = (uint32_t __user *)(unsigned long)plane_resp->format_type_ptr;
|
2011-11-15 06:51:27 +08:00
|
|
|
if (copy_to_user(format_ptr,
|
|
|
|
plane->format_types,
|
|
|
|
sizeof(uint32_t) * plane->format_count)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
plane_resp->count_format_types = plane->format_count;
|
|
|
|
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_setplane - set up or tear down an plane
|
|
|
|
* @dev: DRM device
|
|
|
|
* @data: ioctl data*
|
2012-12-02 07:09:18 +08:00
|
|
|
* @file_priv: DRM file info
|
2011-11-15 06:51:27 +08:00
|
|
|
*
|
|
|
|
* Set plane info, including placement, fb, scaling, and other factors.
|
|
|
|
* Or pass a NULL fb to disable.
|
|
|
|
*/
|
|
|
|
int drm_mode_setplane(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_set_plane *plane_req = data;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_plane *plane;
|
|
|
|
struct drm_crtc *crtc;
|
2012-12-11 07:59:24 +08:00
|
|
|
struct drm_framebuffer *fb = NULL, *old_fb = NULL;
|
2011-11-15 06:51:27 +08:00
|
|
|
int ret = 0;
|
2011-12-20 06:06:44 +08:00
|
|
|
unsigned int fb_width, fb_height;
|
2011-12-20 06:06:47 +08:00
|
|
|
int i;
|
2011-11-15 06:51:27 +08:00
|
|
|
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* First, find the plane, crtc, and fb objects. If not available,
|
|
|
|
* we don't bother to call the driver.
|
|
|
|
*/
|
|
|
|
obj = drm_mode_object_find(dev, plane_req->plane_id,
|
|
|
|
DRM_MODE_OBJECT_PLANE);
|
|
|
|
if (!obj) {
|
|
|
|
DRM_DEBUG_KMS("Unknown plane ID %d\n",
|
|
|
|
plane_req->plane_id);
|
2012-12-11 07:59:24 +08:00
|
|
|
return -ENOENT;
|
2011-11-15 06:51:27 +08:00
|
|
|
}
|
|
|
|
plane = obj_to_plane(obj);
|
|
|
|
|
|
|
|
/* No fb means shut it down */
|
|
|
|
if (!plane_req->fb_id) {
|
2012-12-11 07:59:24 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
|
|
|
old_fb = plane->fb;
|
2011-11-15 06:51:27 +08:00
|
|
|
plane->funcs->disable_plane(plane);
|
2011-12-20 06:06:43 +08:00
|
|
|
plane->crtc = NULL;
|
|
|
|
plane->fb = NULL;
|
2012-12-11 07:59:24 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
obj = drm_mode_object_find(dev, plane_req->crtc_id,
|
|
|
|
DRM_MODE_OBJECT_CRTC);
|
|
|
|
if (!obj) {
|
|
|
|
DRM_DEBUG_KMS("Unknown crtc ID %d\n",
|
|
|
|
plane_req->crtc_id);
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
crtc = obj_to_crtc(obj);
|
|
|
|
|
2012-12-03 04:53:40 +08:00
|
|
|
fb = drm_framebuffer_lookup(dev, plane_req->fb_id);
|
|
|
|
if (!fb) {
|
2011-11-15 06:51:27 +08:00
|
|
|
DRM_DEBUG_KMS("Unknown framebuffer ID %d\n",
|
|
|
|
plane_req->fb_id);
|
|
|
|
ret = -ENOENT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2011-12-20 06:06:47 +08:00
|
|
|
/* Check whether this plane supports the fb pixel format. */
|
|
|
|
for (i = 0; i < plane->format_count; i++)
|
|
|
|
if (fb->pixel_format == plane->format_types[i])
|
|
|
|
break;
|
|
|
|
if (i == plane->format_count) {
|
|
|
|
DRM_DEBUG_KMS("Invalid pixel format 0x%08x\n", fb->pixel_format);
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2011-12-20 06:06:44 +08:00
|
|
|
fb_width = fb->width << 16;
|
|
|
|
fb_height = fb->height << 16;
|
|
|
|
|
|
|
|
/* Make sure source coordinates are inside the fb. */
|
|
|
|
if (plane_req->src_w > fb_width ||
|
|
|
|
plane_req->src_x > fb_width - plane_req->src_w ||
|
|
|
|
plane_req->src_h > fb_height ||
|
|
|
|
plane_req->src_y > fb_height - plane_req->src_h) {
|
|
|
|
DRM_DEBUG_KMS("Invalid source coordinates "
|
|
|
|
"%u.%06ux%u.%06u+%u.%06u+%u.%06u\n",
|
|
|
|
plane_req->src_w >> 16,
|
|
|
|
((plane_req->src_w & 0xffff) * 15625) >> 10,
|
|
|
|
plane_req->src_h >> 16,
|
|
|
|
((plane_req->src_h & 0xffff) * 15625) >> 10,
|
|
|
|
plane_req->src_x >> 16,
|
|
|
|
((plane_req->src_x & 0xffff) * 15625) >> 10,
|
|
|
|
plane_req->src_y >> 16,
|
|
|
|
((plane_req->src_y & 0xffff) * 15625) >> 10);
|
|
|
|
ret = -ENOSPC;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2011-12-20 06:06:45 +08:00
|
|
|
/* Give drivers some help against integer overflows */
|
|
|
|
if (plane_req->crtc_w > INT_MAX ||
|
|
|
|
plane_req->crtc_x > INT_MAX - (int32_t) plane_req->crtc_w ||
|
|
|
|
plane_req->crtc_h > INT_MAX ||
|
|
|
|
plane_req->crtc_y > INT_MAX - (int32_t) plane_req->crtc_h) {
|
|
|
|
DRM_DEBUG_KMS("Invalid CRTC coordinates %ux%u+%d+%d\n",
|
|
|
|
plane_req->crtc_w, plane_req->crtc_h,
|
|
|
|
plane_req->crtc_x, plane_req->crtc_y);
|
|
|
|
ret = -ERANGE;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-12-11 07:59:24 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
ret = plane->funcs->update_plane(plane, crtc, fb,
|
|
|
|
plane_req->crtc_x, plane_req->crtc_y,
|
|
|
|
plane_req->crtc_w, plane_req->crtc_h,
|
|
|
|
plane_req->src_x, plane_req->src_y,
|
|
|
|
plane_req->src_w, plane_req->src_h);
|
|
|
|
if (!ret) {
|
2012-12-11 07:59:24 +08:00
|
|
|
old_fb = plane->fb;
|
2011-11-15 06:51:27 +08:00
|
|
|
plane->crtc = crtc;
|
|
|
|
plane->fb = fb;
|
2013-02-16 04:21:37 +08:00
|
|
|
fb = NULL;
|
2011-11-15 06:51:27 +08:00
|
|
|
}
|
2012-12-11 07:59:24 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2011-11-15 06:51:27 +08:00
|
|
|
|
|
|
|
out:
|
2012-12-11 07:59:24 +08:00
|
|
|
if (fb)
|
|
|
|
drm_framebuffer_unreference(fb);
|
|
|
|
if (old_fb)
|
|
|
|
drm_framebuffer_unreference(old_fb);
|
2011-11-15 06:51:27 +08:00
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-12-11 20:47:23 +08:00
|
|
|
/**
|
|
|
|
* drm_mode_set_config_internal - helper to call ->set_config
|
|
|
|
* @set: modeset config to set
|
|
|
|
*
|
|
|
|
* This is a little helper to wrap internal calls to the ->set_config driver
|
|
|
|
* interface. The only thing it adds is correct refcounting dance.
|
|
|
|
*/
|
|
|
|
int drm_mode_set_config_internal(struct drm_mode_set *set)
|
|
|
|
{
|
|
|
|
struct drm_crtc *crtc = set->crtc;
|
2012-12-11 08:07:12 +08:00
|
|
|
struct drm_framebuffer *fb, *old_fb;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
old_fb = crtc->fb;
|
|
|
|
fb = set->fb;
|
2012-12-11 20:47:23 +08:00
|
|
|
|
2012-12-11 08:07:12 +08:00
|
|
|
ret = crtc->funcs->set_config(set);
|
|
|
|
if (ret == 0) {
|
|
|
|
if (old_fb)
|
|
|
|
drm_framebuffer_unreference(old_fb);
|
|
|
|
if (fb)
|
|
|
|
drm_framebuffer_reference(fb);
|
|
|
|
}
|
|
|
|
|
|
|
|
return ret;
|
2012-12-11 20:47:23 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_set_config_internal);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
/**
|
|
|
|
* drm_mode_setcrtc - set CRTC configuration
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Build a new CRTC configuration based on user request.
|
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_setcrtc(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_config *config = &dev->mode_config;
|
|
|
|
struct drm_mode_crtc *crtc_req = data;
|
|
|
|
struct drm_mode_object *obj;
|
2012-03-13 18:35:38 +08:00
|
|
|
struct drm_crtc *crtc;
|
2008-11-08 06:05:41 +08:00
|
|
|
struct drm_connector **connector_set = NULL, *connector;
|
|
|
|
struct drm_framebuffer *fb = NULL;
|
|
|
|
struct drm_display_mode *mode = NULL;
|
|
|
|
struct drm_mode_set set;
|
|
|
|
uint32_t __user *set_connectors_ptr;
|
2012-05-17 19:27:21 +08:00
|
|
|
int ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
int i;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-03-13 18:35:41 +08:00
|
|
|
/* For some reason crtc x/y offsets are signed internally. */
|
|
|
|
if (crtc_req->x > INT_MAX || crtc_req->y > INT_MAX)
|
|
|
|
return -ERANGE;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
obj = drm_mode_object_find(dev, crtc_req->crtc_id,
|
|
|
|
DRM_MODE_OBJECT_CRTC);
|
|
|
|
if (!obj) {
|
2009-07-20 13:48:07 +08:00
|
|
|
DRM_DEBUG_KMS("Unknown CRTC ID %d\n", crtc_req->crtc_id);
|
2008-11-08 06:05:41 +08:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
crtc = obj_to_crtc(obj);
|
2010-07-16 03:43:25 +08:00
|
|
|
DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
if (crtc_req->mode_valid) {
|
2012-09-05 00:35:56 +08:00
|
|
|
int hdisplay, vdisplay;
|
2008-11-08 06:05:41 +08:00
|
|
|
/* If we have a mode we need a framebuffer. */
|
|
|
|
/* If we pass -1, set the mode with the currently bound fb */
|
|
|
|
if (crtc_req->fb_id == -1) {
|
2012-03-13 18:35:38 +08:00
|
|
|
if (!crtc->fb) {
|
|
|
|
DRM_DEBUG_KMS("CRTC doesn't have current FB\n");
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
2012-03-13 18:35:38 +08:00
|
|
|
fb = crtc->fb;
|
2012-12-11 08:07:12 +08:00
|
|
|
/* Make refcounting symmetric with the lookup path. */
|
|
|
|
drm_framebuffer_reference(fb);
|
2008-11-08 06:05:41 +08:00
|
|
|
} else {
|
2012-12-03 04:53:40 +08:00
|
|
|
fb = drm_framebuffer_lookup(dev, crtc_req->fb_id);
|
|
|
|
if (!fb) {
|
2009-07-20 13:48:07 +08:00
|
|
|
DRM_DEBUG_KMS("Unknown FB ID%d\n",
|
|
|
|
crtc_req->fb_id);
|
2008-11-08 06:05:41 +08:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
mode = drm_mode_create(dev);
|
2012-03-13 18:35:43 +08:00
|
|
|
if (!mode) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-03-13 18:35:44 +08:00
|
|
|
ret = drm_crtc_convert_umode(mode, &crtc_req->mode);
|
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG_KMS("Invalid mode\n");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
|
2012-03-13 18:35:45 +08:00
|
|
|
|
2012-09-05 00:35:56 +08:00
|
|
|
hdisplay = mode->hdisplay;
|
|
|
|
vdisplay = mode->vdisplay;
|
|
|
|
|
|
|
|
if (crtc->invert_dimensions)
|
|
|
|
swap(hdisplay, vdisplay);
|
|
|
|
|
|
|
|
if (hdisplay > fb->width ||
|
|
|
|
vdisplay > fb->height ||
|
|
|
|
crtc_req->x > fb->width - hdisplay ||
|
|
|
|
crtc_req->y > fb->height - vdisplay) {
|
|
|
|
DRM_DEBUG_KMS("Invalid fb size %ux%u for CRTC viewport %ux%u+%d+%d%s.\n",
|
|
|
|
fb->width, fb->height,
|
|
|
|
hdisplay, vdisplay, crtc_req->x, crtc_req->y,
|
|
|
|
crtc->invert_dimensions ? " (inverted)" : "");
|
2012-03-13 18:35:45 +08:00
|
|
|
ret = -ENOSPC;
|
|
|
|
goto out;
|
|
|
|
}
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (crtc_req->count_connectors == 0 && mode) {
|
2009-07-20 13:48:07 +08:00
|
|
|
DRM_DEBUG_KMS("Count connectors is 0 but mode set\n");
|
2008-11-08 06:05:41 +08:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-08-03 20:43:58 +08:00
|
|
|
if (crtc_req->count_connectors > 0 && (!mode || !fb)) {
|
2009-07-20 13:48:07 +08:00
|
|
|
DRM_DEBUG_KMS("Count connectors is %d but no mode or fb set\n",
|
2008-11-08 06:05:41 +08:00
|
|
|
crtc_req->count_connectors);
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (crtc_req->count_connectors > 0) {
|
|
|
|
u32 out_id;
|
|
|
|
|
|
|
|
/* Avoid unbounded kernel memory allocation */
|
|
|
|
if (crtc_req->count_connectors > config->num_connector) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
connector_set = kmalloc(crtc_req->count_connectors *
|
|
|
|
sizeof(struct drm_connector *),
|
|
|
|
GFP_KERNEL);
|
|
|
|
if (!connector_set) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < crtc_req->count_connectors; i++) {
|
2011-12-20 06:06:42 +08:00
|
|
|
set_connectors_ptr = (uint32_t __user *)(unsigned long)crtc_req->set_connectors_ptr;
|
2008-11-08 06:05:41 +08:00
|
|
|
if (get_user(out_id, &set_connectors_ptr[i])) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
obj = drm_mode_object_find(dev, out_id,
|
|
|
|
DRM_MODE_OBJECT_CONNECTOR);
|
|
|
|
if (!obj) {
|
2009-07-20 13:48:07 +08:00
|
|
|
DRM_DEBUG_KMS("Connector id %d unknown\n",
|
|
|
|
out_id);
|
2008-11-08 06:05:41 +08:00
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
connector = obj_to_connector(obj);
|
2010-07-16 03:43:25 +08:00
|
|
|
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
|
|
|
|
connector->base.id,
|
|
|
|
drm_get_connector_name(connector));
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
connector_set[i] = connector;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
set.crtc = crtc;
|
|
|
|
set.x = crtc_req->x;
|
|
|
|
set.y = crtc_req->y;
|
|
|
|
set.mode = mode;
|
|
|
|
set.connectors = connector_set;
|
|
|
|
set.num_connectors = crtc_req->count_connectors;
|
2009-08-17 11:11:23 +08:00
|
|
|
set.fb = fb;
|
2012-12-11 20:47:23 +08:00
|
|
|
ret = drm_mode_set_config_internal(&set);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
out:
|
2012-12-11 08:07:12 +08:00
|
|
|
if (fb)
|
|
|
|
drm_framebuffer_unreference(fb);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
kfree(connector_set);
|
2012-03-13 18:35:43 +08:00
|
|
|
drm_mode_destroy(dev, mode);
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_cursor_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_cursor *req = data;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
int ret = 0;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-08-16 16:29:03 +08:00
|
|
|
if (!req->flags || (~DRM_MODE_CURSOR_FLAGS & req->flags))
|
2008-11-08 06:05:41 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
2008-12-19 12:50:50 +08:00
|
|
|
obj = drm_mode_object_find(dev, req->crtc_id, DRM_MODE_OBJECT_CRTC);
|
2008-11-08 06:05:41 +08:00
|
|
|
if (!obj) {
|
2009-07-20 13:48:07 +08:00
|
|
|
DRM_DEBUG_KMS("Unknown CRTC ID %d\n", req->crtc_id);
|
2012-12-02 22:24:10 +08:00
|
|
|
return -EINVAL;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
crtc = obj_to_crtc(obj);
|
|
|
|
|
2012-12-02 22:24:10 +08:00
|
|
|
mutex_lock(&crtc->mutex);
|
2008-11-08 06:05:41 +08:00
|
|
|
if (req->flags & DRM_MODE_CURSOR_BO) {
|
|
|
|
if (!crtc->funcs->cursor_set) {
|
|
|
|
ret = -ENXIO;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
/* Turns off the cursor if handle is 0 */
|
|
|
|
ret = crtc->funcs->cursor_set(crtc, file_priv, req->handle,
|
|
|
|
req->width, req->height);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (req->flags & DRM_MODE_CURSOR_MOVE) {
|
|
|
|
if (crtc->funcs->cursor_move) {
|
|
|
|
ret = crtc->funcs->cursor_move(crtc, req->x, req->y);
|
|
|
|
} else {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out:
|
2012-12-02 22:24:10 +08:00
|
|
|
mutex_unlock(&crtc->mutex);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2011-11-15 06:51:28 +08:00
|
|
|
/* Original addfb only supported RGB formats, so figure out which one */
|
|
|
|
uint32_t drm_mode_legacy_fb_format(uint32_t bpp, uint32_t depth)
|
|
|
|
{
|
|
|
|
uint32_t fmt;
|
|
|
|
|
|
|
|
switch (bpp) {
|
|
|
|
case 8:
|
2013-02-01 01:43:38 +08:00
|
|
|
fmt = DRM_FORMAT_C8;
|
2011-11-15 06:51:28 +08:00
|
|
|
break;
|
|
|
|
case 16:
|
|
|
|
if (depth == 15)
|
2011-11-18 00:05:13 +08:00
|
|
|
fmt = DRM_FORMAT_XRGB1555;
|
2011-11-15 06:51:28 +08:00
|
|
|
else
|
2011-11-18 00:05:13 +08:00
|
|
|
fmt = DRM_FORMAT_RGB565;
|
2011-11-15 06:51:28 +08:00
|
|
|
break;
|
|
|
|
case 24:
|
2011-11-18 00:05:13 +08:00
|
|
|
fmt = DRM_FORMAT_RGB888;
|
2011-11-15 06:51:28 +08:00
|
|
|
break;
|
|
|
|
case 32:
|
|
|
|
if (depth == 24)
|
2011-11-18 00:05:13 +08:00
|
|
|
fmt = DRM_FORMAT_XRGB8888;
|
2011-11-15 06:51:28 +08:00
|
|
|
else if (depth == 30)
|
2011-11-18 00:05:13 +08:00
|
|
|
fmt = DRM_FORMAT_XRGB2101010;
|
2011-11-15 06:51:28 +08:00
|
|
|
else
|
2011-11-18 00:05:13 +08:00
|
|
|
fmt = DRM_FORMAT_ARGB8888;
|
2011-11-15 06:51:28 +08:00
|
|
|
break;
|
|
|
|
default:
|
2011-11-18 00:05:13 +08:00
|
|
|
DRM_ERROR("bad bpp, assuming x8r8g8b8 pixel format\n");
|
|
|
|
fmt = DRM_FORMAT_XRGB8888;
|
2011-11-15 06:51:28 +08:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
return fmt;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_legacy_fb_format);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
/**
|
|
|
|
* drm_mode_addfb - add an FB to the graphics configuration
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Add a new FB to the specified CRTC, given a user request.
|
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_addfb(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
2011-11-15 06:51:28 +08:00
|
|
|
struct drm_mode_fb_cmd *or = data;
|
|
|
|
struct drm_mode_fb_cmd2 r = {};
|
|
|
|
struct drm_mode_config *config = &dev->mode_config;
|
|
|
|
struct drm_framebuffer *fb;
|
|
|
|
int ret = 0;
|
|
|
|
|
|
|
|
/* Use new struct with format internally */
|
|
|
|
r.fb_id = or->fb_id;
|
|
|
|
r.width = or->width;
|
|
|
|
r.height = or->height;
|
|
|
|
r.pitches[0] = or->pitch;
|
|
|
|
r.pixel_format = drm_mode_legacy_fb_format(or->bpp, or->depth);
|
|
|
|
r.handles[0] = or->handle;
|
|
|
|
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2011-11-08 04:03:23 +08:00
|
|
|
if ((config->min_width > r.width) || (r.width > config->max_width))
|
2011-11-15 06:51:28 +08:00
|
|
|
return -EINVAL;
|
2011-11-08 04:03:23 +08:00
|
|
|
|
|
|
|
if ((config->min_height > r.height) || (r.height > config->max_height))
|
2011-11-15 06:51:28 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
fb = dev->mode_config.funcs->fb_create(dev, file_priv, &r);
|
|
|
|
if (IS_ERR(fb)) {
|
2012-05-02 00:38:35 +08:00
|
|
|
DRM_DEBUG_KMS("could not create framebuffer\n");
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
|
|
|
return PTR_ERR(fb);
|
2011-11-15 06:51:28 +08:00
|
|
|
}
|
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_lock(&file_priv->fbs_lock);
|
2011-11-15 06:51:28 +08:00
|
|
|
or->fb_id = fb->base.id;
|
|
|
|
list_add(&fb->filp_head, &file_priv->fbs);
|
|
|
|
DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id);
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_unlock(&file_priv->fbs_lock);
|
|
|
|
|
2011-11-15 06:51:28 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-05-25 01:54:00 +08:00
|
|
|
static int format_check(const struct drm_mode_fb_cmd2 *r)
|
2011-12-20 06:06:48 +08:00
|
|
|
{
|
|
|
|
uint32_t format = r->pixel_format & ~DRM_FORMAT_BIG_ENDIAN;
|
|
|
|
|
|
|
|
switch (format) {
|
|
|
|
case DRM_FORMAT_C8:
|
|
|
|
case DRM_FORMAT_RGB332:
|
|
|
|
case DRM_FORMAT_BGR233:
|
|
|
|
case DRM_FORMAT_XRGB4444:
|
|
|
|
case DRM_FORMAT_XBGR4444:
|
|
|
|
case DRM_FORMAT_RGBX4444:
|
|
|
|
case DRM_FORMAT_BGRX4444:
|
|
|
|
case DRM_FORMAT_ARGB4444:
|
|
|
|
case DRM_FORMAT_ABGR4444:
|
|
|
|
case DRM_FORMAT_RGBA4444:
|
|
|
|
case DRM_FORMAT_BGRA4444:
|
|
|
|
case DRM_FORMAT_XRGB1555:
|
|
|
|
case DRM_FORMAT_XBGR1555:
|
|
|
|
case DRM_FORMAT_RGBX5551:
|
|
|
|
case DRM_FORMAT_BGRX5551:
|
|
|
|
case DRM_FORMAT_ARGB1555:
|
|
|
|
case DRM_FORMAT_ABGR1555:
|
|
|
|
case DRM_FORMAT_RGBA5551:
|
|
|
|
case DRM_FORMAT_BGRA5551:
|
|
|
|
case DRM_FORMAT_RGB565:
|
|
|
|
case DRM_FORMAT_BGR565:
|
|
|
|
case DRM_FORMAT_RGB888:
|
|
|
|
case DRM_FORMAT_BGR888:
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
|
|
|
case DRM_FORMAT_XBGR8888:
|
|
|
|
case DRM_FORMAT_RGBX8888:
|
|
|
|
case DRM_FORMAT_BGRX8888:
|
|
|
|
case DRM_FORMAT_ARGB8888:
|
|
|
|
case DRM_FORMAT_ABGR8888:
|
|
|
|
case DRM_FORMAT_RGBA8888:
|
|
|
|
case DRM_FORMAT_BGRA8888:
|
|
|
|
case DRM_FORMAT_XRGB2101010:
|
|
|
|
case DRM_FORMAT_XBGR2101010:
|
|
|
|
case DRM_FORMAT_RGBX1010102:
|
|
|
|
case DRM_FORMAT_BGRX1010102:
|
|
|
|
case DRM_FORMAT_ARGB2101010:
|
|
|
|
case DRM_FORMAT_ABGR2101010:
|
|
|
|
case DRM_FORMAT_RGBA1010102:
|
|
|
|
case DRM_FORMAT_BGRA1010102:
|
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
case DRM_FORMAT_VYUY:
|
|
|
|
case DRM_FORMAT_AYUV:
|
|
|
|
case DRM_FORMAT_NV12:
|
|
|
|
case DRM_FORMAT_NV21:
|
|
|
|
case DRM_FORMAT_NV16:
|
|
|
|
case DRM_FORMAT_NV61:
|
2012-05-19 05:47:40 +08:00
|
|
|
case DRM_FORMAT_NV24:
|
|
|
|
case DRM_FORMAT_NV42:
|
2011-12-20 06:06:48 +08:00
|
|
|
case DRM_FORMAT_YUV410:
|
|
|
|
case DRM_FORMAT_YVU410:
|
|
|
|
case DRM_FORMAT_YUV411:
|
|
|
|
case DRM_FORMAT_YVU411:
|
|
|
|
case DRM_FORMAT_YUV420:
|
|
|
|
case DRM_FORMAT_YVU420:
|
|
|
|
case DRM_FORMAT_YUV422:
|
|
|
|
case DRM_FORMAT_YVU422:
|
|
|
|
case DRM_FORMAT_YUV444:
|
|
|
|
case DRM_FORMAT_YVU444:
|
|
|
|
return 0;
|
|
|
|
default:
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-25 01:54:00 +08:00
|
|
|
static int framebuffer_check(const struct drm_mode_fb_cmd2 *r)
|
2012-04-06 02:35:18 +08:00
|
|
|
{
|
|
|
|
int ret, hsub, vsub, num_planes, i;
|
|
|
|
|
|
|
|
ret = format_check(r);
|
|
|
|
if (ret) {
|
2012-05-02 00:38:35 +08:00
|
|
|
DRM_DEBUG_KMS("bad framebuffer format 0x%08x\n", r->pixel_format);
|
2012-04-06 02:35:18 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
hsub = drm_format_horz_chroma_subsampling(r->pixel_format);
|
|
|
|
vsub = drm_format_vert_chroma_subsampling(r->pixel_format);
|
|
|
|
num_planes = drm_format_num_planes(r->pixel_format);
|
|
|
|
|
|
|
|
if (r->width == 0 || r->width % hsub) {
|
2012-05-02 00:38:35 +08:00
|
|
|
DRM_DEBUG_KMS("bad framebuffer width %u\n", r->height);
|
2012-04-06 02:35:18 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (r->height == 0 || r->height % vsub) {
|
2012-05-02 00:38:35 +08:00
|
|
|
DRM_DEBUG_KMS("bad framebuffer height %u\n", r->height);
|
2012-04-06 02:35:18 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
|
|
|
for (i = 0; i < num_planes; i++) {
|
|
|
|
unsigned int width = r->width / (i != 0 ? hsub : 1);
|
2012-10-26 02:05:04 +08:00
|
|
|
unsigned int height = r->height / (i != 0 ? vsub : 1);
|
|
|
|
unsigned int cpp = drm_format_plane_cpp(r->pixel_format, i);
|
2012-04-06 02:35:18 +08:00
|
|
|
|
|
|
|
if (!r->handles[i]) {
|
2012-05-02 00:38:35 +08:00
|
|
|
DRM_DEBUG_KMS("no buffer object handle for plane %d\n", i);
|
2012-04-06 02:35:18 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2012-10-26 02:05:04 +08:00
|
|
|
if ((uint64_t) width * cpp > UINT_MAX)
|
|
|
|
return -ERANGE;
|
|
|
|
|
|
|
|
if ((uint64_t) height * r->pitches[i] + r->offsets[i] > UINT_MAX)
|
|
|
|
return -ERANGE;
|
|
|
|
|
|
|
|
if (r->pitches[i] < width * cpp) {
|
2012-05-02 00:38:35 +08:00
|
|
|
DRM_DEBUG_KMS("bad pitch %u for plane %d\n", r->pitches[i], i);
|
2012-04-06 02:35:18 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2011-11-15 06:51:28 +08:00
|
|
|
/**
|
|
|
|
* drm_mode_addfb2 - add an FB to the graphics configuration
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2011-11-15 06:51:28 +08:00
|
|
|
*
|
|
|
|
* Add a new FB to the specified CRTC, given a user request with format.
|
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_addfb2(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_fb_cmd2 *r = data;
|
2008-11-08 06:05:41 +08:00
|
|
|
struct drm_mode_config *config = &dev->mode_config;
|
|
|
|
struct drm_framebuffer *fb;
|
2012-05-17 19:27:21 +08:00
|
|
|
int ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-11-08 17:09:42 +08:00
|
|
|
if (r->flags & ~DRM_MODE_FB_INTERLACED) {
|
|
|
|
DRM_DEBUG_KMS("bad framebuffer flags 0x%08x\n", r->flags);
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
if ((config->min_width > r->width) || (r->width > config->max_width)) {
|
2012-05-02 00:38:35 +08:00
|
|
|
DRM_DEBUG_KMS("bad framebuffer width %d, should be >= %d && <= %d\n",
|
2011-11-15 06:51:27 +08:00
|
|
|
r->width, config->min_width, config->max_width);
|
2008-11-08 06:05:41 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
if ((config->min_height > r->height) || (r->height > config->max_height)) {
|
2012-05-02 00:38:35 +08:00
|
|
|
DRM_DEBUG_KMS("bad framebuffer height %d, should be >= %d && <= %d\n",
|
2011-11-15 06:51:27 +08:00
|
|
|
r->height, config->min_height, config->max_height);
|
2008-11-08 06:05:41 +08:00
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
|
2012-04-06 02:35:18 +08:00
|
|
|
ret = framebuffer_check(r);
|
|
|
|
if (ret)
|
2011-12-20 06:06:48 +08:00
|
|
|
return ret;
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
fb = dev->mode_config.funcs->fb_create(dev, file_priv, r);
|
2010-08-08 20:36:38 +08:00
|
|
|
if (IS_ERR(fb)) {
|
2012-05-02 00:38:35 +08:00
|
|
|
DRM_DEBUG_KMS("could not create framebuffer\n");
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
|
|
|
return PTR_ERR(fb);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_lock(&file_priv->fbs_lock);
|
2008-12-19 12:50:50 +08:00
|
|
|
r->fb_id = fb->base.id;
|
2008-11-08 06:05:41 +08:00
|
|
|
list_add(&fb->filp_head, &file_priv->fbs);
|
2010-07-16 03:43:25 +08:00
|
|
|
DRM_DEBUG_KMS("[FB:%d]\n", fb->base.id);
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_unlock(&file_priv->fbs_lock);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_rmfb - remove an FB from the configuration
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Remove the FB specified by the user.
|
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_rmfb(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_framebuffer *fb = NULL;
|
|
|
|
struct drm_framebuffer *fbl = NULL;
|
|
|
|
uint32_t *id = data;
|
|
|
|
int found = 0;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_lock(&file_priv->fbs_lock);
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
mutex_lock(&dev->mode_config.fb_lock);
|
|
|
|
fb = __drm_framebuffer_lookup(dev, *id);
|
|
|
|
if (!fb)
|
|
|
|
goto fail_lookup;
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
list_for_each_entry(fbl, &file_priv->fbs, filp_head)
|
|
|
|
if (fb == fbl)
|
|
|
|
found = 1;
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
if (!found)
|
|
|
|
goto fail_lookup;
|
|
|
|
|
|
|
|
/* Mark fb as reaped, we still have a ref from fpriv->fbs. */
|
|
|
|
__drm_framebuffer_unregister(dev, fb);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
list_del_init(&fb->filp_head);
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
mutex_unlock(&dev->mode_config.fb_lock);
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_unlock(&file_priv->fbs_lock);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
drm_framebuffer_remove(fb);
|
|
|
|
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
fail_lookup:
|
|
|
|
mutex_unlock(&dev->mode_config.fb_lock);
|
|
|
|
mutex_unlock(&file_priv->fbs_lock);
|
|
|
|
|
|
|
|
return -EINVAL;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_getfb - get FB info
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Lookup the FB given its ID and return info about it.
|
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_getfb(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_fb_cmd *r = data;
|
|
|
|
struct drm_framebuffer *fb;
|
2012-12-14 06:06:08 +08:00
|
|
|
int ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-03 04:53:40 +08:00
|
|
|
fb = drm_framebuffer_lookup(dev, r->fb_id);
|
2012-12-14 06:06:08 +08:00
|
|
|
if (!fb)
|
|
|
|
return -EINVAL;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
r->height = fb->height;
|
|
|
|
r->width = fb->width;
|
|
|
|
r->depth = fb->depth;
|
|
|
|
r->bpp = fb->bits_per_pixel;
|
2011-12-20 06:06:49 +08:00
|
|
|
r->pitch = fb->pitches[0];
|
2012-12-14 06:07:50 +08:00
|
|
|
if (fb->funcs->create_handle)
|
|
|
|
ret = fb->funcs->create_handle(fb, file_priv, &r->handle);
|
|
|
|
else
|
|
|
|
ret = -ENODEV;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-12-14 06:06:08 +08:00
|
|
|
drm_framebuffer_unreference(fb);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2009-12-04 07:25:47 +08:00
|
|
|
int drm_mode_dirtyfb_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_clip_rect __user *clips_ptr;
|
|
|
|
struct drm_clip_rect *clips = NULL;
|
|
|
|
struct drm_mode_fb_dirty_cmd *r = data;
|
|
|
|
struct drm_framebuffer *fb;
|
|
|
|
unsigned flags;
|
|
|
|
int num_clips;
|
2012-05-17 19:27:21 +08:00
|
|
|
int ret;
|
2009-12-04 07:25:47 +08:00
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-03 04:53:40 +08:00
|
|
|
fb = drm_framebuffer_lookup(dev, r->fb_id);
|
2012-12-11 07:38:18 +08:00
|
|
|
if (!fb)
|
|
|
|
return -EINVAL;
|
2009-12-04 07:25:47 +08:00
|
|
|
|
|
|
|
num_clips = r->num_clips;
|
2011-12-20 06:06:42 +08:00
|
|
|
clips_ptr = (struct drm_clip_rect __user *)(unsigned long)r->clips_ptr;
|
2009-12-04 07:25:47 +08:00
|
|
|
|
|
|
|
if (!num_clips != !clips_ptr) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out_err1;
|
|
|
|
}
|
|
|
|
|
|
|
|
flags = DRM_MODE_FB_DIRTY_FLAGS & r->flags;
|
|
|
|
|
|
|
|
/* If userspace annotates copy, clips must come in pairs */
|
|
|
|
if (flags & DRM_MODE_FB_DIRTY_ANNOTATE_COPY && (num_clips % 2)) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out_err1;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (num_clips && clips_ptr) {
|
2011-11-23 14:12:01 +08:00
|
|
|
if (num_clips < 0 || num_clips > DRM_MODE_FB_DIRTY_MAX_CLIPS) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out_err1;
|
|
|
|
}
|
2009-12-04 07:25:47 +08:00
|
|
|
clips = kzalloc(num_clips * sizeof(*clips), GFP_KERNEL);
|
|
|
|
if (!clips) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out_err1;
|
|
|
|
}
|
|
|
|
|
|
|
|
ret = copy_from_user(clips, clips_ptr,
|
|
|
|
num_clips * sizeof(*clips));
|
2010-06-04 18:23:21 +08:00
|
|
|
if (ret) {
|
|
|
|
ret = -EFAULT;
|
2009-12-04 07:25:47 +08:00
|
|
|
goto out_err2;
|
2010-06-04 18:23:21 +08:00
|
|
|
}
|
2009-12-04 07:25:47 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
if (fb->funcs->dirty) {
|
2012-12-11 07:38:18 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2010-10-05 18:43:02 +08:00
|
|
|
ret = fb->funcs->dirty(fb, file_priv, flags, r->color,
|
|
|
|
clips, num_clips);
|
2012-12-11 07:38:18 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2009-12-04 07:25:47 +08:00
|
|
|
} else {
|
|
|
|
ret = -ENOSYS;
|
|
|
|
}
|
|
|
|
|
|
|
|
out_err2:
|
|
|
|
kfree(clips);
|
|
|
|
out_err1:
|
2012-12-11 07:38:18 +08:00
|
|
|
drm_framebuffer_unreference(fb);
|
|
|
|
|
2009-12-04 07:25:47 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
/**
|
|
|
|
* drm_fb_release - remove and free the FBs on this file
|
2012-12-02 07:09:18 +08:00
|
|
|
* @priv: drm file for the ioctl
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Destroy all the FBs associated with @filp.
|
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
2009-02-13 03:37:56 +08:00
|
|
|
void drm_fb_release(struct drm_file *priv)
|
2008-11-08 06:05:41 +08:00
|
|
|
{
|
|
|
|
struct drm_device *dev = priv->minor->dev;
|
|
|
|
struct drm_framebuffer *fb, *tfb;
|
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_lock(&priv->fbs_lock);
|
2008-11-08 06:05:41 +08:00
|
|
|
list_for_each_entry_safe(fb, tfb, &priv->fbs, filp_head) {
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
|
|
|
|
mutex_lock(&dev->mode_config.fb_lock);
|
|
|
|
/* Mark fb as reaped, we still have a ref from fpriv->fbs. */
|
|
|
|
__drm_framebuffer_unregister(dev, fb);
|
|
|
|
mutex_unlock(&dev->mode_config.fb_lock);
|
|
|
|
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
list_del_init(&fb->filp_head);
|
drm: reference framebuffers which are on the idr
Since otherwise looking and reference-counting around
drm_framebuffer_lookup will be an unmanageable mess. With this change,
an object can either be found in the idr and will stay around once we
incremented the reference counter. Or it will be gone for good and
can't be looked up using its id any more.
Atomicity is guaranteed by the dev->mode_config.fb_lock. The
newly-introduce fpriv->fbs_lock looks a bit redundant, but the next
patch will shuffle the locking order between these two locks and all
the modeset locks taken in modeset_lock_all, so we'll need it.
Also, since userspace could do really funky stuff and race e.g. a
getresources with an rmfb, we need to make sure that the kernel
doesn't fall over trying to look-up an inexistent fb, or causing
confusion by having two fbs around with the same id. Simply reset the
framebuffer id to 0, which marks it as reaped. Any lookups of that id
will fail, so the object is really gone for good from userspace's pov.
Note that we still need to protect the "remove framebuffer from all
use-cases" and the final unreference with the modeset-lock, since most
framebuffer use-sites don't implement proper reference counting yet.
We can only lift this once _all_ users are converted.
With this change, two references are held on alife, but unused
framebuffers:
- The reference for the idr lookup, created in this patch.
- For user-created framebuffers the fpriv->fbs reference, for
driver-private fbs the driver is supposed to hold it's own last
reference.
Note that the dev->mode_config.fb_list itself does _not_ hold a
reference onto the framebuffers (this list is essentially only used
for debugfs files). Hence if there's anything left there when the
driver has cleaned up all it's modeset resources, this is a ref-leak.
WARN about it.
Now we only need to fix up all other places to properly reference
count framebuffers.
v2: Fix spelling fail in a comment spotted by Rob Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:16:05 +08:00
|
|
|
|
|
|
|
/* This will also drop the fpriv->fbs reference. */
|
2012-09-06 05:48:38 +08:00
|
|
|
drm_framebuffer_remove(fb);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
drm: revamp locking around fb creation/destruction
Well, at least step 1. The goal here is that framebuffer objects can
survive outside of the mode_config lock, with just a reference held
as protection. The first step to get there is to introduce a special
fb_lock which protects fb lookup, creation and destruction, to make
them appear atomic.
This new fb_lock can nest within the mode_config lock. But the idea is
(once the reference counting part is completed) that we only quickly
take that fb_lock to lookup a framebuffer and grab a reference,
without any other locks involved.
vmwgfx is the only driver which does framebuffer lookups itself, also
wrap those calls to drm_mode_object_find with the new lock.
Also protect the fb_list walking in i915 and omapdrm with the new lock.
As a slight complication there's also the list of user-created fbs
attached to the file private. The problem now is that at fclose() time
we need to walk that list, eventually do a modeset call to remove the
fb from active usage (and are required to be able to take the
mode_config lock), but in the end we need to grab the new fb_lock to
remove the fb from the list. The easiest solution is to add another
mutex to protect this per-file list.
Currently that new fbs_lock nests within the modeset locks and so
appears redudant. But later patches will switch around this sequence
so that taking the modeset locks in the fb destruction path is
optional in the fastpath. Ultimately the goal is that addfb and rmfb
do not require the mode_config lock, since otherwise they have the
potential to introduce stalls in the pageflip sequence of a compositor
(if the compositor e.g. switches to a fullscreen client or if it
enables a plane). But that requires a few more steps and hoops to jump
through.
Note that framebuffer creation/destruction is now double-protected -
once by the fb_lock and in parts by the idr_lock. The later would be
unnecessariy if framebuffers would have their own idr allocator. But
that's material for another patch (series).
v2: Properly initialize the fb->filp_head list in _init, otherwise the
newly added WARN to check whether the fb isn't on a fpriv list any
more will fail for driver-private objects.
v3: Fixup two error-case unlock bugs spotted by Richard Wilbur.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 04:19:18 +08:00
|
|
|
mutex_unlock(&priv->fbs_lock);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_mode_attachmode - add a mode to the user mode list
|
|
|
|
* @dev: DRM device
|
|
|
|
* @connector: connector to add the mode to
|
|
|
|
* @mode: mode to add
|
|
|
|
*
|
|
|
|
* Add @mode to @connector's user mode list.
|
|
|
|
*/
|
2012-03-13 18:35:42 +08:00
|
|
|
static void drm_mode_attachmode(struct drm_device *dev,
|
|
|
|
struct drm_connector *connector,
|
|
|
|
struct drm_display_mode *mode)
|
2008-11-08 06:05:41 +08:00
|
|
|
{
|
|
|
|
list_add_tail(&mode->head, &connector->user_modes);
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_attachmode_crtc(struct drm_device *dev, struct drm_crtc *crtc,
|
2012-03-13 18:35:46 +08:00
|
|
|
const struct drm_display_mode *mode)
|
2008-11-08 06:05:41 +08:00
|
|
|
{
|
|
|
|
struct drm_connector *connector;
|
2012-03-13 18:35:46 +08:00
|
|
|
int ret = 0;
|
|
|
|
struct drm_display_mode *dup_mode, *next;
|
|
|
|
LIST_HEAD(list);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
|
|
|
if (!connector->encoder)
|
2012-03-13 18:35:46 +08:00
|
|
|
continue;
|
2008-11-08 06:05:41 +08:00
|
|
|
if (connector->encoder->crtc == crtc) {
|
2012-03-13 18:35:46 +08:00
|
|
|
dup_mode = drm_mode_duplicate(dev, mode);
|
|
|
|
if (!dup_mode) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
list_add_tail(&dup_mode->head, &list);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
}
|
2012-03-13 18:35:46 +08:00
|
|
|
|
|
|
|
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
|
|
|
if (!connector->encoder)
|
|
|
|
continue;
|
|
|
|
if (connector->encoder->crtc == crtc)
|
|
|
|
list_move_tail(list.next, &connector->user_modes);
|
|
|
|
}
|
|
|
|
|
|
|
|
WARN_ON(!list_empty(&list));
|
|
|
|
|
|
|
|
out:
|
|
|
|
list_for_each_entry_safe(dup_mode, next, &list, head)
|
|
|
|
drm_mode_destroy(dev, dup_mode);
|
|
|
|
|
|
|
|
return ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_attachmode_crtc);
|
|
|
|
|
|
|
|
static int drm_mode_detachmode(struct drm_device *dev,
|
|
|
|
struct drm_connector *connector,
|
|
|
|
struct drm_display_mode *mode)
|
|
|
|
{
|
|
|
|
int found = 0;
|
|
|
|
int ret = 0;
|
|
|
|
struct drm_display_mode *match_mode, *t;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(match_mode, t, &connector->user_modes, head) {
|
|
|
|
if (drm_mode_equal(match_mode, mode)) {
|
|
|
|
list_del(&match_mode->head);
|
|
|
|
drm_mode_destroy(dev, match_mode);
|
|
|
|
found = 1;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!found)
|
|
|
|
ret = -EINVAL;
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_detachmode_crtc(struct drm_device *dev, struct drm_display_mode *mode)
|
|
|
|
{
|
|
|
|
struct drm_connector *connector;
|
|
|
|
|
|
|
|
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
|
|
|
drm_mode_detachmode(dev, connector, mode);
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_detachmode_crtc);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_fb_attachmode - Attach a user mode to an connector
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* This attaches a user specified mode to an connector.
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_attachmode_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_mode_cmd *mode_cmd = data;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
struct drm_display_mode *mode;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_mode_modeinfo *umode = &mode_cmd->mode;
|
2012-05-17 19:27:21 +08:00
|
|
|
int ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
connector = obj_to_connector(obj);
|
|
|
|
|
|
|
|
mode = drm_mode_create(dev);
|
|
|
|
if (!mode) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-03-13 18:35:44 +08:00
|
|
|
ret = drm_crtc_convert_umode(mode, umode);
|
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG_KMS("Invalid mode\n");
|
|
|
|
drm_mode_destroy(dev, mode);
|
|
|
|
goto out;
|
|
|
|
}
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-03-13 18:35:42 +08:00
|
|
|
drm_mode_attachmode(dev, connector, mode);
|
2008-11-08 06:05:41 +08:00
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_fb_detachmode - Detach a user specified mode from an connector
|
2012-12-02 07:09:18 +08:00
|
|
|
* @dev: drm device for the ioctl
|
|
|
|
* @data: data pointer for the ioctl
|
|
|
|
* @file_priv: drm file for the ioctl call
|
2008-11-08 06:05:41 +08:00
|
|
|
*
|
|
|
|
* Called by the user via ioctl.
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* Zero on success, errno on failure.
|
|
|
|
*/
|
|
|
|
int drm_mode_detachmode_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_mode_mode_cmd *mode_cmd = data;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
struct drm_display_mode mode;
|
|
|
|
struct drm_mode_modeinfo *umode = &mode_cmd->mode;
|
2012-05-17 19:27:21 +08:00
|
|
|
int ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
obj = drm_mode_object_find(dev, mode_cmd->connector_id, DRM_MODE_OBJECT_CONNECTOR);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
connector = obj_to_connector(obj);
|
|
|
|
|
2012-03-13 18:35:44 +08:00
|
|
|
ret = drm_crtc_convert_umode(&mode, umode);
|
|
|
|
if (ret) {
|
|
|
|
DRM_DEBUG_KMS("Invalid mode\n");
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
ret = drm_mode_detachmode(dev, connector, &mode);
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
struct drm_property *drm_property_create(struct drm_device *dev, int flags,
|
|
|
|
const char *name, int num_values)
|
|
|
|
{
|
|
|
|
struct drm_property *property = NULL;
|
2012-03-13 18:35:48 +08:00
|
|
|
int ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
property = kzalloc(sizeof(struct drm_property), GFP_KERNEL);
|
|
|
|
if (!property)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
if (num_values) {
|
|
|
|
property->values = kzalloc(sizeof(uint64_t)*num_values, GFP_KERNEL);
|
|
|
|
if (!property->values)
|
|
|
|
goto fail;
|
|
|
|
}
|
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
ret = drm_mode_object_get(dev, &property->base, DRM_MODE_OBJECT_PROPERTY);
|
|
|
|
if (ret)
|
|
|
|
goto fail;
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
property->flags = flags;
|
|
|
|
property->num_values = num_values;
|
|
|
|
INIT_LIST_HEAD(&property->enum_blob_list);
|
|
|
|
|
2011-11-11 03:55:40 +08:00
|
|
|
if (name) {
|
2008-11-08 06:05:41 +08:00
|
|
|
strncpy(property->name, name, DRM_PROP_NAME_LEN);
|
2011-11-11 03:55:40 +08:00
|
|
|
property->name[DRM_PROP_NAME_LEN-1] = '\0';
|
|
|
|
}
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
list_add_tail(&property->head, &dev->mode_config.property_list);
|
|
|
|
return property;
|
|
|
|
fail:
|
2012-03-13 18:35:48 +08:00
|
|
|
kfree(property->values);
|
2008-11-08 06:05:41 +08:00
|
|
|
kfree(property);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_property_create);
|
|
|
|
|
2012-02-06 17:58:17 +08:00
|
|
|
struct drm_property *drm_property_create_enum(struct drm_device *dev, int flags,
|
|
|
|
const char *name,
|
|
|
|
const struct drm_prop_enum_list *props,
|
|
|
|
int num_values)
|
|
|
|
{
|
|
|
|
struct drm_property *property;
|
|
|
|
int i, ret;
|
|
|
|
|
|
|
|
flags |= DRM_MODE_PROP_ENUM;
|
|
|
|
|
|
|
|
property = drm_property_create(dev, flags, name, num_values);
|
|
|
|
if (!property)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < num_values; i++) {
|
|
|
|
ret = drm_property_add_enum(property, i,
|
|
|
|
props[i].type,
|
|
|
|
props[i].name);
|
|
|
|
if (ret) {
|
|
|
|
drm_property_destroy(dev, property);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return property;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_property_create_enum);
|
|
|
|
|
2012-05-17 16:23:26 +08:00
|
|
|
struct drm_property *drm_property_create_bitmask(struct drm_device *dev,
|
|
|
|
int flags, const char *name,
|
|
|
|
const struct drm_prop_enum_list *props,
|
|
|
|
int num_values)
|
|
|
|
{
|
|
|
|
struct drm_property *property;
|
|
|
|
int i, ret;
|
|
|
|
|
|
|
|
flags |= DRM_MODE_PROP_BITMASK;
|
|
|
|
|
|
|
|
property = drm_property_create(dev, flags, name, num_values);
|
|
|
|
if (!property)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
for (i = 0; i < num_values; i++) {
|
|
|
|
ret = drm_property_add_enum(property, i,
|
|
|
|
props[i].type,
|
|
|
|
props[i].name);
|
|
|
|
if (ret) {
|
|
|
|
drm_property_destroy(dev, property);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return property;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_property_create_bitmask);
|
|
|
|
|
2012-02-06 17:58:18 +08:00
|
|
|
struct drm_property *drm_property_create_range(struct drm_device *dev, int flags,
|
|
|
|
const char *name,
|
|
|
|
uint64_t min, uint64_t max)
|
|
|
|
{
|
|
|
|
struct drm_property *property;
|
|
|
|
|
|
|
|
flags |= DRM_MODE_PROP_RANGE;
|
|
|
|
|
|
|
|
property = drm_property_create(dev, flags, name, 2);
|
|
|
|
if (!property)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
property->values[0] = min;
|
|
|
|
property->values[1] = max;
|
|
|
|
|
|
|
|
return property;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_property_create_range);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
int drm_property_add_enum(struct drm_property *property, int index,
|
|
|
|
uint64_t value, const char *name)
|
|
|
|
{
|
|
|
|
struct drm_property_enum *prop_enum;
|
|
|
|
|
2012-05-17 16:23:26 +08:00
|
|
|
if (!(property->flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK)))
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Bitmask enum properties have the additional constraint of values
|
|
|
|
* from 0 to 63
|
|
|
|
*/
|
|
|
|
if ((property->flags & DRM_MODE_PROP_BITMASK) && (value > 63))
|
2008-11-08 06:05:41 +08:00
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
if (!list_empty(&property->enum_blob_list)) {
|
|
|
|
list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
|
|
|
|
if (prop_enum->value == value) {
|
|
|
|
strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN);
|
|
|
|
prop_enum->name[DRM_PROP_NAME_LEN-1] = '\0';
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
prop_enum = kzalloc(sizeof(struct drm_property_enum), GFP_KERNEL);
|
|
|
|
if (!prop_enum)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
strncpy(prop_enum->name, name, DRM_PROP_NAME_LEN);
|
|
|
|
prop_enum->name[DRM_PROP_NAME_LEN-1] = '\0';
|
|
|
|
prop_enum->value = value;
|
|
|
|
|
|
|
|
property->values[index] = value;
|
|
|
|
list_add_tail(&prop_enum->head, &property->enum_blob_list);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_property_add_enum);
|
|
|
|
|
|
|
|
void drm_property_destroy(struct drm_device *dev, struct drm_property *property)
|
|
|
|
{
|
|
|
|
struct drm_property_enum *prop_enum, *pt;
|
|
|
|
|
|
|
|
list_for_each_entry_safe(prop_enum, pt, &property->enum_blob_list, head) {
|
|
|
|
list_del(&prop_enum->head);
|
|
|
|
kfree(prop_enum);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (property->num_values)
|
|
|
|
kfree(property->values);
|
|
|
|
drm_mode_object_put(dev, &property->base);
|
|
|
|
list_del(&property->head);
|
|
|
|
kfree(property);
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_property_destroy);
|
|
|
|
|
2012-05-16 05:09:02 +08:00
|
|
|
void drm_object_attach_property(struct drm_mode_object *obj,
|
|
|
|
struct drm_property *property,
|
|
|
|
uint64_t init_val)
|
|
|
|
{
|
2012-05-16 05:09:04 +08:00
|
|
|
int count = obj->properties->count;
|
2012-05-16 05:09:02 +08:00
|
|
|
|
2012-05-16 05:09:04 +08:00
|
|
|
if (count == DRM_OBJECT_MAX_PROPERTY) {
|
|
|
|
WARN(1, "Failed to attach object property (type: 0x%x). Please "
|
|
|
|
"increase DRM_OBJECT_MAX_PROPERTY by 1 for each time "
|
|
|
|
"you see this message on the same object type.\n",
|
|
|
|
obj->type);
|
|
|
|
return;
|
2012-05-16 05:09:02 +08:00
|
|
|
}
|
|
|
|
|
2012-05-16 05:09:04 +08:00
|
|
|
obj->properties->ids[count] = property->base.id;
|
|
|
|
obj->properties->values[count] = init_val;
|
|
|
|
obj->properties->count++;
|
2012-05-16 05:09:02 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_object_attach_property);
|
|
|
|
|
|
|
|
int drm_object_property_set_value(struct drm_mode_object *obj,
|
|
|
|
struct drm_property *property, uint64_t val)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2012-05-16 05:09:04 +08:00
|
|
|
for (i = 0; i < obj->properties->count; i++) {
|
2012-05-16 05:09:02 +08:00
|
|
|
if (obj->properties->ids[i] == property->base.id) {
|
|
|
|
obj->properties->values[i] = val;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_object_property_set_value);
|
|
|
|
|
|
|
|
int drm_object_property_get_value(struct drm_mode_object *obj,
|
|
|
|
struct drm_property *property, uint64_t *val)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
2012-05-16 05:09:04 +08:00
|
|
|
for (i = 0; i < obj->properties->count; i++) {
|
2012-05-16 05:09:02 +08:00
|
|
|
if (obj->properties->ids[i] == property->base.id) {
|
|
|
|
*val = obj->properties->values[i];
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
return -EINVAL;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_object_property_get_value);
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
int drm_mode_getproperty_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_mode_get_property *out_resp = data;
|
|
|
|
struct drm_property *property;
|
|
|
|
int enum_count = 0;
|
|
|
|
int blob_count = 0;
|
|
|
|
int value_count = 0;
|
|
|
|
int ret = 0, i;
|
|
|
|
int copied;
|
|
|
|
struct drm_property_enum *prop_enum;
|
|
|
|
struct drm_mode_property_enum __user *enum_ptr;
|
|
|
|
struct drm_property_blob *prop_blob;
|
2011-12-20 06:06:42 +08:00
|
|
|
uint32_t __user *blob_id_ptr;
|
2008-11-08 06:05:41 +08:00
|
|
|
uint64_t __user *values_ptr;
|
|
|
|
uint32_t __user *blob_length_ptr;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
obj = drm_mode_object_find(dev, out_resp->prop_id, DRM_MODE_OBJECT_PROPERTY);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
property = obj_to_property(obj);
|
|
|
|
|
2012-05-17 16:23:26 +08:00
|
|
|
if (property->flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK)) {
|
2008-11-08 06:05:41 +08:00
|
|
|
list_for_each_entry(prop_enum, &property->enum_blob_list, head)
|
|
|
|
enum_count++;
|
|
|
|
} else if (property->flags & DRM_MODE_PROP_BLOB) {
|
|
|
|
list_for_each_entry(prop_blob, &property->enum_blob_list, head)
|
|
|
|
blob_count++;
|
|
|
|
}
|
|
|
|
|
|
|
|
value_count = property->num_values;
|
|
|
|
|
|
|
|
strncpy(out_resp->name, property->name, DRM_PROP_NAME_LEN);
|
|
|
|
out_resp->name[DRM_PROP_NAME_LEN-1] = 0;
|
|
|
|
out_resp->flags = property->flags;
|
|
|
|
|
|
|
|
if ((out_resp->count_values >= value_count) && value_count) {
|
2011-12-20 06:06:42 +08:00
|
|
|
values_ptr = (uint64_t __user *)(unsigned long)out_resp->values_ptr;
|
2008-11-08 06:05:41 +08:00
|
|
|
for (i = 0; i < value_count; i++) {
|
|
|
|
if (copy_to_user(values_ptr + i, &property->values[i], sizeof(uint64_t))) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out_resp->count_values = value_count;
|
|
|
|
|
2012-05-17 16:23:26 +08:00
|
|
|
if (property->flags & (DRM_MODE_PROP_ENUM | DRM_MODE_PROP_BITMASK)) {
|
2008-11-08 06:05:41 +08:00
|
|
|
if ((out_resp->count_enum_blobs >= enum_count) && enum_count) {
|
|
|
|
copied = 0;
|
2011-12-20 06:06:42 +08:00
|
|
|
enum_ptr = (struct drm_mode_property_enum __user *)(unsigned long)out_resp->enum_blob_ptr;
|
2008-11-08 06:05:41 +08:00
|
|
|
list_for_each_entry(prop_enum, &property->enum_blob_list, head) {
|
|
|
|
|
|
|
|
if (copy_to_user(&enum_ptr[copied].value, &prop_enum->value, sizeof(uint64_t))) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (copy_to_user(&enum_ptr[copied].name,
|
|
|
|
&prop_enum->name, DRM_PROP_NAME_LEN)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out_resp->count_enum_blobs = enum_count;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (property->flags & DRM_MODE_PROP_BLOB) {
|
|
|
|
if ((out_resp->count_enum_blobs >= blob_count) && blob_count) {
|
|
|
|
copied = 0;
|
2011-12-20 06:06:42 +08:00
|
|
|
blob_id_ptr = (uint32_t __user *)(unsigned long)out_resp->enum_blob_ptr;
|
|
|
|
blob_length_ptr = (uint32_t __user *)(unsigned long)out_resp->values_ptr;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
list_for_each_entry(prop_blob, &property->enum_blob_list, head) {
|
|
|
|
if (put_user(prop_blob->base.id, blob_id_ptr + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (put_user(prop_blob->length, blob_length_ptr + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out_resp->count_enum_blobs = blob_count;
|
|
|
|
}
|
|
|
|
done:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static struct drm_property_blob *drm_property_create_blob(struct drm_device *dev, int length,
|
|
|
|
void *data)
|
|
|
|
{
|
|
|
|
struct drm_property_blob *blob;
|
2012-03-13 18:35:48 +08:00
|
|
|
int ret;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
if (!length || !data)
|
|
|
|
return NULL;
|
|
|
|
|
|
|
|
blob = kzalloc(sizeof(struct drm_property_blob)+length, GFP_KERNEL);
|
|
|
|
if (!blob)
|
|
|
|
return NULL;
|
|
|
|
|
2012-03-13 18:35:48 +08:00
|
|
|
ret = drm_mode_object_get(dev, &blob->base, DRM_MODE_OBJECT_BLOB);
|
|
|
|
if (ret) {
|
|
|
|
kfree(blob);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
blob->length = length;
|
|
|
|
|
|
|
|
memcpy(blob->data, data, length);
|
|
|
|
|
|
|
|
list_add_tail(&blob->head, &dev->mode_config.property_blob_list);
|
|
|
|
return blob;
|
|
|
|
}
|
|
|
|
|
|
|
|
static void drm_property_destroy_blob(struct drm_device *dev,
|
|
|
|
struct drm_property_blob *blob)
|
|
|
|
{
|
|
|
|
drm_mode_object_put(dev, &blob->base);
|
|
|
|
list_del(&blob->head);
|
|
|
|
kfree(blob);
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_getblob_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_mode_get_blob *out_resp = data;
|
|
|
|
struct drm_property_blob *blob;
|
|
|
|
int ret = 0;
|
2011-12-20 06:06:42 +08:00
|
|
|
void __user *blob_ptr;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
obj = drm_mode_object_find(dev, out_resp->blob_id, DRM_MODE_OBJECT_BLOB);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
blob = obj_to_blob(obj);
|
|
|
|
|
|
|
|
if (out_resp->length == blob->length) {
|
2011-12-20 06:06:42 +08:00
|
|
|
blob_ptr = (void __user *)(unsigned long)out_resp->data;
|
2008-11-08 06:05:41 +08:00
|
|
|
if (copy_to_user(blob_ptr, blob->data, blob->length)){
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto done;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
out_resp->length = blob->length;
|
|
|
|
|
|
|
|
done:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_connector_update_edid_property(struct drm_connector *connector,
|
|
|
|
struct edid *edid)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = connector->dev;
|
2012-05-17 19:27:21 +08:00
|
|
|
int ret, size;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
if (connector->edid_blob_ptr)
|
|
|
|
drm_property_destroy_blob(dev, connector->edid_blob_ptr);
|
|
|
|
|
|
|
|
/* Delete edid, when there is none. */
|
|
|
|
if (!edid) {
|
|
|
|
connector->edid_blob_ptr = NULL;
|
2012-10-12 09:50:56 +08:00
|
|
|
ret = drm_object_property_set_value(&connector->base, dev->mode_config.edid_property, 0);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2010-03-30 05:43:23 +08:00
|
|
|
size = EDID_LENGTH * (1 + edid->extensions);
|
|
|
|
connector->edid_blob_ptr = drm_property_create_blob(connector->dev,
|
|
|
|
size, edid);
|
2012-11-19 17:44:57 +08:00
|
|
|
if (!connector->edid_blob_ptr)
|
|
|
|
return -EINVAL;
|
2008-11-08 06:05:41 +08:00
|
|
|
|
2012-10-12 09:50:56 +08:00
|
|
|
ret = drm_object_property_set_value(&connector->base,
|
2008-11-08 06:05:41 +08:00
|
|
|
dev->mode_config.edid_property,
|
|
|
|
connector->edid_blob_ptr->base.id);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_connector_update_edid_property);
|
|
|
|
|
2012-05-16 05:08:59 +08:00
|
|
|
static bool drm_property_change_is_valid(struct drm_property *property,
|
2012-05-25 01:53:58 +08:00
|
|
|
uint64_t value)
|
2012-05-16 05:08:59 +08:00
|
|
|
{
|
|
|
|
if (property->flags & DRM_MODE_PROP_IMMUTABLE)
|
|
|
|
return false;
|
|
|
|
if (property->flags & DRM_MODE_PROP_RANGE) {
|
|
|
|
if (value < property->values[0] || value > property->values[1])
|
|
|
|
return false;
|
|
|
|
return true;
|
2012-05-17 16:23:26 +08:00
|
|
|
} else if (property->flags & DRM_MODE_PROP_BITMASK) {
|
|
|
|
int i;
|
2012-05-25 01:53:58 +08:00
|
|
|
uint64_t valid_mask = 0;
|
2012-05-17 16:23:26 +08:00
|
|
|
for (i = 0; i < property->num_values; i++)
|
|
|
|
valid_mask |= (1ULL << property->values[i]);
|
|
|
|
return !(value & ~valid_mask);
|
2012-10-26 02:05:06 +08:00
|
|
|
} else if (property->flags & DRM_MODE_PROP_BLOB) {
|
|
|
|
/* Only the driver knows */
|
|
|
|
return true;
|
2012-05-16 05:08:59 +08:00
|
|
|
} else {
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < property->num_values; i++)
|
|
|
|
if (property->values[i] == value)
|
|
|
|
return true;
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
int drm_mode_connector_property_set_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
2012-05-16 05:09:03 +08:00
|
|
|
struct drm_mode_connector_set_property *conn_set_prop = data;
|
|
|
|
struct drm_mode_obj_set_property obj_set_prop = {
|
|
|
|
.value = conn_set_prop->value,
|
|
|
|
.prop_id = conn_set_prop->prop_id,
|
|
|
|
.obj_id = conn_set_prop->connector_id,
|
|
|
|
.obj_type = DRM_MODE_OBJECT_CONNECTOR
|
|
|
|
};
|
2011-02-08 11:55:21 +08:00
|
|
|
|
2012-05-16 05:09:03 +08:00
|
|
|
/* It does all the locking and checking we need */
|
|
|
|
return drm_mode_obj_set_property_ioctl(dev, &obj_set_prop, file_priv);
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
2012-05-16 05:09:02 +08:00
|
|
|
static int drm_mode_connector_set_obj_prop(struct drm_mode_object *obj,
|
|
|
|
struct drm_property *property,
|
|
|
|
uint64_t value)
|
|
|
|
{
|
|
|
|
int ret = -EINVAL;
|
|
|
|
struct drm_connector *connector = obj_to_connector(obj);
|
|
|
|
|
|
|
|
/* Do DPMS ourselves */
|
|
|
|
if (property == connector->dev->mode_config.dpms_property) {
|
|
|
|
if (connector->funcs->dpms)
|
|
|
|
(*connector->funcs->dpms)(connector, (int)value);
|
|
|
|
ret = 0;
|
|
|
|
} else if (connector->funcs->set_property)
|
|
|
|
ret = connector->funcs->set_property(connector, property, value);
|
|
|
|
|
|
|
|
/* store the property value if successful */
|
|
|
|
if (!ret)
|
2012-10-12 09:50:56 +08:00
|
|
|
drm_object_property_set_value(&connector->base, property, value);
|
2012-05-16 05:09:02 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-05-16 05:09:05 +08:00
|
|
|
static int drm_mode_crtc_set_obj_prop(struct drm_mode_object *obj,
|
|
|
|
struct drm_property *property,
|
|
|
|
uint64_t value)
|
|
|
|
{
|
|
|
|
int ret = -EINVAL;
|
|
|
|
struct drm_crtc *crtc = obj_to_crtc(obj);
|
|
|
|
|
|
|
|
if (crtc->funcs->set_property)
|
|
|
|
ret = crtc->funcs->set_property(crtc, property, value);
|
|
|
|
if (!ret)
|
|
|
|
drm_object_property_set_value(obj, property, value);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-05-17 16:23:27 +08:00
|
|
|
static int drm_mode_plane_set_obj_prop(struct drm_mode_object *obj,
|
|
|
|
struct drm_property *property,
|
|
|
|
uint64_t value)
|
|
|
|
{
|
|
|
|
int ret = -EINVAL;
|
|
|
|
struct drm_plane *plane = obj_to_plane(obj);
|
|
|
|
|
|
|
|
if (plane->funcs->set_property)
|
|
|
|
ret = plane->funcs->set_property(plane, property, value);
|
|
|
|
if (!ret)
|
|
|
|
drm_object_property_set_value(obj, property, value);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-05-16 05:09:02 +08:00
|
|
|
int drm_mode_obj_get_properties_ioctl(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_obj_get_properties *arg = data;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
int ret = 0;
|
|
|
|
int i;
|
|
|
|
int copied = 0;
|
|
|
|
int props_count = 0;
|
|
|
|
uint32_t __user *props_ptr;
|
|
|
|
uint64_t __user *prop_values_ptr;
|
|
|
|
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2012-05-16 05:09:02 +08:00
|
|
|
|
|
|
|
obj = drm_mode_object_find(dev, arg->obj_id, arg->obj_type);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (!obj->properties) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2012-05-16 05:09:04 +08:00
|
|
|
props_count = obj->properties->count;
|
2012-05-16 05:09:02 +08:00
|
|
|
|
|
|
|
/* This ioctl is called twice, once to determine how much space is
|
|
|
|
* needed, and the 2nd time to fill it. */
|
|
|
|
if ((arg->count_props >= props_count) && props_count) {
|
|
|
|
copied = 0;
|
|
|
|
props_ptr = (uint32_t __user *)(unsigned long)(arg->props_ptr);
|
|
|
|
prop_values_ptr = (uint64_t __user *)(unsigned long)
|
|
|
|
(arg->prop_values_ptr);
|
|
|
|
for (i = 0; i < props_count; i++) {
|
|
|
|
if (put_user(obj->properties->ids[i],
|
|
|
|
props_ptr + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
if (put_user(obj->properties->values[i],
|
|
|
|
prop_values_ptr + copied)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
copied++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
arg->count_props = props_count;
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2012-05-16 05:09:02 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_obj_set_property_ioctl(struct drm_device *dev, void *data,
|
|
|
|
struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_obj_set_property *arg = data;
|
|
|
|
struct drm_mode_object *arg_obj;
|
|
|
|
struct drm_mode_object *prop_obj;
|
|
|
|
struct drm_property *property;
|
|
|
|
int ret = -EINVAL;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2012-05-16 05:09:02 +08:00
|
|
|
|
|
|
|
arg_obj = drm_mode_object_find(dev, arg->obj_id, arg->obj_type);
|
|
|
|
if (!arg_obj)
|
|
|
|
goto out;
|
|
|
|
if (!arg_obj->properties)
|
|
|
|
goto out;
|
|
|
|
|
2012-05-16 05:09:04 +08:00
|
|
|
for (i = 0; i < arg_obj->properties->count; i++)
|
2012-05-16 05:09:02 +08:00
|
|
|
if (arg_obj->properties->ids[i] == arg->prop_id)
|
|
|
|
break;
|
|
|
|
|
2012-05-16 05:09:04 +08:00
|
|
|
if (i == arg_obj->properties->count)
|
2012-05-16 05:09:02 +08:00
|
|
|
goto out;
|
|
|
|
|
|
|
|
prop_obj = drm_mode_object_find(dev, arg->prop_id,
|
|
|
|
DRM_MODE_OBJECT_PROPERTY);
|
|
|
|
if (!prop_obj)
|
|
|
|
goto out;
|
|
|
|
property = obj_to_property(prop_obj);
|
|
|
|
|
|
|
|
if (!drm_property_change_is_valid(property, arg->value))
|
|
|
|
goto out;
|
|
|
|
|
|
|
|
switch (arg_obj->type) {
|
|
|
|
case DRM_MODE_OBJECT_CONNECTOR:
|
|
|
|
ret = drm_mode_connector_set_obj_prop(arg_obj, property,
|
|
|
|
arg->value);
|
|
|
|
break;
|
2012-05-16 05:09:05 +08:00
|
|
|
case DRM_MODE_OBJECT_CRTC:
|
|
|
|
ret = drm_mode_crtc_set_obj_prop(arg_obj, property, arg->value);
|
|
|
|
break;
|
2012-05-17 16:23:27 +08:00
|
|
|
case DRM_MODE_OBJECT_PLANE:
|
|
|
|
ret = drm_mode_plane_set_obj_prop(arg_obj, property, arg->value);
|
|
|
|
break;
|
2012-05-16 05:09:02 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2012-05-16 05:09:02 +08:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
int drm_mode_connector_attach_encoder(struct drm_connector *connector,
|
|
|
|
struct drm_encoder *encoder)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
|
|
|
|
for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
|
|
|
|
if (connector->encoder_ids[i] == 0) {
|
|
|
|
connector->encoder_ids[i] = encoder->base.id;
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return -ENOMEM;
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_connector_attach_encoder);
|
|
|
|
|
|
|
|
void drm_mode_connector_detach_encoder(struct drm_connector *connector,
|
|
|
|
struct drm_encoder *encoder)
|
|
|
|
{
|
|
|
|
int i;
|
|
|
|
for (i = 0; i < DRM_CONNECTOR_MAX_ENCODER; i++) {
|
|
|
|
if (connector->encoder_ids[i] == encoder->base.id) {
|
|
|
|
connector->encoder_ids[i] = 0;
|
|
|
|
if (connector->encoder == encoder)
|
|
|
|
connector->encoder = NULL;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_connector_detach_encoder);
|
|
|
|
|
2012-02-01 18:38:23 +08:00
|
|
|
int drm_mode_crtc_set_gamma_size(struct drm_crtc *crtc,
|
2008-11-08 06:05:41 +08:00
|
|
|
int gamma_size)
|
|
|
|
{
|
|
|
|
crtc->gamma_size = gamma_size;
|
|
|
|
|
|
|
|
crtc->gamma_store = kzalloc(gamma_size * sizeof(uint16_t) * 3, GFP_KERNEL);
|
|
|
|
if (!crtc->gamma_store) {
|
|
|
|
crtc->gamma_size = 0;
|
2012-02-01 18:38:23 +08:00
|
|
|
return -ENOMEM;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
|
2012-02-01 18:38:23 +08:00
|
|
|
return 0;
|
2008-11-08 06:05:41 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_crtc_set_gamma_size);
|
|
|
|
|
|
|
|
int drm_mode_gamma_set_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_crtc_lut *crtc_lut = data;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
void *r_base, *g_base, *b_base;
|
|
|
|
int size;
|
|
|
|
int ret = 0;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
obj = drm_mode_object_find(dev, crtc_lut->crtc_id, DRM_MODE_OBJECT_CRTC);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
crtc = obj_to_crtc(obj);
|
|
|
|
|
2012-05-17 19:27:24 +08:00
|
|
|
if (crtc->funcs->gamma_set == NULL) {
|
|
|
|
ret = -ENOSYS;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2008-11-08 06:05:41 +08:00
|
|
|
/* memcpy into gamma store */
|
|
|
|
if (crtc_lut->gamma_size != crtc->gamma_size) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
size = crtc_lut->gamma_size * (sizeof(uint16_t));
|
|
|
|
r_base = crtc->gamma_store;
|
|
|
|
if (copy_from_user(r_base, (void __user *)(unsigned long)crtc_lut->red, size)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_base = r_base + size;
|
|
|
|
if (copy_from_user(g_base, (void __user *)(unsigned long)crtc_lut->green, size)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
b_base = g_base + size;
|
|
|
|
if (copy_from_user(b_base, (void __user *)(unsigned long)crtc_lut->blue, size)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2010-08-03 08:33:19 +08:00
|
|
|
crtc->funcs->gamma_set(crtc, r_base, g_base, b_base, 0, crtc->gamma_size);
|
2008-11-08 06:05:41 +08:00
|
|
|
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_gamma_get_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_crtc_lut *crtc_lut = data;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
void *r_base, *g_base, *b_base;
|
|
|
|
int size;
|
|
|
|
int ret = 0;
|
|
|
|
|
2011-02-08 11:55:21 +08:00
|
|
|
if (!drm_core_check_feature(dev, DRIVER_MODESET))
|
|
|
|
return -EINVAL;
|
|
|
|
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_lock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
obj = drm_mode_object_find(dev, crtc_lut->crtc_id, DRM_MODE_OBJECT_CRTC);
|
|
|
|
if (!obj) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
crtc = obj_to_crtc(obj);
|
|
|
|
|
|
|
|
/* memcpy into gamma store */
|
|
|
|
if (crtc_lut->gamma_size != crtc->gamma_size) {
|
|
|
|
ret = -EINVAL;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
size = crtc_lut->gamma_size * (sizeof(uint16_t));
|
|
|
|
r_base = crtc->gamma_store;
|
|
|
|
if (copy_to_user((void __user *)(unsigned long)crtc_lut->red, r_base, size)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
g_base = r_base + size;
|
|
|
|
if (copy_to_user((void __user *)(unsigned long)crtc_lut->green, g_base, size)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
|
|
|
b_base = g_base + size;
|
|
|
|
if (copy_to_user((void __user *)(unsigned long)crtc_lut->blue, b_base, size)) {
|
|
|
|
ret = -EFAULT;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
out:
|
2012-12-02 07:28:11 +08:00
|
|
|
drm_modeset_unlock_all(dev);
|
2008-11-08 06:05:41 +08:00
|
|
|
return ret;
|
|
|
|
}
|
2009-11-18 01:43:55 +08:00
|
|
|
|
|
|
|
int drm_mode_page_flip_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_crtc_page_flip *page_flip = data;
|
|
|
|
struct drm_mode_object *obj;
|
|
|
|
struct drm_crtc *crtc;
|
2012-12-11 08:07:12 +08:00
|
|
|
struct drm_framebuffer *fb = NULL, *old_fb = NULL;
|
2009-11-18 01:43:55 +08:00
|
|
|
struct drm_pending_vblank_event *e = NULL;
|
|
|
|
unsigned long flags;
|
2012-09-05 00:35:56 +08:00
|
|
|
int hdisplay, vdisplay;
|
2009-11-18 01:43:55 +08:00
|
|
|
int ret = -EINVAL;
|
|
|
|
|
|
|
|
if (page_flip->flags & ~DRM_MODE_PAGE_FLIP_FLAGS ||
|
|
|
|
page_flip->reserved != 0)
|
|
|
|
return -EINVAL;
|
|
|
|
|
|
|
|
obj = drm_mode_object_find(dev, page_flip->crtc_id, DRM_MODE_OBJECT_CRTC);
|
|
|
|
if (!obj)
|
drm: only grab the crtc lock for pageflips
The pagelip ioctl itself is rather simply, so the hard work for this
patch is auditing all the drivers:
- exynos: Pageflip is protect with dev->struct_mutex and ...
synchronous. But nothing fancy going on, besides a check whether the
crtc is enabled, which should probably be somewhere in the drm core
so that we have unified behaviour across all drivers.
- i915: hw-state is protected with dev->struct_mutex, the delayed
unpin work together with the other stuff the pageflip complete irq
handler needs is protected by the event_lock spinlock.
- nouveau: With the pin/unpin functions fixed, everything looks safe:
A bit of ttm wrestling and refcounting, and a few channel accesses.
The later are either already proteced sufficiently, or are now safe
with the channel locking introduced to make cursor updates safe.
- radeon: The irq_get/put functions look a bit race, since the
atomic_inc/dec isn't protect with locks. Otoh they're all per-crtc,
so we should be safe with per-crtc locking from the drm core. Then
there's tons of per-crtc register access, which could potentially go
through the indirect reg acces. But that's fixed to make cursor
updates concurrent. Bookeeping for the drm even is also protected
with the even_lock, which also protects against the pageflip irq
handler since radeon hw seems to have no way to queue these up
asynchronously. Otherwise just a bit of ttm-based buffer handling
and fencing, which is now safe with the previous patch to hold
bdev->fence_lock while grabbing the ttm fence.
- shmob: Only one crtc. That's an easy one ...
- vmwgfx: As usual a bit special with tons different things:
- Flippable check using is_implicit and num_implicit. Changes to
those seem to be nicely covered with the global modeset lock, so
we should be fine.
- Some dirty cliprect handling stuff, or at least that is my guess.
Looks like it's fine since either it's per-crtc, invariant or
(like the execbuf stuff launched) protected otherwise.
- Adding the actual flip to the fence_event list. On a quick look
this seems to have solid locking in place, too.
... but generally this is all way over my head.
- imx: Impressive display of races between the page_flip
implementation and the irq handler. Also, ipu_drm_set_base which
gets eventually called from the irq handler to update the display
base isn't really protected against concurrent set_config calls from
process context. In any case, going for per-crtc locking won't make
this worse, so nothing to do.
- omap: The new async callback code merged into 3.8 seems to have
solid locking in place, and there doesn't seem to be any shared
state at risk. Especially since the callbacks still use
modeset_lock_all and are so not converted.
v2: Update omapdrm analysis to 3.8 code per the discussion with Rob
Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 23:59:31 +08:00
|
|
|
return -EINVAL;
|
2009-11-18 01:43:55 +08:00
|
|
|
crtc = obj_to_crtc(obj);
|
|
|
|
|
drm: only grab the crtc lock for pageflips
The pagelip ioctl itself is rather simply, so the hard work for this
patch is auditing all the drivers:
- exynos: Pageflip is protect with dev->struct_mutex and ...
synchronous. But nothing fancy going on, besides a check whether the
crtc is enabled, which should probably be somewhere in the drm core
so that we have unified behaviour across all drivers.
- i915: hw-state is protected with dev->struct_mutex, the delayed
unpin work together with the other stuff the pageflip complete irq
handler needs is protected by the event_lock spinlock.
- nouveau: With the pin/unpin functions fixed, everything looks safe:
A bit of ttm wrestling and refcounting, and a few channel accesses.
The later are either already proteced sufficiently, or are now safe
with the channel locking introduced to make cursor updates safe.
- radeon: The irq_get/put functions look a bit race, since the
atomic_inc/dec isn't protect with locks. Otoh they're all per-crtc,
so we should be safe with per-crtc locking from the drm core. Then
there's tons of per-crtc register access, which could potentially go
through the indirect reg acces. But that's fixed to make cursor
updates concurrent. Bookeeping for the drm even is also protected
with the even_lock, which also protects against the pageflip irq
handler since radeon hw seems to have no way to queue these up
asynchronously. Otherwise just a bit of ttm-based buffer handling
and fencing, which is now safe with the previous patch to hold
bdev->fence_lock while grabbing the ttm fence.
- shmob: Only one crtc. That's an easy one ...
- vmwgfx: As usual a bit special with tons different things:
- Flippable check using is_implicit and num_implicit. Changes to
those seem to be nicely covered with the global modeset lock, so
we should be fine.
- Some dirty cliprect handling stuff, or at least that is my guess.
Looks like it's fine since either it's per-crtc, invariant or
(like the execbuf stuff launched) protected otherwise.
- Adding the actual flip to the fence_event list. On a quick look
this seems to have solid locking in place, too.
... but generally this is all way over my head.
- imx: Impressive display of races between the page_flip
implementation and the irq handler. Also, ipu_drm_set_base which
gets eventually called from the irq handler to update the display
base isn't really protected against concurrent set_config calls from
process context. In any case, going for per-crtc locking won't make
this worse, so nothing to do.
- omap: The new async callback code merged into 3.8 seems to have
solid locking in place, and there doesn't seem to be any shared
state at risk. Especially since the callbacks still use
modeset_lock_all and are so not converted.
v2: Update omapdrm analysis to 3.8 code per the discussion with Rob
Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 23:59:31 +08:00
|
|
|
mutex_lock(&crtc->mutex);
|
2010-07-18 03:23:26 +08:00
|
|
|
if (crtc->fb == NULL) {
|
|
|
|
/* The framebuffer is currently unbound, presumably
|
|
|
|
* due to a hotplug event, that userspace has not
|
|
|
|
* yet discovered.
|
|
|
|
*/
|
|
|
|
ret = -EBUSY;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-11-18 01:43:55 +08:00
|
|
|
if (crtc->funcs->page_flip == NULL)
|
|
|
|
goto out;
|
|
|
|
|
2012-12-03 04:53:40 +08:00
|
|
|
fb = drm_framebuffer_lookup(dev, page_flip->fb_id);
|
|
|
|
if (!fb)
|
2009-11-18 01:43:55 +08:00
|
|
|
goto out;
|
|
|
|
|
2012-09-05 00:35:56 +08:00
|
|
|
hdisplay = crtc->mode.hdisplay;
|
|
|
|
vdisplay = crtc->mode.vdisplay;
|
|
|
|
|
|
|
|
if (crtc->invert_dimensions)
|
|
|
|
swap(hdisplay, vdisplay);
|
|
|
|
|
|
|
|
if (hdisplay > fb->width ||
|
|
|
|
vdisplay > fb->height ||
|
|
|
|
crtc->x > fb->width - hdisplay ||
|
|
|
|
crtc->y > fb->height - vdisplay) {
|
|
|
|
DRM_DEBUG_KMS("Invalid fb size %ux%u for CRTC viewport %ux%u+%d+%d%s.\n",
|
|
|
|
fb->width, fb->height, hdisplay, vdisplay, crtc->x, crtc->y,
|
|
|
|
crtc->invert_dimensions ? " (inverted)" : "");
|
2012-03-13 18:35:45 +08:00
|
|
|
ret = -ENOSPC;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-11-18 01:43:55 +08:00
|
|
|
if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) {
|
|
|
|
ret = -ENOMEM;
|
|
|
|
spin_lock_irqsave(&dev->event_lock, flags);
|
|
|
|
if (file_priv->event_space < sizeof e->event) {
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, flags);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
file_priv->event_space -= sizeof e->event;
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, flags);
|
|
|
|
|
|
|
|
e = kzalloc(sizeof *e, GFP_KERNEL);
|
|
|
|
if (e == NULL) {
|
|
|
|
spin_lock_irqsave(&dev->event_lock, flags);
|
|
|
|
file_priv->event_space += sizeof e->event;
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, flags);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2009-11-20 02:50:22 +08:00
|
|
|
e->event.base.type = DRM_EVENT_FLIP_COMPLETE;
|
2009-11-18 01:43:55 +08:00
|
|
|
e->event.base.length = sizeof e->event;
|
|
|
|
e->event.user_data = page_flip->user_data;
|
|
|
|
e->base.event = &e->event.base;
|
|
|
|
e->base.file_priv = file_priv;
|
|
|
|
e->base.destroy =
|
|
|
|
(void (*) (struct drm_pending_event *)) kfree;
|
|
|
|
}
|
|
|
|
|
2012-12-11 08:07:12 +08:00
|
|
|
old_fb = crtc->fb;
|
2009-11-18 01:43:55 +08:00
|
|
|
ret = crtc->funcs->page_flip(crtc, fb, e);
|
|
|
|
if (ret) {
|
2012-04-18 12:47:02 +08:00
|
|
|
if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) {
|
|
|
|
spin_lock_irqsave(&dev->event_lock, flags);
|
|
|
|
file_priv->event_space += sizeof e->event;
|
|
|
|
spin_unlock_irqrestore(&dev->event_lock, flags);
|
|
|
|
kfree(e);
|
|
|
|
}
|
2012-12-11 08:07:12 +08:00
|
|
|
/* Keep the old fb, don't unref it. */
|
|
|
|
old_fb = NULL;
|
|
|
|
} else {
|
2013-02-13 23:08:33 +08:00
|
|
|
/*
|
|
|
|
* Warn if the driver hasn't properly updated the crtc->fb
|
|
|
|
* field to reflect that the new framebuffer is now used.
|
|
|
|
* Failing to do so will screw with the reference counting
|
|
|
|
* on framebuffers.
|
|
|
|
*/
|
|
|
|
WARN_ON(crtc->fb != fb);
|
2012-12-11 08:07:12 +08:00
|
|
|
/* Unref only the old framebuffer. */
|
|
|
|
fb = NULL;
|
2009-11-18 01:43:55 +08:00
|
|
|
}
|
|
|
|
|
|
|
|
out:
|
2012-12-11 08:07:12 +08:00
|
|
|
if (fb)
|
|
|
|
drm_framebuffer_unreference(fb);
|
|
|
|
if (old_fb)
|
|
|
|
drm_framebuffer_unreference(old_fb);
|
drm: only grab the crtc lock for pageflips
The pagelip ioctl itself is rather simply, so the hard work for this
patch is auditing all the drivers:
- exynos: Pageflip is protect with dev->struct_mutex and ...
synchronous. But nothing fancy going on, besides a check whether the
crtc is enabled, which should probably be somewhere in the drm core
so that we have unified behaviour across all drivers.
- i915: hw-state is protected with dev->struct_mutex, the delayed
unpin work together with the other stuff the pageflip complete irq
handler needs is protected by the event_lock spinlock.
- nouveau: With the pin/unpin functions fixed, everything looks safe:
A bit of ttm wrestling and refcounting, and a few channel accesses.
The later are either already proteced sufficiently, or are now safe
with the channel locking introduced to make cursor updates safe.
- radeon: The irq_get/put functions look a bit race, since the
atomic_inc/dec isn't protect with locks. Otoh they're all per-crtc,
so we should be safe with per-crtc locking from the drm core. Then
there's tons of per-crtc register access, which could potentially go
through the indirect reg acces. But that's fixed to make cursor
updates concurrent. Bookeeping for the drm even is also protected
with the even_lock, which also protects against the pageflip irq
handler since radeon hw seems to have no way to queue these up
asynchronously. Otherwise just a bit of ttm-based buffer handling
and fencing, which is now safe with the previous patch to hold
bdev->fence_lock while grabbing the ttm fence.
- shmob: Only one crtc. That's an easy one ...
- vmwgfx: As usual a bit special with tons different things:
- Flippable check using is_implicit and num_implicit. Changes to
those seem to be nicely covered with the global modeset lock, so
we should be fine.
- Some dirty cliprect handling stuff, or at least that is my guess.
Looks like it's fine since either it's per-crtc, invariant or
(like the execbuf stuff launched) protected otherwise.
- Adding the actual flip to the fence_event list. On a quick look
this seems to have solid locking in place, too.
... but generally this is all way over my head.
- imx: Impressive display of races between the page_flip
implementation and the irq handler. Also, ipu_drm_set_base which
gets eventually called from the irq handler to update the display
base isn't really protected against concurrent set_config calls from
process context. In any case, going for per-crtc locking won't make
this worse, so nothing to do.
- omap: The new async callback code merged into 3.8 seems to have
solid locking in place, and there doesn't seem to be any shared
state at risk. Especially since the callbacks still use
modeset_lock_all and are so not converted.
v2: Update omapdrm analysis to 3.8 code per the discussion with Rob
Clark.
Reviewed-by: Rob Clark <rob@ti.com>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-12-11 23:59:31 +08:00
|
|
|
mutex_unlock(&crtc->mutex);
|
|
|
|
|
2009-11-18 01:43:55 +08:00
|
|
|
return ret;
|
|
|
|
}
|
2011-01-24 23:11:08 +08:00
|
|
|
|
|
|
|
void drm_mode_config_reset(struct drm_device *dev)
|
|
|
|
{
|
|
|
|
struct drm_crtc *crtc;
|
|
|
|
struct drm_encoder *encoder;
|
|
|
|
struct drm_connector *connector;
|
|
|
|
|
|
|
|
list_for_each_entry(crtc, &dev->mode_config.crtc_list, head)
|
|
|
|
if (crtc->funcs->reset)
|
|
|
|
crtc->funcs->reset(crtc);
|
|
|
|
|
|
|
|
list_for_each_entry(encoder, &dev->mode_config.encoder_list, head)
|
|
|
|
if (encoder->funcs->reset)
|
|
|
|
encoder->funcs->reset(encoder);
|
|
|
|
|
2012-10-24 02:23:35 +08:00
|
|
|
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
|
|
|
|
connector->status = connector_status_unknown;
|
|
|
|
|
2011-01-24 23:11:08 +08:00
|
|
|
if (connector->funcs->reset)
|
|
|
|
connector->funcs->reset(connector);
|
2012-10-24 02:23:35 +08:00
|
|
|
}
|
2011-01-24 23:11:08 +08:00
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_mode_config_reset);
|
2011-02-07 10:16:14 +08:00
|
|
|
|
|
|
|
int drm_mode_create_dumb_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_create_dumb *args = data;
|
|
|
|
|
|
|
|
if (!dev->driver->dumb_create)
|
|
|
|
return -ENOSYS;
|
|
|
|
return dev->driver->dumb_create(file_priv, dev, args);
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_mmap_dumb_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_map_dumb *args = data;
|
|
|
|
|
|
|
|
/* call driver ioctl to get mmap offset */
|
|
|
|
if (!dev->driver->dumb_map_offset)
|
|
|
|
return -ENOSYS;
|
|
|
|
|
|
|
|
return dev->driver->dumb_map_offset(file_priv, dev, args->handle, &args->offset);
|
|
|
|
}
|
|
|
|
|
|
|
|
int drm_mode_destroy_dumb_ioctl(struct drm_device *dev,
|
|
|
|
void *data, struct drm_file *file_priv)
|
|
|
|
{
|
|
|
|
struct drm_mode_destroy_dumb *args = data;
|
|
|
|
|
|
|
|
if (!dev->driver->dumb_destroy)
|
|
|
|
return -ENOSYS;
|
|
|
|
|
|
|
|
return dev->driver->dumb_destroy(file_priv, dev, args->handle);
|
|
|
|
}
|
2011-11-30 04:02:54 +08:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Just need to support RGB formats here for compat with code that doesn't
|
|
|
|
* use pixel formats directly yet.
|
|
|
|
*/
|
|
|
|
void drm_fb_get_bpp_depth(uint32_t format, unsigned int *depth,
|
|
|
|
int *bpp)
|
|
|
|
{
|
|
|
|
switch (format) {
|
2013-02-01 01:43:37 +08:00
|
|
|
case DRM_FORMAT_C8:
|
2011-11-18 00:05:13 +08:00
|
|
|
case DRM_FORMAT_RGB332:
|
|
|
|
case DRM_FORMAT_BGR233:
|
2011-11-30 04:02:54 +08:00
|
|
|
*depth = 8;
|
|
|
|
*bpp = 8;
|
|
|
|
break;
|
2011-11-18 00:05:13 +08:00
|
|
|
case DRM_FORMAT_XRGB1555:
|
|
|
|
case DRM_FORMAT_XBGR1555:
|
|
|
|
case DRM_FORMAT_RGBX5551:
|
|
|
|
case DRM_FORMAT_BGRX5551:
|
|
|
|
case DRM_FORMAT_ARGB1555:
|
|
|
|
case DRM_FORMAT_ABGR1555:
|
|
|
|
case DRM_FORMAT_RGBA5551:
|
|
|
|
case DRM_FORMAT_BGRA5551:
|
2011-11-30 04:02:54 +08:00
|
|
|
*depth = 15;
|
|
|
|
*bpp = 16;
|
|
|
|
break;
|
2011-11-18 00:05:13 +08:00
|
|
|
case DRM_FORMAT_RGB565:
|
|
|
|
case DRM_FORMAT_BGR565:
|
2011-11-30 04:02:54 +08:00
|
|
|
*depth = 16;
|
|
|
|
*bpp = 16;
|
|
|
|
break;
|
2011-11-18 00:05:13 +08:00
|
|
|
case DRM_FORMAT_RGB888:
|
|
|
|
case DRM_FORMAT_BGR888:
|
|
|
|
*depth = 24;
|
|
|
|
*bpp = 24;
|
|
|
|
break;
|
|
|
|
case DRM_FORMAT_XRGB8888:
|
|
|
|
case DRM_FORMAT_XBGR8888:
|
|
|
|
case DRM_FORMAT_RGBX8888:
|
|
|
|
case DRM_FORMAT_BGRX8888:
|
2011-11-30 04:02:54 +08:00
|
|
|
*depth = 24;
|
|
|
|
*bpp = 32;
|
|
|
|
break;
|
2011-11-18 00:05:13 +08:00
|
|
|
case DRM_FORMAT_XRGB2101010:
|
|
|
|
case DRM_FORMAT_XBGR2101010:
|
|
|
|
case DRM_FORMAT_RGBX1010102:
|
|
|
|
case DRM_FORMAT_BGRX1010102:
|
|
|
|
case DRM_FORMAT_ARGB2101010:
|
|
|
|
case DRM_FORMAT_ABGR2101010:
|
|
|
|
case DRM_FORMAT_RGBA1010102:
|
|
|
|
case DRM_FORMAT_BGRA1010102:
|
2011-11-30 04:02:54 +08:00
|
|
|
*depth = 30;
|
|
|
|
*bpp = 32;
|
|
|
|
break;
|
2011-11-18 00:05:13 +08:00
|
|
|
case DRM_FORMAT_ARGB8888:
|
|
|
|
case DRM_FORMAT_ABGR8888:
|
|
|
|
case DRM_FORMAT_RGBA8888:
|
|
|
|
case DRM_FORMAT_BGRA8888:
|
2011-11-30 04:02:54 +08:00
|
|
|
*depth = 32;
|
|
|
|
*bpp = 32;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
DRM_DEBUG_KMS("unsupported pixel format\n");
|
|
|
|
*depth = 0;
|
|
|
|
*bpp = 0;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_fb_get_bpp_depth);
|
2012-04-06 02:35:15 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_format_num_planes - get the number of planes for format
|
|
|
|
* @format: pixel format (DRM_FORMAT_*)
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* The number of planes used by the specified pixel format.
|
|
|
|
*/
|
|
|
|
int drm_format_num_planes(uint32_t format)
|
|
|
|
{
|
|
|
|
switch (format) {
|
|
|
|
case DRM_FORMAT_YUV410:
|
|
|
|
case DRM_FORMAT_YVU410:
|
|
|
|
case DRM_FORMAT_YUV411:
|
|
|
|
case DRM_FORMAT_YVU411:
|
|
|
|
case DRM_FORMAT_YUV420:
|
|
|
|
case DRM_FORMAT_YVU420:
|
|
|
|
case DRM_FORMAT_YUV422:
|
|
|
|
case DRM_FORMAT_YVU422:
|
|
|
|
case DRM_FORMAT_YUV444:
|
|
|
|
case DRM_FORMAT_YVU444:
|
|
|
|
return 3;
|
|
|
|
case DRM_FORMAT_NV12:
|
|
|
|
case DRM_FORMAT_NV21:
|
|
|
|
case DRM_FORMAT_NV16:
|
|
|
|
case DRM_FORMAT_NV61:
|
2012-05-19 05:47:40 +08:00
|
|
|
case DRM_FORMAT_NV24:
|
|
|
|
case DRM_FORMAT_NV42:
|
2012-04-06 02:35:15 +08:00
|
|
|
return 2;
|
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_format_num_planes);
|
2012-04-06 02:35:16 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_format_plane_cpp - determine the bytes per pixel value
|
|
|
|
* @format: pixel format (DRM_FORMAT_*)
|
|
|
|
* @plane: plane index
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* The bytes per pixel value for the specified plane.
|
|
|
|
*/
|
|
|
|
int drm_format_plane_cpp(uint32_t format, int plane)
|
|
|
|
{
|
|
|
|
unsigned int depth;
|
|
|
|
int bpp;
|
|
|
|
|
|
|
|
if (plane >= drm_format_num_planes(format))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
switch (format) {
|
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
case DRM_FORMAT_VYUY:
|
|
|
|
return 2;
|
|
|
|
case DRM_FORMAT_NV12:
|
|
|
|
case DRM_FORMAT_NV21:
|
|
|
|
case DRM_FORMAT_NV16:
|
|
|
|
case DRM_FORMAT_NV61:
|
2012-05-19 05:47:40 +08:00
|
|
|
case DRM_FORMAT_NV24:
|
|
|
|
case DRM_FORMAT_NV42:
|
2012-04-06 02:35:16 +08:00
|
|
|
return plane ? 2 : 1;
|
|
|
|
case DRM_FORMAT_YUV410:
|
|
|
|
case DRM_FORMAT_YVU410:
|
|
|
|
case DRM_FORMAT_YUV411:
|
|
|
|
case DRM_FORMAT_YVU411:
|
|
|
|
case DRM_FORMAT_YUV420:
|
|
|
|
case DRM_FORMAT_YVU420:
|
|
|
|
case DRM_FORMAT_YUV422:
|
|
|
|
case DRM_FORMAT_YVU422:
|
|
|
|
case DRM_FORMAT_YUV444:
|
|
|
|
case DRM_FORMAT_YVU444:
|
|
|
|
return 1;
|
|
|
|
default:
|
|
|
|
drm_fb_get_bpp_depth(format, &depth, &bpp);
|
|
|
|
return bpp >> 3;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_format_plane_cpp);
|
2012-04-06 02:35:17 +08:00
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_format_horz_chroma_subsampling - get the horizontal chroma subsampling factor
|
|
|
|
* @format: pixel format (DRM_FORMAT_*)
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* The horizontal chroma subsampling factor for the
|
|
|
|
* specified pixel format.
|
|
|
|
*/
|
|
|
|
int drm_format_horz_chroma_subsampling(uint32_t format)
|
|
|
|
{
|
|
|
|
switch (format) {
|
|
|
|
case DRM_FORMAT_YUV411:
|
|
|
|
case DRM_FORMAT_YVU411:
|
|
|
|
case DRM_FORMAT_YUV410:
|
|
|
|
case DRM_FORMAT_YVU410:
|
|
|
|
return 4;
|
|
|
|
case DRM_FORMAT_YUYV:
|
|
|
|
case DRM_FORMAT_YVYU:
|
|
|
|
case DRM_FORMAT_UYVY:
|
|
|
|
case DRM_FORMAT_VYUY:
|
|
|
|
case DRM_FORMAT_NV12:
|
|
|
|
case DRM_FORMAT_NV21:
|
|
|
|
case DRM_FORMAT_NV16:
|
|
|
|
case DRM_FORMAT_NV61:
|
|
|
|
case DRM_FORMAT_YUV422:
|
|
|
|
case DRM_FORMAT_YVU422:
|
|
|
|
case DRM_FORMAT_YUV420:
|
|
|
|
case DRM_FORMAT_YVU420:
|
|
|
|
return 2;
|
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_format_horz_chroma_subsampling);
|
|
|
|
|
|
|
|
/**
|
|
|
|
* drm_format_vert_chroma_subsampling - get the vertical chroma subsampling factor
|
|
|
|
* @format: pixel format (DRM_FORMAT_*)
|
|
|
|
*
|
|
|
|
* RETURNS:
|
|
|
|
* The vertical chroma subsampling factor for the
|
|
|
|
* specified pixel format.
|
|
|
|
*/
|
|
|
|
int drm_format_vert_chroma_subsampling(uint32_t format)
|
|
|
|
{
|
|
|
|
switch (format) {
|
|
|
|
case DRM_FORMAT_YUV410:
|
|
|
|
case DRM_FORMAT_YVU410:
|
|
|
|
return 4;
|
|
|
|
case DRM_FORMAT_YUV420:
|
|
|
|
case DRM_FORMAT_YVU420:
|
|
|
|
case DRM_FORMAT_NV12:
|
|
|
|
case DRM_FORMAT_NV21:
|
|
|
|
return 2;
|
|
|
|
default:
|
|
|
|
return 1;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
EXPORT_SYMBOL(drm_format_vert_chroma_subsampling);
|