From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CD9B122CA1C for ; Thu, 16 Jan 2025 15:55:21 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.221.54 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737042923; cv=none; b=DU5ACQISBQWyUQaaUML0JYej0lAIl3xodhjO/5gLTVYeJB336Y4rTzwAhhjkmsWkKaLEXbGEkOIBlDoiHToXXAVSxrwVh6Pp5Uve+zJLJbdyEdlmpR1jeUll/E72rUzRyymWWJSJtLItiJkjaqPVBvagKnWxRIT+FV4nkWUkS+A= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1737042923; c=relaxed/simple; bh=BnlbjfAur9SV29B66rt8tdNsHJ4lwtMGVugzEVoziQg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=VLzJEoVP636ajGC2r4l2h5eTWtN/rHDbMPBIchc4YC9uytk1JWqWLiYo9UX3Beuz0kF3KkcDBBcB55/wZ4006AHd9dP5FQrKpfJolyB/wnYkFUFMFgIe2fDO0V6gLscT0aj9BhTHYMA0IXIPE4XgviWC6HyzUA4rpU/lEwpZcaY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=SET6tUHY; arc=none smtp.client-ip=209.85.221.54 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="SET6tUHY" Received: by mail-wr1-f54.google.com with SMTP id ffacd0b85a97d-38634c35129so932703f8f.3 for ; Thu, 16 Jan 2025 07:55:21 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1737042920; x=1737647720; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=sVCqyZRnVABogFYZlHemJSU6zK7Fqmcj8g6SD+NswyI=; b=SET6tUHYMUWVYLP/oBhzx3I965IKLdoh1YUJ0Q3UekcNREQwR4Wax4AKJCmHWqZw0h 5eZpBteGpb37vjrXYMtZFcpWbH0XMk/7shL7wSElJXVbbjRChsVID2MP2GtXLccoEMhZ 1KY9T+Er+dItH/znB2j1+q1VEtuCtRmq2elzSILSCeenwYxPURhq3yE0PeGHsfw67BkM 4jNIfXDoH5wONs2IqbDZ7yEBmSon9qDyFWO9Qm98HDhAVJS8NNHN/SFUkf0BWPcW9+5C 9fuxvKrbNSsBlNQlcZ3Hx4DbSc5rF1JGhq3a1T0KCXQH4SyqhQyR1XW/DwJMce/HZzI1 aMPA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1737042920; x=1737647720; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=sVCqyZRnVABogFYZlHemJSU6zK7Fqmcj8g6SD+NswyI=; b=vK57pcI5NNpacTNjjPhl/uW6bKuLm5GVzhtI+TzPK02xTJby5okzLLfraLOyubKC4k ENWZR72OkPrYeHaAZGOGmnNDFtsL1pq7C1gstak362UFG+9FqUQu3awvOgviuKkwqDCt /7LgH9jQvyUcmLN8KvqSpAkWf9U+GsphNWX6y+Fh2xRaGuMQTjH3NQp1m5nBJK70Cjxd j+jBmEwu0wXN9idAbdNmh2utQJAhjeCCiIneB8UpYMmL7ZH6nTfMc/22Jxvc8TP6+8wa Kmz0gFJ5c8+i827RmB1/xjDNQHliAdRhmHMc6XLo1KO/QQMvc9v1jOTyi2GdZ2tDLVWq nM4Q== X-Forwarded-Encrypted: i=1; AJvYcCVaxOWJ2IxtBGJdUEA4bOXrc5MBhjgIqbFlKWGBShTfnofTkl/39oKIrhbFwyJ/3QBuMQCXqjhtCQro4VE=@vger.kernel.org X-Gm-Message-State: AOJu0YzgcVqawOVdB4quWyndc0kVhiN4k3Uf28vlkasGvlMDIZ0vp/bM /39F28t1iFKKHkTLlGo1NkFuS4nNxHSmWdvJ4z8sDI4GFiuDIWbk X-Gm-Gg: ASbGncuFCM2OMy6YCAj2hYeNLT01wdQvM2tCWmUu3bYFP0/BAT37lG/kpoziFIgSdw6 3ERvF+YUzxqI29dMW9FnRdkmZ+IsQbQQgsk/GoCvpxpyoBeQwvpjfMnu52dyOapias7OnQUE7Rs Xp4CPoAgJgR7fJ7ngSHTcxRIyV+wIN66qa4gu4o6Ayy524k9DSTdj8ZYbdNk/pWAmmbWDIxMU0O LMZ0nfHuN2fZrPE42Enr2JKheJdrtyWnyQGY3PAvSAvtg1vUKvQHMhOgA== X-Google-Smtp-Source: AGHT+IFJlqywvOdJHeUf8BxrmOH2Ir5tYg75/fLmB/z42rWDQrTa/FDsj8+JOVhMruu4la3CRyUnaw== X-Received: by 2002:a05:6000:402a:b0:38a:418e:1171 with SMTP id ffacd0b85a97d-38a8733063dmr29404524f8f.37.1737042919985; Thu, 16 Jan 2025 07:55:19 -0800 (PST) Received: from fedora.. ([94.73.34.116]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-38bf322ad74sm207726f8f.56.2025.01.16.07.55.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 16 Jan 2025 07:55:19 -0800 (PST) From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= To: louis.chauvet@bootlin.com Cc: airlied@gmail.com, arthurgrillo@riseup.net, dri-devel@lists.freedesktop.org, hamohammed.sa@gmail.com, jeremie.dautheribes@bootlin.com, linux-kernel@vger.kernel.org, maarten.lankhorst@linux.intel.com, mairacanal@riseup.net, melissa.srw@gmail.com, miquel.raynal@bootlin.com, mripard@kernel.org, nicolejadeyee@google.com, rodrigosiqueiramelo@gmail.com, seanpaul@google.com, simona.vetter@ffwll.ch, simona@ffwll.ch, thomas.petazzoni@bootlin.com, tzimmermann@suse.de, =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Subject: [PATCH v8 8/8] drm/vkms: Switch to managed for writeback connector Date: Thu, 16 Jan 2025 16:55:16 +0100 Message-ID: <20250116155516.3505-1-jose.exposito89@gmail.com> X-Mailer: git-send-email 2.47.1 In-Reply-To: <20250114-google-vkms-managed-v8-8-da4254aa3dd5@bootlin.com> References: <20250114-google-vkms-managed-v8-8-da4254aa3dd5@bootlin.com> 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: 8bit > The current VKMS driver uses non-managed function to create > writeback connectors. It is not an issue yet, but in order > to support multiple devices easily, convert this code to > use drm and device managed helpers. > > Acked-by: Thomas Zimmermann > Signed-off-by: Louis Chauvet > Acked-by: Maxime Ripard Reviewed-by: José Expósito Thanks! > --- > drivers/gpu/drm/vkms/vkms_drv.h | 3 ++- > drivers/gpu/drm/vkms/vkms_output.c | 2 +- > drivers/gpu/drm/vkms/vkms_writeback.c | 21 +++++++++++++-------- > 3 files changed, 16 insertions(+), 10 deletions(-) > > diff --git a/drivers/gpu/drm/vkms/vkms_drv.h b/drivers/gpu/drm/vkms/vkms_drv.h > index 00541eff3d1b0aa4b374fb94c8fe34932df31509..46ac36aebb27ce8d9018224735007c1b3fe7d0a5 100644 > --- a/drivers/gpu/drm/vkms/vkms_drv.h > +++ b/drivers/gpu/drm/vkms/vkms_drv.h > @@ -179,6 +179,7 @@ struct vkms_output { > struct drm_encoder encoder; > struct drm_connector connector; > struct drm_writeback_connector wb_connector; > + struct drm_encoder wb_encoder; > struct hrtimer vblank_hrtimer; > ktime_t period_ns; > struct workqueue_struct *composer_workq; > @@ -275,6 +276,6 @@ void vkms_set_composer(struct vkms_output *out, bool enabled); > void vkms_writeback_row(struct vkms_writeback_job *wb, const struct line_buffer *src_buffer, int y); > > /* Writeback */ > -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev); > +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct drm_crtc *crtc); > > #endif /* _VKMS_DRV_H_ */ > diff --git a/drivers/gpu/drm/vkms/vkms_output.c b/drivers/gpu/drm/vkms/vkms_output.c > index ab9affa75b66ce9f00fe025052439405206144ec..de817e2794860f9071a71b3631460691e0d73a85 100644 > --- a/drivers/gpu/drm/vkms/vkms_output.c > +++ b/drivers/gpu/drm/vkms/vkms_output.c > @@ -95,7 +95,7 @@ int vkms_output_init(struct vkms_device *vkmsdev) > } > > if (vkmsdev->config->writeback) { > - writeback = vkms_enable_writeback_connector(vkmsdev); > + writeback = vkms_enable_writeback_connector(vkmsdev, crtc); > if (writeback) > DRM_ERROR("Failed to init writeback connector\n"); > } > diff --git a/drivers/gpu/drm/vkms/vkms_writeback.c b/drivers/gpu/drm/vkms/vkms_writeback.c > index 79918b44fedd7ae2451d1d530fc6d5aabf2d99a3..981975c2b0a0c75e4a3aceca2a965f5876ae0a8f 100644 > --- a/drivers/gpu/drm/vkms/vkms_writeback.c > +++ b/drivers/gpu/drm/vkms/vkms_writeback.c > @@ -24,7 +24,6 @@ static const u32 vkms_wb_formats[] = { > > static const struct drm_connector_funcs vkms_wb_connector_funcs = { > .fill_modes = drm_helper_probe_single_connector_modes, > - .destroy = drm_connector_cleanup, > .reset = drm_atomic_helper_connector_reset, > .atomic_duplicate_state = drm_atomic_helper_connector_duplicate_state, > .atomic_destroy_state = drm_atomic_helper_connector_destroy_state, > @@ -163,16 +162,22 @@ static const struct drm_connector_helper_funcs vkms_wb_conn_helper_funcs = { > .atomic_check = vkms_wb_atomic_check, > }; > > -int vkms_enable_writeback_connector(struct vkms_device *vkmsdev) > +int vkms_enable_writeback_connector(struct vkms_device *vkmsdev, struct drm_crtc *crtc) > { > struct drm_writeback_connector *wb = &vkmsdev->output.wb_connector; > + int ret; > + > + ret = drmm_encoder_init(&vkmsdev->drm, &vkmsdev->output.wb_encoder, > + NULL, DRM_MODE_ENCODER_VIRTUAL, NULL); > + if (ret) > + return ret; > + vkmsdev->output.wb_encoder.possible_crtcs |= drm_crtc_mask(crtc); > > drm_connector_helper_add(&wb->base, &vkms_wb_conn_helper_funcs); > > - return drm_writeback_connector_init(&vkmsdev->drm, wb, > - &vkms_wb_connector_funcs, > - NULL, > - vkms_wb_formats, > - ARRAY_SIZE(vkms_wb_formats), > - 1); > + return drmm_writeback_connector_init(&vkmsdev->drm, wb, > + &vkms_wb_connector_funcs, > + &vkmsdev->output.wb_encoder, > + vkms_wb_formats, > + ARRAY_SIZE(vkms_wb_formats)); > } >