From: Thomas Hellstrom <thellstrom@vmware.com>
To: airlied@gmail.com, airlied@redhat.com
Cc: Thomas Hellstrom <thellstrom@vmware.com>,
linux-graphics-maintainer@vmware.com,
dri-devel@lists.freedesktop.org
Subject: [PATCH 1/5] drm: Have the crtc code only reference master from legacy nodes
Date: Thu, 13 Mar 2014 11:57:20 +0100 [thread overview]
Message-ID: <1394708244-6565-2-git-send-email-thellstrom@vmware.com> (raw)
In-Reply-To: <1394708244-6565-1-git-send-email-thellstrom@vmware.com>
control- and render nodes are intended to be master-less.
Signed-off-by: Thomas Hellstrom <thellstrom@vmware.com>
---
drivers/gpu/drm/drm_crtc.c | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 3b7d32d..c9d895a 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1398,7 +1398,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
uint32_t __user *crtc_id;
uint32_t __user *connector_id;
uint32_t __user *encoder_id;
- struct drm_mode_group *mode_group;
+ struct drm_mode_group *mode_group = NULL;
if (!drm_core_check_feature(dev, DRIVER_MODESET))
return -EINVAL;
@@ -1429,8 +1429,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
mutex_unlock(&file_priv->fbs_lock);
drm_modeset_lock_all(dev);
- mode_group = &file_priv->master->minor->mode_group;
- if (file_priv->master->minor->type == DRM_MINOR_CONTROL) {
+ if (file_priv->minor->type != DRM_MINOR_LEGACY) {
list_for_each(lh, &dev->mode_config.crtc_list)
crtc_count++;
@@ -1442,6 +1441,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
encoder_count++;
} else {
+ mode_group = &file_priv->master->minor->mode_group;
crtc_count = mode_group->num_crtcs;
connector_count = mode_group->num_connectors;
encoder_count = mode_group->num_encoders;
@@ -1456,7 +1456,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
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) {
+ if (file_priv->minor->type != DRM_MINOR_LEGACY) {
list_for_each_entry(crtc, &dev->mode_config.crtc_list,
head) {
DRM_DEBUG_KMS("[CRTC:%d]\n", crtc->base.id);
@@ -1483,7 +1483,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
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) {
+ if (file_priv->minor->type != DRM_MINOR_LEGACY) {
list_for_each_entry(encoder,
&dev->mode_config.encoder_list,
head) {
@@ -1514,7 +1514,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
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) {
+ if (file_priv->minor->type != DRM_MINOR_LEGACY) {
list_for_each_entry(connector,
&dev->mode_config.connector_list,
head) {
@@ -2715,7 +2715,8 @@ int drm_mode_getfb(struct drm_device *dev,
r->bpp = fb->bits_per_pixel;
r->pitch = fb->pitches[0];
if (fb->funcs->create_handle) {
- if (file_priv->is_master || capable(CAP_SYS_ADMIN)) {
+ if (file_priv->is_master || capable(CAP_SYS_ADMIN) ||
+ file_priv->minor->type == DRM_MINOR_CONTROL) {
ret = fb->funcs->create_handle(fb, file_priv,
&r->handle);
} else {
--
1.7.10.4
next prev parent reply other threads:[~2014-03-13 10:56 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-03-13 10:57 (unknown), Thomas Hellstrom
2014-03-13 10:57 ` Thomas Hellstrom [this message]
2014-03-13 11:12 ` [PATCH 1/5] drm: Have the crtc code only reference master from legacy nodes David Herrmann
2014-03-13 10:57 ` [PATCH 2/5] drm: Break out ioctl permission check to a separate function Thomas Hellstrom
2014-03-13 11:19 ` David Herrmann
2014-03-13 12:11 ` Thomas Hellstrom
2014-03-13 12:15 ` David Herrmann
2014-03-13 12:28 ` Thomas Hellstrom
2014-03-13 18:47 ` Daniel Vetter
2014-03-13 10:57 ` [PATCH 3/5] drm: Make control nodes master-less v2 Thomas Hellstrom
2014-03-13 11:23 ` David Herrmann
2014-03-13 10:57 ` [PATCH 4/5] drm: Improve on minor type helpers Thomas Hellstrom
2014-03-13 10:57 ` [PATCH 5/5] drm: Remove the minor master list Thomas Hellstrom
2014-03-13 11:01 ` [PATCH 0/5] Control node master fixes WAS: Thomas Hellstrom
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1394708244-6565-2-git-send-email-thellstrom@vmware.com \
--to=thellstrom@vmware.com \
--cc=airlied@gmail.com \
--cc=airlied@redhat.com \
--cc=dri-devel@lists.freedesktop.org \
--cc=linux-graphics-maintainer@vmware.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox