From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mx0b-0031df01.pphosted.com (mx0b-0031df01.pphosted.com [205.220.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 205EE2F39B9 for ; Sun, 26 Jul 2026 19:46:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=205.220.180.131 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785095196; cv=none; b=VLzBM6kxyPrU/c+bFdLjiLx96ZGo2C9xchzTRbHqU4mAMXIn12T3t0w6id+CSOF9cS7J76kLKA45fc8bZQNCWQcIE/Xp4S6W62rNTpKiVGALYTbQWifme4SjQJW8sKhHLZ5TeAT8bVZGpUvkBpVrXttoRaNTKjr7A7FKUQ5n7/A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785095196; c=relaxed/simple; bh=NmucV5CCjzj7Nlqkd8e6k9piLvqw3AS+j5eg74TtwPQ=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=cxcCxFuxuWbU6ImdD4R98h+GNtwaaFxkmfi+XxeTjIenw6sBLgwYPjf+DuOBePCRk7cUdh3wqTo5StS307fEQHoik5wgSZJjhtTpg7SmYpZA7Rt77xPpw6ffm9YyZzMJ6YRUEj18OPcJafq8TpUyub0vYFatMkFCY5Nk7g1o+7I= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com; spf=pass smtp.mailfrom=oss.qualcomm.com; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b=ZwaROpRz; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b=DTJZM9Ld; arc=none smtp.client-ip=205.220.180.131 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=oss.qualcomm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=qualcomm.com header.i=@qualcomm.com header.b="ZwaROpRz"; dkim=pass (2048-bit key) header.d=oss.qualcomm.com header.i=@oss.qualcomm.com header.b="DTJZM9Ld" Received: from pps.filterd (m0279873.ppops.net [127.0.0.1]) by mx0a-0031df01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 66QH76Ha1191707 for ; Sun, 26 Jul 2026 19:46:34 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=qualcomm.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=qcppdkim1; bh= RIT/YdveRXHCHmeSie5y94xV6nzoryIRKFmpSYIUXRA=; b=ZwaROpRzU254FZLM HzwzK+If0tvXkekx9356vkGBxZeSi+2aP3PkGnsgazA0yGr3Puia8PFG0LDlk3E6 iBS6B31v84DNIKM8duK51OfoEX9GWarY/AQqKQ+yMqe9p/qOc8sXvlD6G+kDO3cy Ijo+6Q76t3fV+6PNh+jzUvrNLwbyAXokTrHgXsKP1zI7QH3td3nClwW5tKKvvyuJ ffjsuATkANFvm40D6mIKne63oA5+Z837G23rKEr6rOMa69adOFvPSkBBmpAj4IR/ OmYz5WJm9byJdrx1o3Tw/Qcf3BJ0WK2qGbL97ModtAOInL2FujpfhUmiw/07V7UV 6+yO+A== Received: from mail-pj1-f72.google.com (mail-pj1-f72.google.com [209.85.216.72]) by mx0a-0031df01.pphosted.com (PPS) with ESMTPS id 4fmjgn3yqb-1 (version=TLSv1.3 cipher=TLS_AES_128_GCM_SHA256 bits=128 verify=NOT) for ; Sun, 26 Jul 2026 19:46:34 +0000 (GMT) Received: by mail-pj1-f72.google.com with SMTP id 98e67ed59e1d1-38e7b87ce77so5059253a91.0 for ; Sun, 26 Jul 2026 12:46:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oss.qualcomm.com; s=google; t=1785095193; x=1785699993; darn=vger.kernel.org; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:from:to:cc:subject:date :message-id:reply-to:content-type; bh=RIT/YdveRXHCHmeSie5y94xV6nzoryIRKFmpSYIUXRA=; b=DTJZM9Ld1uWS/R0ZgYxuY4PxaGOTtYCY74X/spwQcAtGx4iUW2Ymhfh27PnoPwvH/9 4V/2GSv4M07XghID+QxVC6cZoOZrcJQd7w/ChJrwnqy6mTrtwQy0KitdwRjmjuLe9n9V bb7EOaYUeWiDn85mn9jT0AqkjFNALnN45JrbXE0WublXiVJH8Tbg4Pz1YtJ6n5G40H17 f84RUQFWrrt9AfSOhNtV0VaujPKJ2Y3wXrURzXYNtCH/n4rpbiMBq2soOQvjd8a1wT8q Z70R0aVhJbax6gv1qISdePgbb1RB9A7aJUIvsQL2wS8LpU07b4GUdKjv1FmdZmcjkymq v2rQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785095193; x=1785699993; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :content-type:mime-version:subject:date:from:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to :content-type; bh=RIT/YdveRXHCHmeSie5y94xV6nzoryIRKFmpSYIUXRA=; b=Q0xS8DiI/ZrJeOKR/pGGaBbZVgy5WjcsH3zwxGsTwkfTyKrxhfFQOQGEBfkGs3qP6i e14XURdIyLoGrFpDvVpq81soqo9y9gm0QirksH8t18BdOUA75xw5PvAeKPmrrp3x9in/ 1GfWsKGDi6RGbmCOHuZQpQQkL3g1aJejvULHgR7jKBEDSxIP6r2lAl2FjcSniXGXm8an boi+q8EjlqL8dxHyfUb0aMJeMOPP6yc3h/sDXSjAqMKpuzZTU/QHKXDP/lAkR9iej9Ad 8pgDouZzNfnGaeRtz1ri+VQwSSgZA/AhYsLXVzGEHs5+bbgwaakq2hF/R3lB9rZUuLI/ euOA== X-Forwarded-Encrypted: i=1; AHgh+Ro1vhyXmPZ0/DAG8tCW5nvVq8l4gZF6ZZtF2nWbNyC9rxX0Hs7Vy9x2pW/lva0VejFCUShAlQKg1LYBx6U=@vger.kernel.org X-Gm-Message-State: AOJu0YzmSj7oNnvYEwadFtNHG1L8ZmhnSekN/0T9GE67LcDq+74JkaKk Mm/VzKwpmJ2hTNsiIt4KXWO98JB4DoU691K+qN1HLsmGtPFEffRp8Xhq8myd2zF/7miq605o9Xu t4nTbiOOMAmbpCkGvdVnGps3P5NolHVHzvCrokHi4T4HoKd5vL3kf73nA3FZV5oZprHI= X-Gm-Gg: AR+sD10ugFVWzoPTuVOlZJhUqecxn2cK7l46rSgaAUu4xNhibd5vkVRqQTgxxe0xUcP WqrzU5voaKi6mx/FpyN7StfkGaf47hG+bDIrIdOp+KuW2O7PwLis50+UyMb50vIEwCLQC+XmII2 ca4MFM7gJ64G6bN2dIGicFY3w+o09iNtkIsOI1gBr0wTeBq1NQcrNwjl2k38jcFjn4pLMrNecq9 p690BQEZh3mwGEnDApC1pQLco6SZgruOOo0poGtFp1Jrg4k7VR+pKHH2+XepUrWAnPBWYtWBPgA ofO3Cf82dM9MEDYJX50/GBuH0ETBjYhJloeNWESBZx01eVEobrhT1AHGccRwzeF1Mck9NQcYrgA SZrCOdq2ECscgGI4v90kb X-Received: by 2002:a17:90b:3c8f:b0:381:20b:a9ee with SMTP id 98e67ed59e1d1-38f294ea029mr5694022a91.14.1785095192856; Sun, 26 Jul 2026 12:46:32 -0700 (PDT) X-Received: by 2002:a17:90b:3c8f:b0:381:20b:a9ee with SMTP id 98e67ed59e1d1-38f294ea029mr5693998a91.14.1785095192443; Sun, 26 Jul 2026 12:46:32 -0700 (PDT) Received: from le-cd01-lnx.qualcomm.com ([114.94.8.21]) by smtp.gmail.com with ESMTPSA id 98e67ed59e1d1-38f03b0eaa8sm4105998a91.8.2026.07.26.12.46.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 26 Jul 2026 12:46:31 -0700 (PDT) From: Ze Huang Date: Mon, 27 Jul 2026 03:45:20 +0800 Subject: [PATCH v3 7/8] drm/tve200: replace struct drm_simple_display_pipe with regular atomic helpers Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260727-drm-simple-kms-removal-v3-7-cd5dc89858c6@oss.qualcomm.com> References: <20260727-drm-simple-kms-removal-v3-0-cd5dc89858c6@oss.qualcomm.com> In-Reply-To: <20260727-drm-simple-kms-removal-v3-0-cd5dc89858c6@oss.qualcomm.com> To: Alexey Brodkin , Maarten Lankhorst , Maxime Ripard , Thomas Zimmermann , David Airlie , Simona Vetter , Joel Stanley , Andrew Jeffery , Frank Li , Sascha Hauer , Pengutronix Kernel Team , Fabio Estevam , Linus Walleij , Hans de Goede , Alex Lanzano , Oleksandr Andrushchenko Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-aspeed@lists.ozlabs.org, linux-arm-kernel@lists.infradead.org, imx@lists.linux.dev, xen-devel@lists.xenproject.org, Ze Huang X-Mailer: b4 0.14.3 X-Developer-Signature: v=1; a=ed25519-sha256; t=1785095129; l=12903; i=ze.huang@oss.qualcomm.com; s=20260716; h=from:subject:message-id; bh=NmucV5CCjzj7Nlqkd8e6k9piLvqw3AS+j5eg74TtwPQ=; b=2v+CnN4SAJOjYYvRfoANU7FsIYuqjDhG+R7/Z9COJbJkOsOkf3MOaQYiiFS2Ybx4cazb/WoAQ MzjVTJ1EQJAAulixbZFUGSjnMRDfI90HH9C0hpfOzNpi0EHSUOozr1U X-Developer-Key: i=ze.huang@oss.qualcomm.com; a=ed25519; pk=8uGhlZHInA8NXq7G6u/g59qEcwXwuMRI7nBSnT/ijtY= X-Proofpoint-GUID: YVmwWp2O0VK968OwM9pfS77kysJhHoqK X-Authority-Analysis: v=2.4 cv=HMHz0Itv c=1 sm=1 tr=0 ts=6a66641a cx=c_pps a=RP+M6JBNLl+fLTcSJhASfg==:117 a=Uz3yg00KUFJ2y2WijEJ4bw==:17 a=IkcTkHD0fZMA:10 a=RAioF0-LDSMA:10 a=s4-Qcg_JpJYA:10 a=VkNPw1HP01LnGYTKEx00:22 a=u7WPNUs3qKkmUXheDGA7:22 a=rJkE3RaqiGZ5pbrm-msn:22 a=EUspDBNiAAAA:8 a=dgwnEUiFKTnKxPjcC9oA:9 a=QEXdDO2ut3YA:10 a=iS9zxrgQBfv6-_F4QbHw:22 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNzI2MDIwMSBTYWx0ZWRfX9Nk6vfSLSTcw vlRiqn39aim+bvX8jVJFpdKYf5suSUWiwQv+aS/aULCeEDlqylW3/a4wpPHIy1rZMwX5YiCDBX6 oeJfayYNYs3S6nwYFAAnFIUzAlSNZQMjiHrBYsqvGfJOFhZx8cNsuwfNmmSOMfCpFpMI9qvFeYh aDUNPCAPzMofpVGHtAah7z4nsEghEA7MA8WSO7MEDqEICZM6+J3dCCbXs/IXP/iQ3s9Pb3JfTtt AXfkfaDQ2NQ/2MJ71pHKftC2CAbmx3vzdXh9Rpa2zLGByCKKTg70jgjIEUOy0npzRbCDTeN6php 1J9uJIiSxKtXRbwL1wlyP2Xq3tj486D2cK9pcDvDj/pTKFyowai/c1JK7XRskcCdnoyRPXAxmaj znBU8kEuNCL5rQufOy9h1afStqkcyi3GMyM2nlrgLT8QILwc2d3aApB3/My4g10luKKSG8ZJCUu l0sY1e+xlbn8YB6eLMQ== X-Proofpoint-Spam-Info: AW1haW4tMjYwNzI2MDIwMSBTYWx0ZWRfX4I+85A/Yizks bydAUf/aglP2N7KujO7Hfop3grTr8lzSrQVRqjkn8LN8l1gBSbIZzZ0jUClrf/ZaHgWr5Q6nN3Y FuabAQKa6bIUcRPIAsSwjpP8XKSv5ZM= X-Proofpoint-ORIG-GUID: YVmwWp2O0VK968OwM9pfS77kysJhHoqK X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-07-26_05,2026-07-24_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 phishscore=0 lowpriorityscore=0 impostorscore=0 suspectscore=0 bulkscore=0 clxscore=1015 priorityscore=1501 malwarescore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2607260201 Convert TVE200 to explicit plane, CRTC and encoder objects. Keep generic plane-state validation before TVE200-specific mode, alignment, pitch and format-change checks. Install the GEM framebuffer prepare helper explicitly. Use commit-local plane state in the CRTC enable path when programming framebuffer format state. Move page-flip event handling to the CRTC commit path and wire the CRTC vblank callbacks explicitly. Signed-off-by: Ze Huang --- Changes in v3: - Use commit-local plane state in the CRTC enable path. --- drivers/gpu/drm/tve200/tve200_display.c | 219 ++++++++++++++++++++++---------- drivers/gpu/drm/tve200/tve200_drm.h | 6 +- drivers/gpu/drm/tve200/tve200_drv.c | 12 +- 3 files changed, 163 insertions(+), 74 deletions(-) diff --git a/drivers/gpu/drm/tve200/tve200_display.c b/drivers/gpu/drm/tve200/tve200_display.c index 26b6c65ef6fd..beb3a5a63b5d 100644 --- a/drivers/gpu/drm/tve200/tve200_display.c +++ b/drivers/gpu/drm/tve200/tve200_display.c @@ -15,6 +15,8 @@ #include #include +#include +#include #include #include #include @@ -52,7 +54,7 @@ irqreturn_t tve200_irq(int irq, void *data) val = readl(priv->regs + TVE200_CTRL); /* We have an actual start of vsync */ if (!(val & TVE200_VSTSTYPE_BITS)) { - drm_crtc_handle_vblank(&priv->pipe.crtc); + drm_crtc_handle_vblank(&priv->crtc); /* Toggle trigger to start of active image */ val |= TVE200_VSTSTYPE_VAI; } else { @@ -69,13 +71,34 @@ irqreturn_t tve200_irq(int irq, void *data) return IRQ_HANDLED; } -static int tve200_display_check(struct drm_simple_display_pipe *pipe, - struct drm_plane_state *pstate, - struct drm_crtc_state *cstate) +static int tve200_plane_helper_atomic_check(struct drm_plane *plane, + struct drm_atomic_commit *commit) { - const struct drm_display_mode *mode = &cstate->mode; - struct drm_framebuffer *old_fb = pipe->plane.state->fb; + struct drm_plane_state *pstate = drm_atomic_get_new_plane_state(commit, plane); + struct drm_plane_state *old_pstate = drm_atomic_get_old_plane_state(commit, plane); + struct drm_crtc_state *cstate = NULL; + const struct drm_display_mode *mode; + struct drm_framebuffer *old_fb = old_pstate->fb; struct drm_framebuffer *fb = pstate->fb; + int ret; + + if (pstate->crtc) { + cstate = drm_atomic_get_crtc_state(commit, pstate->crtc); + if (IS_ERR(cstate)) + return PTR_ERR(cstate); + } + + ret = drm_atomic_helper_check_plane_state(pstate, cstate, + DRM_PLANE_NO_SCALING, + DRM_PLANE_NO_SCALING, + false, false); + if (ret) + return ret; + + if (!pstate->visible || !cstate) + return 0; + + mode = &cstate->mode; /* * We support these specific resolutions and nothing else. @@ -119,16 +142,72 @@ static int tve200_display_check(struct drm_simple_display_pipe *pipe, return 0; } -static void tve200_display_enable(struct drm_simple_display_pipe *pipe, - struct drm_crtc_state *cstate, - struct drm_plane_state *plane_state) +static void tve200_plane_helper_atomic_update(struct drm_plane *plane, + struct drm_atomic_commit *commit) +{ + struct tve200_drm_dev_private *priv = plane->dev->dev_private; + struct drm_plane_state *pstate = drm_atomic_get_new_plane_state(commit, plane); + struct drm_framebuffer *fb = pstate->fb; + + if (!fb) + return; + + /* For RGB, the Y component is used as base address */ + writel(drm_fb_dma_get_gem_addr(fb, pstate, 0), + priv->regs + TVE200_Y_FRAME_BASE_ADDR); + + /* For three plane YUV we need two more addresses */ + if (fb->format->format == DRM_FORMAT_YUV420) { + writel(drm_fb_dma_get_gem_addr(fb, pstate, 1), + priv->regs + TVE200_U_FRAME_BASE_ADDR); + writel(drm_fb_dma_get_gem_addr(fb, pstate, 2), + priv->regs + TVE200_V_FRAME_BASE_ADDR); + } +} + +static void tve200_crtc_helper_atomic_flush(struct drm_crtc *crtc, + struct drm_atomic_commit *commit) +{ + struct drm_crtc_state *cstate = drm_atomic_get_new_crtc_state(commit, crtc); + struct drm_pending_vblank_event *event = cstate->event; + + if (!event) + return; + + cstate->event = NULL; + + spin_lock_irq(&crtc->dev->event_lock); + if (cstate->active && drm_crtc_vblank_get(crtc) == 0) + drm_crtc_arm_vblank_event(crtc, event); + else + drm_crtc_send_vblank_event(crtc, event); + spin_unlock_irq(&crtc->dev->event_lock); +} + +static const struct drm_plane_helper_funcs tve200_plane_helper_funcs = { + .prepare_fb = drm_gem_plane_helper_prepare_fb, + .atomic_check = tve200_plane_helper_atomic_check, + .atomic_update = tve200_plane_helper_atomic_update, +}; + +static const struct drm_plane_funcs tve200_plane_funcs = { + .update_plane = drm_atomic_helper_update_plane, + .disable_plane = drm_atomic_helper_disable_plane, + .destroy = drm_plane_cleanup, + .reset = drm_atomic_helper_plane_reset, + .atomic_duplicate_state = drm_atomic_helper_plane_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_plane_destroy_state, +}; + +static void tve200_crtc_helper_atomic_enable(struct drm_crtc *crtc, + struct drm_atomic_commit *commit) { - struct drm_crtc *crtc = &pipe->crtc; - struct drm_plane *plane = &pipe->plane; struct drm_device *drm = crtc->dev; struct tve200_drm_dev_private *priv = drm->dev_private; + struct drm_crtc_state *cstate = drm_atomic_get_new_crtc_state(commit, crtc); const struct drm_display_mode *mode = &cstate->mode; - struct drm_framebuffer *fb = plane->state->fb; + struct drm_plane_state *plane_state = drm_atomic_get_new_plane_state(commit, &priv->plane); + struct drm_framebuffer *fb = plane_state->fb; struct drm_connector *connector = priv->connector; u32 format = fb->format->format; u32 ctrl1 = 0; @@ -240,9 +319,9 @@ static void tve200_display_enable(struct drm_simple_display_pipe *pipe, drm_crtc_vblank_on(crtc); } -static void tve200_display_disable(struct drm_simple_display_pipe *pipe) +static void tve200_crtc_helper_atomic_disable(struct drm_crtc *crtc, + struct drm_atomic_commit *commit) { - struct drm_crtc *crtc = &pipe->crtc; struct drm_device *drm = crtc->dev; struct tve200_drm_dev_private *priv = drm->dev_private; @@ -255,46 +334,8 @@ static void tve200_display_disable(struct drm_simple_display_pipe *pipe) clk_disable_unprepare(priv->clk); } -static void tve200_display_update(struct drm_simple_display_pipe *pipe, - struct drm_plane_state *old_pstate) +static int tve200_crtc_enable_vblank(struct drm_crtc *crtc) { - struct drm_crtc *crtc = &pipe->crtc; - struct drm_device *drm = crtc->dev; - struct tve200_drm_dev_private *priv = drm->dev_private; - struct drm_pending_vblank_event *event = crtc->state->event; - struct drm_plane *plane = &pipe->plane; - struct drm_plane_state *pstate = plane->state; - struct drm_framebuffer *fb = pstate->fb; - - if (fb) { - /* For RGB, the Y component is used as base address */ - writel(drm_fb_dma_get_gem_addr(fb, pstate, 0), - priv->regs + TVE200_Y_FRAME_BASE_ADDR); - - /* For three plane YUV we need two more addresses */ - if (fb->format->format == DRM_FORMAT_YUV420) { - writel(drm_fb_dma_get_gem_addr(fb, pstate, 1), - priv->regs + TVE200_U_FRAME_BASE_ADDR); - writel(drm_fb_dma_get_gem_addr(fb, pstate, 2), - priv->regs + TVE200_V_FRAME_BASE_ADDR); - } - } - - if (event) { - crtc->state->event = NULL; - - spin_lock_irq(&crtc->dev->event_lock); - if (crtc->state->active && drm_crtc_vblank_get(crtc) == 0) - drm_crtc_arm_vblank_event(crtc, event); - else - drm_crtc_send_vblank_event(crtc, event); - spin_unlock_irq(&crtc->dev->event_lock); - } -} - -static int tve200_display_enable_vblank(struct drm_simple_display_pipe *pipe) -{ - struct drm_crtc *crtc = &pipe->crtc; struct drm_device *drm = crtc->dev; struct tve200_drm_dev_private *priv = drm->dev_private; @@ -304,22 +345,48 @@ static int tve200_display_enable_vblank(struct drm_simple_display_pipe *pipe) return 0; } -static void tve200_display_disable_vblank(struct drm_simple_display_pipe *pipe) +static void tve200_crtc_disable_vblank(struct drm_crtc *crtc) { - struct drm_crtc *crtc = &pipe->crtc; struct drm_device *drm = crtc->dev; struct tve200_drm_dev_private *priv = drm->dev_private; writel(0, priv->regs + TVE200_INT_EN); } -static const struct drm_simple_display_pipe_funcs tve200_display_funcs = { - .check = tve200_display_check, - .enable = tve200_display_enable, - .disable = tve200_display_disable, - .update = tve200_display_update, - .enable_vblank = tve200_display_enable_vblank, - .disable_vblank = tve200_display_disable_vblank, +static int tve200_crtc_helper_atomic_check(struct drm_crtc *crtc, struct drm_atomic_commit *commit) +{ + struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(commit, crtc); + int ret; + + if (crtc_state->enable) { + ret = drm_atomic_helper_check_crtc_primary_plane(crtc_state); + if (ret) + return ret; + } + + return drm_atomic_add_affected_planes(commit, crtc); +} + +static const struct drm_crtc_helper_funcs tve200_crtc_helper_funcs = { + .atomic_check = tve200_crtc_helper_atomic_check, + .atomic_enable = tve200_crtc_helper_atomic_enable, + .atomic_disable = tve200_crtc_helper_atomic_disable, + .atomic_flush = tve200_crtc_helper_atomic_flush, +}; + +static const struct drm_crtc_funcs tve200_crtc_funcs = { + .reset = drm_atomic_helper_crtc_reset, + .destroy = drm_crtc_cleanup, + .set_config = drm_atomic_helper_set_config, + .page_flip = drm_atomic_helper_page_flip, + .atomic_duplicate_state = drm_atomic_helper_crtc_duplicate_state, + .atomic_destroy_state = drm_atomic_helper_crtc_destroy_state, + .enable_vblank = tve200_crtc_enable_vblank, + .disable_vblank = tve200_crtc_disable_vblank, +}; + +static const struct drm_encoder_funcs tve200_encoder_funcs = { + .destroy = drm_encoder_cleanup, }; int tve200_display_init(struct drm_device *drm) @@ -346,13 +413,31 @@ int tve200_display_init(struct drm_device *drm) DRM_FORMAT_YUV420, }; - ret = drm_simple_display_pipe_init(drm, &priv->pipe, - &tve200_display_funcs, - formats, ARRAY_SIZE(formats), - NULL, - priv->connector); + ret = drm_universal_plane_init(drm, &priv->plane, 0, + &tve200_plane_funcs, + formats, ARRAY_SIZE(formats), + NULL, + DRM_PLANE_TYPE_PRIMARY, NULL); if (ret) return ret; + drm_plane_helper_add(&priv->plane, &tve200_plane_helper_funcs); + + ret = drm_crtc_init_with_planes(drm, &priv->crtc, + &priv->plane, NULL, + &tve200_crtc_funcs, NULL); + if (ret) + return ret; + + drm_crtc_helper_add(&priv->crtc, &tve200_crtc_helper_funcs); + + ret = drm_encoder_init(drm, &priv->encoder, + &tve200_encoder_funcs, + DRM_MODE_ENCODER_NONE, NULL); + if (ret) + return ret; + + priv->encoder.possible_crtcs = drm_crtc_mask(&priv->crtc); + return 0; } diff --git a/drivers/gpu/drm/tve200/tve200_drm.h b/drivers/gpu/drm/tve200/tve200_drm.h index 5420b52ea16b..631a9f5d9aa6 100644 --- a/drivers/gpu/drm/tve200/tve200_drm.h +++ b/drivers/gpu/drm/tve200/tve200_drm.h @@ -15,8 +15,6 @@ #include -#include - struct clk; struct drm_bridge; struct drm_connector; @@ -107,7 +105,9 @@ struct tve200_drm_dev_private { struct drm_connector *connector; struct drm_panel *panel; struct drm_bridge *bridge; - struct drm_simple_display_pipe pipe; + struct drm_plane plane; + struct drm_crtc crtc; + struct drm_encoder encoder; void *regs; struct clk *pclk; diff --git a/drivers/gpu/drm/tve200/tve200_drv.c b/drivers/gpu/drm/tve200/tve200_drv.c index 562f3f11812a..0b8096b1e600 100644 --- a/drivers/gpu/drm/tve200/tve200_drv.c +++ b/drivers/gpu/drm/tve200/tve200_drv.c @@ -105,16 +105,20 @@ static int tve200_modeset_init(struct drm_device *dev) goto out_bridge; } - ret = drm_simple_display_pipe_attach_bridge(&priv->pipe, - bridge); + priv->panel = panel; + priv->bridge = bridge; + + ret = drm_bridge_attach(&priv->encoder, bridge, NULL, 0); if (ret) { dev_err(dev->dev, "failed to attach bridge\n"); goto out_bridge; } - priv->panel = panel; priv->connector = drm_panel_bridge_connector(bridge); - priv->bridge = bridge; + if (!priv->connector) { + ret = -ENODEV; + goto out_bridge; + } dev_info(dev->dev, "attached to panel %s\n", dev_name(panel->dev)); -- 2.43.0