From patchwork Thu Sep 13 03:49:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rob Clark X-Patchwork-Id: 11379 Return-Path: X-Original-To: patchwork@peony.canonical.com Delivered-To: patchwork@peony.canonical.com Received: from fiordland.canonical.com (fiordland.canonical.com [91.189.94.145]) by peony.canonical.com (Postfix) with ESMTP id C5F3523E29 for ; Thu, 13 Sep 2012 03:51:48 +0000 (UTC) Received: from mail-iy0-f180.google.com (mail-iy0-f180.google.com [209.85.210.180]) by fiordland.canonical.com (Postfix) with ESMTP id 9C41C34B8D7A for ; Thu, 13 Sep 2012 03:51:47 +0000 (UTC) Received: by iafj25 with SMTP id j25so1820584iaf.11 for ; Wed, 12 Sep 2012 20:51:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-forwarded-to:x-forwarded-for:delivered-to:received-spf :dkim-signature:sender:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references:x-gm-message-state; bh=A8Lik9eZGjlcUUm078NIxBZ4BrhkQSas2dwawoYn7/I=; b=bZEl7vW7IpMzenKd3KiTKLI/Q8SIR2pWIl0auS0GKM7WJhC2v9MU7tFuoxOxBpnStB 6S/7s3JgAzLVOLeCDo8ij7eSgV4ts4JeT9DnAv+DR4906aZvYyG0zGcgkw0MB/mUQFcD WKybppJslSVoKBeX+5RgE1e4CkcI5xUsz2TTbJmTshu48QV3syqMYU0E2c+UHPh9fRI8 PyLGd/xF3Pubkpy2aang2IUZflv/qweCvaDsCMcxQa9VnxVINohH7c8H+Ug8Kn7Gehkf W22Wy24qOUe3gYClFxiGPQ4EJ6W+qMccmKBTsyO+P1vB5lLdK7XpXqs1B2pRdIV0tZCq 9AIQ== Received: by 10.50.207.106 with SMTP id lv10mr671452igc.0.1347508306945; Wed, 12 Sep 2012 20:51:46 -0700 (PDT) X-Forwarded-To: linaro-patchwork@canonical.com X-Forwarded-For: patch@linaro.org linaro-patchwork@canonical.com Delivered-To: patches@linaro.org Received: by 10.50.184.232 with SMTP id ex8csp111098igc; Wed, 12 Sep 2012 20:51:46 -0700 (PDT) Received: by 10.60.11.104 with SMTP id p8mr463153oeb.133.1347508305854; Wed, 12 Sep 2012 20:51:45 -0700 (PDT) Received: from mail-ob0-f178.google.com (mail-ob0-f178.google.com [209.85.214.178]) by mx.google.com with ESMTPS id rp7si28188597obc.5.2012.09.12.20.51.45 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 20:51:45 -0700 (PDT) Received-SPF: pass (google.com: domain of robdclark@gmail.com designates 209.85.214.178 as permitted sender) client-ip=209.85.214.178; Authentication-Results: mx.google.com; spf=pass (google.com: domain of robdclark@gmail.com designates 209.85.214.178 as permitted sender) smtp.mail=robdclark@gmail.com; dkim=pass header.i=@gmail.com Received: by mail-ob0-f178.google.com with SMTP id wd20so4595268obb.37 for ; Wed, 12 Sep 2012 20:51:45 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=A8Lik9eZGjlcUUm078NIxBZ4BrhkQSas2dwawoYn7/I=; b=cYS46ziTtv39jeiS1lEL5NWpAQ4bVTU+GU1EzeOjHyZ7oIGl5PuzZ5NCN0ChARQhpx 4EUzY2MEyg8gn5GXpZtlTea6h8p6QyH+bj9N3LeDp8alvyb5vWNpXaaNq8dZZWynkuDR i0qfzK6d03YyYXWRWPeihetW7hB3kBPCFwNIBXJ6zztVcqgMs9r8R6ctcouK4pDARdK4 SM/32Lle9nNyBM90clQrX7iOgNk3x5auTohuvCwvl582ayiNj9q5MrOZh1U7cVpDPC2A bddrCR+cYemyeDkSO0wWAPl2WNU/+ET75XEvV+XsI/k56mEyXnQgUfmmaFG7aT2n/TLn VaqQ== Received: by 10.60.19.37 with SMTP id b5mr550072oee.16.1347508305723; Wed, 12 Sep 2012 20:51:45 -0700 (PDT) Received: from localhost (ppp-70-129-131-42.dsl.rcsntx.swbell.net. [70.129.131.42]) by mx.google.com with ESMTPS id x1sm12043640oef.8.2012.09.12.20.51.44 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 12 Sep 2012 20:51:45 -0700 (PDT) Sender: Rob Clark From: Rob Clark To: dri-devel@lists.freedesktop.org Cc: patches@linaro.org, ville.syrjala@linux.intel.com, jbarnes@virtuousgeek.org, daniel.vetter@ffwll.ch, Rob Clark Subject: [RFC 08/11] drm: convert page_flip to properties Date: Wed, 12 Sep 2012 22:49:54 -0500 Message-Id: <1347508195-14939-9-git-send-email-rob.clark@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1347508195-14939-1-git-send-email-rob.clark@linaro.org> References: <1347508195-14939-1-git-send-email-rob.clark@linaro.org> X-Gm-Message-State: ALoCoQnIUU8ZuA4bizABPE5XS3B+U+OXXsdJdvTqSFuh6e9J/sNrMoi5Qy1pKdErmMsfBmQuzGnV From: Rob Clark Use atomic properties mechanism for CRTC page_flip. This by itself doesn't accomplish anything, but it avoids having multiple code paths to do the same thing when nuclear-pageflip and atomic-modeset are introduced. --- drivers/gpu/drm/drm_crtc.c | 69 +++++++++++++++++++------------------------- include/drm/drm_crtc.h | 13 --------- 2 files changed, 30 insertions(+), 52 deletions(-) diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 5f310d3..f421fa6a 100644 --- a/drivers/gpu/drm/drm_crtc.c +++ b/drivers/gpu/drm/drm_crtc.c @@ -386,9 +386,7 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) struct drm_mode_config *config = &dev->mode_config; struct drm_crtc *crtc; struct drm_plane *plane; - struct drm_mode_set set; void *state; - int ret; state = dev->driver->atomic_begin(dev, NULL); if (IS_ERR(state)) { @@ -400,12 +398,7 @@ void drm_framebuffer_remove(struct drm_framebuffer *fb) 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 = crtc->funcs->set_config(&set); - if (ret) - DRM_ERROR("failed to reset crtc %p when fb was deleted\n", crtc); + drm_mode_crtc_set_obj_prop(crtc, state, config->prop_fb_id, 0); } } @@ -448,6 +441,7 @@ EXPORT_SYMBOL(drm_framebuffer_remove); int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, const struct drm_crtc_funcs *funcs) { + struct drm_mode_config *config = &dev->mode_config; int ret; crtc->dev = dev; @@ -466,6 +460,10 @@ int drm_crtc_init(struct drm_device *dev, struct drm_crtc *crtc, list_add_tail(&crtc->head, &dev->mode_config.crtc_list); dev->mode_config.num_crtc++; + drm_object_attach_property(&crtc->base, config->prop_fb_id, 0); + drm_object_attach_property(&crtc->base, config->prop_crtc_x, 0); + drm_object_attach_property(&crtc->base, config->prop_crtc_y, 0); + out: mutex_unlock(&dev->mode_config.mutex); @@ -3773,12 +3771,12 @@ 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_config *config = &dev->mode_config; struct drm_mode_object *obj; struct drm_crtc *crtc; - struct drm_framebuffer *fb; struct drm_pending_vblank_event *e = NULL; unsigned long flags; - int hdisplay, vdisplay; + void *state; int ret = -EINVAL; if (page_flip->flags & ~DRM_MODE_PAGE_FLIP_FLAGS || @@ -3786,11 +3784,22 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, return -EINVAL; mutex_lock(&dev->mode_config.mutex); - obj = drm_mode_object_find(dev, page_flip->crtc_id, DRM_MODE_OBJECT_CRTC); - if (!obj) - goto out; + + obj = drm_mode_object_find(dev, page_flip->crtc_id, + DRM_MODE_OBJECT_CRTC); + if (!obj) { + DRM_DEBUG_KMS("Unknown CRTC ID %d\n", page_flip->crtc_id); + ret = -ENOENT; + goto out_unlock; + } crtc = obj_to_crtc(obj); + state = dev->driver->atomic_begin(dev, crtc); + if (IS_ERR(state)) { + ret = PTR_ERR(state); + goto out_unlock; + } + if (crtc->fb == NULL) { /* The framebuffer is currently unbound, presumably * due to a hotplug event, that userspace has not @@ -3800,31 +3809,6 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, goto out; } - if (crtc->funcs->page_flip == NULL) - goto out; - - obj = drm_mode_object_find(dev, page_flip->fb_id, DRM_MODE_OBJECT_FB); - if (!obj) - goto out; - fb = obj_to_fb(obj); - - 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)" : ""); - ret = -ENOSPC; - goto out; - } - if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) { ret = -ENOMEM; spin_lock_irqsave(&dev->event_lock, flags); @@ -3852,7 +3836,12 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, (void (*) (struct drm_pending_event *)) kfree; } - ret = crtc->funcs->page_flip(crtc, fb, e); + ret = drm_mode_set_obj_prop(obj, state, + config->prop_fb_id, page_flip->fb_id); + if (ret) + goto out; + + ret = dev->driver->atomic_commit(dev, state, e); if (ret) { if (page_flip->flags & DRM_MODE_PAGE_FLIP_EVENT) { spin_lock_irqsave(&dev->event_lock, flags); @@ -3863,6 +3852,8 @@ int drm_mode_page_flip_ioctl(struct drm_device *dev, } out: + dev->driver->atomic_end(dev, state); +out_unlock: mutex_unlock(&dev->mode_config.mutex); return ret; } diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h index 3a622e4..73a8a14 100644 --- a/include/drm/drm_crtc.h +++ b/include/drm/drm_crtc.h @@ -358,19 +358,6 @@ struct drm_crtc_funcs { int (*set_config)(struct drm_mode_set *set); - /* - * Flip to the given framebuffer. This implements the page - * flip ioctl described in drm_mode.h, specifically, the - * implementation must return immediately and block all - * rendering to the current fb until the flip has completed. - * If userspace set the event flag in the ioctl, the event - * argument will point to an event to send back when the flip - * completes, otherwise it will be NULL. - */ - int (*page_flip)(struct drm_crtc *crtc, - struct drm_framebuffer *fb, - struct drm_pending_vblank_event *event); - int (*set_property)(struct drm_crtc *crtc, void *state, struct drm_property *property, uint64_t val); };