From patchwork Mon Jul 31 10:54:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 9871583 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 4F3E060365 for ; Mon, 31 Jul 2017 10:55:08 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 424BF28562 for ; Mon, 31 Jul 2017 10:55:08 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3603C2858E; Mon, 31 Jul 2017 10:55:08 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.6 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_WEB, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 7EF2528562 for ; Mon, 31 Jul 2017 10:55:05 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 7CCFC6E5DD; Mon, 31 Jul 2017 10:54:32 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-wm0-x244.google.com (mail-wm0-x244.google.com [IPv6:2a00:1450:400c:c09::244]) by gabe.freedesktop.org (Postfix) with ESMTPS id B7D576E5DD for ; Mon, 31 Jul 2017 10:54:30 +0000 (UTC) Received: by mail-wm0-x244.google.com with SMTP id y206so12063558wmd.5 for ; Mon, 31 Jul 2017 03:54:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=24JJN9n+VgopUDygi3ki08hOC05Byru3QEvyP5Pg/V0=; b=COfEVq+EmWPxXgG8WTYvhUc3eDxrZyxqBtskZeU4TZyKEk2sUaVsx6ym5codrwiXM6 sMXIJtvMFD/nEgBW+s23OUIQ2NlgdfHeGMIC1yO4sPsj0aXvwSLqmwmSu/VnLkwvRHvQ uyd+bx4P/YdaoYzliutnyca15uDbX7JxPh+G4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=24JJN9n+VgopUDygi3ki08hOC05Byru3QEvyP5Pg/V0=; b=QoKpM17E76Y75Inp+edVsYPq7SkZj82GSDH4g1+xlByDxFbEqAjzf1qDxhfiBMjPNH NkyoGRfSuGC225hINZeyHltFoSunHyNJz6+kVO5l/G+F7E+ZqVtcjdiVB7QOg3Ggs7y/ LmMCuIV9ChQtUH1Xns4KU48DsUlCjRbu55mAuWGVbGdPlD1otC6IilO6wM0iPxKKBkE+ ftyllcoABAh6zzOxO47FPOMCfOEfddcEJjLYCfUrTrOjhxhZZodrovP0sR+jQlvbDF2e FNXYP2RLck9BjRhBYJB2/gyOVyz0Mc6ES+mkmq9bkmtkBX8JlL4Y1dNhBsT+NjfRPUla KbyA== X-Gm-Message-State: AIVw110qOl8u2aXNE0MctX+kXVHw912jO5JtpqsIAFbA8m/mrOjTP5uO QwiXsUO2oYfknfeHwCgYHg== X-Received: by 10.80.209.195 with SMTP id i3mr14201348edg.70.1501498468896; Mon, 31 Jul 2017 03:54:28 -0700 (PDT) Received: from dvetter-linux.ger.corp.intel.com ([194.230.159.118]) by smtp.gmail.com with ESMTPSA id v5sm13208528ede.75.2017.07.31.03.54.27 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 31 Jul 2017 03:54:27 -0700 (PDT) From: Daniel Vetter To: DRI Development Subject: [PATCH] drm/omap: Rework the rotation-on-crtc hack Date: Mon, 31 Jul 2017 12:54:19 +0200 Message-Id: <20170731105419.6505-1-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 2.9.4 In-Reply-To: <20170725080122.20548-2-daniel.vetter@ffwll.ch> References: <20170725080122.20548-2-daniel.vetter@ffwll.ch> Cc: Daniel Vetter , Tomi Valkeinen , Laurent Pinchart , Daniel Vetter X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP I want/need to rework the core property handling, and this hack is getting in the way. But since it's a non-standard propety only used by legacy userspace we know that this will only every be called from ioctl code. And never on some other free-standing state struct, where this old hack wouldn't work either. v2: don't forget zorder and get_property! v3: Shadow the legacy state to avoid locking issues in get_property (Maarten). Cc: Maarten Lankhorst Cc: Tomi Valkeinen Signed-off-by: Daniel Vetter --- drivers/gpu/drm/omapdrm/omap_crtc.c | 84 +++++++++++++++++++++---------------- drivers/gpu/drm/omapdrm/omap_drv.h | 9 ++++ 2 files changed, 57 insertions(+), 36 deletions(-) diff --git a/drivers/gpu/drm/omapdrm/omap_crtc.c b/drivers/gpu/drm/omapdrm/omap_crtc.c index 14e8a7738b06..fc8b25748f10 100644 --- a/drivers/gpu/drm/omapdrm/omap_crtc.c +++ b/drivers/gpu/drm/omapdrm/omap_crtc.c @@ -498,39 +498,34 @@ static void omap_crtc_atomic_flush(struct drm_crtc *crtc, spin_unlock_irq(&crtc->dev->event_lock); } -static bool omap_crtc_is_plane_prop(struct drm_crtc *crtc, - struct drm_property *property) -{ - struct drm_device *dev = crtc->dev; - struct omap_drm_private *priv = dev->dev_private; - - return property == priv->zorder_prop || - property == crtc->primary->rotation_property; -} - static int omap_crtc_atomic_set_property(struct drm_crtc *crtc, struct drm_crtc_state *state, struct drm_property *property, uint64_t val) { - if (omap_crtc_is_plane_prop(crtc, property)) { - struct drm_plane_state *plane_state; - struct drm_plane *plane = crtc->primary; - - /* - * Delegate property set to the primary plane. Get the plane - * state and set the property directly. - */ - - plane_state = drm_atomic_get_plane_state(state->state, plane); - if (IS_ERR(plane_state)) - return PTR_ERR(plane_state); + struct omap_drm_private *priv = crtc->dev->dev_private; + struct omap_crtc_state *omap_state = to_omap_crtc_state(state); + struct drm_plane_state *plane_state; - return drm_atomic_plane_set_property(plane, plane_state, - property, val); + /* + * Delegate property set to the primary plane. Get the plane + * state and set the property directly. + */ + plane_state = drm_atomic_get_plane_state(state->state, crtc->primary); + if (IS_ERR(plane_state)) + return PTR_ERR(plane_state); + + if (property == crtc->primary->rotation_property) { + plane_state->rotation = val; + omap_state->rotation = val; + } else if (property == priv->zorder_prop) { + plane_state->zpos = val; + omap_state->zpos = val; + } else { + return -EINVAL; } - return -EINVAL; + return 0; } static int omap_crtc_atomic_get_property(struct drm_crtc *crtc, @@ -538,20 +533,37 @@ static int omap_crtc_atomic_get_property(struct drm_crtc *crtc, struct drm_property *property, uint64_t *val) { - if (omap_crtc_is_plane_prop(crtc, property)) { - /* - * Delegate property get to the primary plane. The - * drm_atomic_plane_get_property() function isn't exported, but - * can be called through drm_object_property_get_value() as that - * will call drm_atomic_get_property() for atomic drivers. - */ - return drm_object_property_get_value(&crtc->primary->base, - property, val); - } + struct omap_drm_private *priv = crtc->dev->dev_private; + struct omap_crtc_state *omap_state = to_omap_crtc_state(state); + + /* + * Remap to the plane rotation/zorder property. We can peek at the plane + * state directly since holding the crtc locks gives you a read-lock on + * the plane state. + */ + if (property == crtc->primary->rotation_property) + return omap_state->rotation; + else if (property == priv->zorder_prop) + return omap_state->zpos; return -EINVAL; } +static struct drm_crtc_state * +omap_crtc_duplicate_state(struct drm_crtc *crtc) +{ + struct omap_crtc_state *state; + + if (WARN_ON(!crtc->state)) + return NULL; + + state = kmalloc(sizeof(*state), GFP_KERNEL); + if (state) + __drm_atomic_helper_crtc_duplicate_state(crtc, &state->base); + + return &state->base; +} + static const struct drm_crtc_funcs omap_crtc_funcs = { .reset = drm_atomic_helper_crtc_reset, .set_config = drm_atomic_helper_set_config, @@ -559,7 +571,7 @@ static const struct drm_crtc_funcs omap_crtc_funcs = { .page_flip = drm_atomic_helper_page_flip, .gamma_set = drm_atomic_helper_legacy_gamma_set, .set_property = drm_atomic_helper_crtc_set_property, - .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, + .atomic_duplicate_state = omap_crtc_duplicate_state, .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, .atomic_set_property = omap_crtc_atomic_set_property, .atomic_get_property = omap_crtc_atomic_get_property, diff --git a/drivers/gpu/drm/omapdrm/omap_drv.h b/drivers/gpu/drm/omapdrm/omap_drv.h index 4bd1e9070b31..11703c174cd8 100644 --- a/drivers/gpu/drm/omapdrm/omap_drv.h +++ b/drivers/gpu/drm/omapdrm/omap_drv.h @@ -115,6 +115,15 @@ static inline void omap_fbdev_free(struct drm_device *dev) } #endif +struct omap_crtc_state { + /* must be first */ + struct drm_crtc_state base; + /* shadow values for legacy userspace support */ + unsigned int rotation; + unsigned int zpos; +}; +#define to_omap_crtc_state(x) container_of(x, struct omap_crtc_state, base) + struct videomode *omap_crtc_timings(struct drm_crtc *crtc); enum omap_channel omap_crtc_channel(struct drm_crtc *crtc); void omap_crtc_pre_init(void);