[RFC,v1,46/52] drm/vc4: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev

Message ID	20230712094702.1770121-47-u.kleine-koenig@pengutronix.de (mailing list archive)
State	Rejected, archived
Headers	show Return-Path: <dri-devel-bounces@lists.freedesktop.org> From: =?utf-8?q?Uwe_Kleine-K=C3=B6nig?= <u.kleine-koenig@pengutronix.de> To: Emma Anholt <emma@anholt.net>, Maxime Ripard <mripard@kernel.org>, David Airlie <airlied@gmail.com>, Daniel Vetter <daniel@ffwll.ch> Subject: [PATCH RFC v1 46/52] drm/vc4: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev Date: Wed, 12 Jul 2023 11:46:56 +0200 Message-Id: <20230712094702.1770121-47-u.kleine-koenig@pengutronix.de> In-Reply-To: <20230712094702.1770121-1-u.kleine-koenig@pengutronix.de> References: <20230712094702.1770121-1-u.kleine-koenig@pengutronix.de> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: list Cc: kernel@pengutronix.de, dri-devel@lists.freedesktop.org Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" <dri-devel-bounces@lists.freedesktop.org>
Series	drm/crtc: Rename struct drm_crtc::dev to drm_dev \| expand [RFC,v1,00/52] drm/crtc: Rename struct drm_crtc::dev to drm_dev [RFC,v1,01/52] drm/crtc: Start renaming struct drm_crtc::dev to drm_dev [RFC,v1,02/52] drm/core: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,03/52] drm/amd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,04/52] drm/armada: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,05/52] drm/arm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,06/52] drm/aspeed: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,07/52] drm/ast: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,08/52] drm/atmel-hlcdc: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,09/52] drm/exynos: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,10/52] drm/fsl-dcu: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,11/52] drm/gma500: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,12/52] drm/gud: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,13/52] drm/hisilicon: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,14/52] drm/hyperv: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,15/52] drm/i915: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,16/52] drm/imx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,17/52] drm/ingenic: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,18/52] drm/kmb: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,19/52] drm/logicvc: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,20/52] drm/mcde: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,21/52] drm/mediatek: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,22/52] drm/meson: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,23/52] drm/mgag200: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,24/52] drm/msm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,25/52] drm/mxsfb: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,26/52] drm/nouveau: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,27/52] drm/omapdrm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,28/52] drm/panel-ili9341: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,29/52] drm/pl111: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,30/52] drm/qxl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,31/52] drm/radeon: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,32/52] drm/renesas: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,33/52] drm/rockchip: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,34/52] drm/solomon: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,35/52] drm/sprd: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,36/52] drm/sti: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,37/52] drm/stm: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,38/52] drm/sun4i: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,39/52] drm/tegra: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,40/52] drm/tidss: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,41/52] drm/tilcdc: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,42/52] drm/tiny: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,43/52] drm/tve200: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,44/52] drm/udl: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,45/52] drm/vboxvideo: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,46/52] drm/vc4: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,47/52] drm/virtio: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,48/52] drm/vkms: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,49/52] drm/vmwgfx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,50/52] drm/xen: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,51/52] drm/xlnx: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev [RFC,v1,52/52] drm/crtc: Complete renaming struct drm_crtc::dev to drm_dev

diff --git a/drivers/gpu/drm/vc4/vc4_crtc.c b/drivers/gpu/drm/vc4/vc4_crtc.c index bef9d45ef1df..09e65d322f1d 100644 --- a/drivers/gpu/drm/vc4/vc4_crtc.c +++ b/drivers/gpu/drm/vc4/vc4_crtc.c @@ -99,7 +99,7 @@ static bool vc4_crtc_get_scanout_position(struct drm_crtc *crtc, ktime_t *stime, ktime_t *etime, const struct drm_display_mode *mode) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_hvs *hvs = vc4->hvs; struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); @@ -220,7 +220,7 @@ static u32 vc4_get_fifo_full_level(struct vc4_crtc *vc4_crtc, u32 format) { const struct vc4_crtc_data *crtc_data = vc4_crtc_to_vc4_crtc_data(vc4_crtc); const struct vc4_pv_data *pv_data = vc4_crtc_to_vc4_pv_data(vc4_crtc); - struct vc4_dev *vc4 = to_vc4_dev(vc4_crtc->base.dev); + struct vc4_dev *vc4 = to_vc4_dev(vc4_crtc->base.drm_dev); u32 fifo_len_bytes = pv_data->fifo_depth; /* @@ -296,7 +296,7 @@ struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc, WARN_ON(hweight32(state->encoder_mask) > 1); - drm_for_each_encoder_mask(encoder, crtc->dev, state->encoder_mask) + drm_for_each_encoder_mask(encoder, crtc->drm_dev, state->encoder_mask) return encoder; return NULL; @@ -305,7 +305,7 @@ struct drm_encoder *vc4_get_crtc_encoder(struct drm_crtc *crtc, static void vc4_crtc_pixelvalve_reset(struct drm_crtc *crtc) { struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; int idx; if (!drm_dev_enter(dev, &idx)) @@ -321,7 +321,7 @@ static void vc4_crtc_pixelvalve_reset(struct drm_crtc *crtc) static void vc4_crtc_config_pv(struct drm_crtc *crtc, struct drm_encoder *encoder, struct drm_atomic_state *state) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder); struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); @@ -468,7 +468,7 @@ static int vc4_crtc_disable(struct drm_crtc *crtc, { struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder); struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); int idx, ret; @@ -514,7 +514,7 @@ static int vc4_crtc_disable(struct drm_crtc *crtc, int vc4_crtc_disable_at_boot(struct drm_crtc *crtc) { - struct drm_device *drm = crtc->dev; + struct drm_device *drm = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(drm); struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); enum vc4_encoder_type encoder_type; @@ -571,7 +571,7 @@ int vc4_crtc_disable_at_boot(struct drm_crtc *crtc) void vc4_crtc_send_vblank(struct drm_crtc *crtc) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; unsigned long flags; if (!crtc->state || !crtc->state->event) @@ -590,7 +590,7 @@ static void vc4_crtc_atomic_disable(struct drm_crtc *crtc, crtc); struct vc4_crtc_state *old_vc4_state = to_vc4_crtc_state(old_state); struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, old_state); - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; drm_dbg(dev, "Disabling CRTC %s (%u) connected to Encoder %s (%u)", crtc->name, crtc->base.id, encoder->name, encoder->base.id); @@ -614,7 +614,7 @@ static void vc4_crtc_atomic_enable(struct drm_crtc *crtc, { struct drm_crtc_state *new_state = drm_atomic_get_new_crtc_state(state, crtc); - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); struct drm_encoder *encoder = vc4_get_crtc_encoder(crtc, new_state); struct vc4_encoder *vc4_encoder = to_vc4_encoder(encoder); @@ -747,7 +747,7 @@ int vc4_crtc_atomic_check(struct drm_crtc *crtc, static int vc4_enable_vblank(struct drm_crtc *crtc) { struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; int idx; if (!drm_dev_enter(dev, &idx)) @@ -763,7 +763,7 @@ static int vc4_enable_vblank(struct drm_crtc *crtc) static void vc4_disable_vblank(struct drm_crtc *crtc) { struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; int idx; if (!drm_dev_enter(dev, &idx)) @@ -777,7 +777,7 @@ static void vc4_disable_vblank(struct drm_crtc *crtc) static void vc4_crtc_handle_page_flip(struct vc4_crtc *vc4_crtc) { struct drm_crtc *crtc = &vc4_crtc->base; - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_hvs *hvs = vc4->hvs; u32 chan = vc4_crtc->current_hvs_channel; @@ -845,7 +845,7 @@ static void vc4_async_page_flip_complete(struct vc4_async_flip_state *flip_state) { struct drm_crtc *crtc = flip_state->crtc; - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct drm_plane *plane = crtc->primary; vc4_plane_async_set_fb(plane, flip_state->fb); @@ -943,7 +943,7 @@ vc4_async_page_flip_common(struct drm_crtc *crtc, struct drm_pending_vblank_event *event, uint32_t flags) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct drm_plane *plane = crtc->primary; struct vc4_async_flip_state *flip_state; @@ -993,7 +993,7 @@ static int vc4_async_page_flip(struct drm_crtc *crtc, struct drm_pending_vblank_event *event, uint32_t flags) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); struct drm_gem_dma_object *dma_bo = drm_fb_dma_get_gem_obj(fb, 0); struct vc4_bo *bo = to_vc4_bo(&dma_bo->base); @@ -1039,7 +1039,7 @@ int vc4_page_flip(struct drm_crtc *crtc, struct drm_modeset_acquire_ctx *ctx) { if (flags & DRM_MODE_PAGE_FLIP_ASYNC) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); if (vc4->is_vc5) @@ -1070,7 +1070,7 @@ struct drm_crtc_state *vc4_crtc_duplicate_state(struct drm_crtc *crtc) void vc4_crtc_destroy_state(struct drm_crtc *crtc, struct drm_crtc_state *state) { - struct vc4_dev *vc4 = to_vc4_dev(crtc->dev); + struct vc4_dev *vc4 = to_vc4_dev(crtc->drm_dev); struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(state); if (drm_mm_node_allocated(&vc4_state->mm)) { @@ -1104,7 +1104,7 @@ void vc4_crtc_reset(struct drm_crtc *crtc) int vc4_crtc_late_register(struct drm_crtc *crtc) { - struct drm_device *drm = crtc->dev; + struct drm_device *drm = crtc->drm_dev; struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); const struct vc4_crtc_data *crtc_data = vc4_crtc_to_vc4_crtc_data(vc4_crtc); diff --git a/drivers/gpu/drm/vc4/vc4_hdmi.c b/drivers/gpu/drm/vc4/vc4_hdmi.c index 5261526d286f..ed9a5273674e 100644 --- a/drivers/gpu/drm/vc4/vc4_hdmi.c +++ b/drivers/gpu/drm/vc4/vc4_hdmi.c @@ -304,7 +304,7 @@ static int reset_pipe(struct drm_crtc *crtc, struct drm_crtc_state *crtc_state; int ret; - state = drm_atomic_state_alloc(crtc->dev); + state = drm_atomic_state_alloc(crtc->drm_dev); if (!state) return -ENOMEM; diff --git a/drivers/gpu/drm/vc4/vc4_hvs.c b/drivers/gpu/drm/vc4/vc4_hvs.c index 4da66ef96783..b76c4994fea8 100644 --- a/drivers/gpu/drm/vc4/vc4_hvs.c +++ b/drivers/gpu/drm/vc4/vc4_hvs.c @@ -442,7 +442,7 @@ int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state) { struct drm_crtc_state *crtc_state = drm_atomic_get_new_crtc_state(state, crtc); struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc_state); - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); struct drm_plane *plane; unsigned long flags; @@ -473,7 +473,7 @@ int vc4_hvs_atomic_check(struct drm_crtc *crtc, struct drm_atomic_state *state) static void vc4_hvs_install_dlist(struct drm_crtc *crtc) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_hvs *hvs = vc4->hvs; struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state); @@ -490,7 +490,7 @@ static void vc4_hvs_install_dlist(struct drm_crtc *crtc) static void vc4_hvs_update_dlist(struct drm_crtc *crtc) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(crtc->state); unsigned long flags; @@ -530,7 +530,7 @@ void vc4_hvs_atomic_begin(struct drm_crtc *crtc, void vc4_hvs_atomic_enable(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); struct drm_display_mode *mode = &crtc->state->adjusted_mode; struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); @@ -544,7 +544,7 @@ void vc4_hvs_atomic_enable(struct drm_crtc *crtc, void vc4_hvs_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc); struct vc4_crtc_state *vc4_state = to_vc4_crtc_state(old_state); @@ -558,7 +558,7 @@ void vc4_hvs_atomic_flush(struct drm_crtc *crtc, { struct drm_crtc_state *old_state = drm_atomic_get_old_crtc_state(state, crtc); - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; struct vc4_dev *vc4 = to_vc4_dev(dev); struct vc4_hvs *hvs = vc4->hvs; struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc); diff --git a/drivers/gpu/drm/vc4/vc4_txp.c b/drivers/gpu/drm/vc4/vc4_txp.c index c5abdec03103..8bb743ab5499 100644 --- a/drivers/gpu/drm/vc4/vc4_txp.c +++ b/drivers/gpu/drm/vc4/vc4_txp.c @@ -433,7 +433,7 @@ static void vc4_txp_atomic_enable(struct drm_crtc *crtc, static void vc4_txp_atomic_disable(struct drm_crtc *crtc, struct drm_atomic_state *state) { - struct drm_device *dev = crtc->dev; + struct drm_device *dev = crtc->drm_dev; /* Disable vblank irq handling before crtc is disabled. */ drm_crtc_vblank_off(crtc);

[RFC,v1,46/52] drm/vc4: Use struct drm_crtc::drm_dev instead of struct drm_crtc::dev

Commit Message

Patch