drm/radeon: remove load callback
Subsystems (2)
v3 cover drm/radeon: remove load callback
Changes between v1 and v3:
1. add "ddev->dev_private = rdev;"
2. include a cover letter
Wu Hoi Pok (7):
drm/radeon: remove load callback
drm/radeon: rdev->ddev to rdev_to_drm(rdev) 1
drm/radeon: rdev->ddev to rdev_to_drm(rdev) 2
drm/radeon: rdev->ddev to rdev_to_drm(rdev) 3
drm/radeon: rdev->ddev to rdev_to_drm(rdev) 4
drm/radeon: rdev->ddev to rdev_to_drm(rdev) 5
drm/radeon: rdev->ddev to rdev_to_drm(rdev) 6
drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- drivers/gpu/drm/radeon/cik.c | 14 ++-- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 12 ++-- drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r100.c | 24 +++---- drivers/gpu/drm/radeon/r300.c | 6 +- drivers/gpu/drm/radeon/r420.c | 6 +- drivers/gpu/drm/radeon/r520.c | 2 +- drivers/gpu/drm/radeon/r600.c | 12 ++-- drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600_dpm.c | 4 +- drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 11 +++- drivers/gpu/drm/radeon/radeon_acpi.c | 10 +-- drivers/gpu/drm/radeon/radeon_agp.c | 2 +- drivers/gpu/drm/radeon/radeon_atombios.c | 2 +- drivers/gpu/drm/radeon/radeon_audio.c | 4 +- drivers/gpu/drm/radeon/radeon_combios.c | 12 ++-- drivers/gpu/drm/radeon/radeon_device.c | 19 ++---- drivers/gpu/drm/radeon/radeon_display.c | 74 +++++++++++----------- drivers/gpu/drm/radeon/radeon_drv.c | 27 +++++--- drivers/gpu/drm/radeon/radeon_drv.h | 1 - drivers/gpu/drm/radeon/radeon_fbdev.c | 26 ++++---- drivers/gpu/drm/radeon/radeon_fence.c | 8 +-- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- drivers/gpu/drm/radeon/radeon_ib.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 ++-- drivers/gpu/drm/radeon/radeon_kms.c | 18 ++---- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 20 +++--- drivers/gpu/drm/radeon/radeon_ring.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- drivers/gpu/drm/radeon/rs400.c | 6 +- drivers/gpu/drm/radeon/rs600.c | 14 ++-- drivers/gpu/drm/radeon/rs690.c | 2 +- drivers/gpu/drm/radeon/rv515.c | 4 +- drivers/gpu/drm/radeon/rv770.c | 2 +- drivers/gpu/drm/radeon/si.c | 4 +- 40 files changed, 193 insertions(+), 191 deletions(-)
Signature · 1 line
2.45.2
PATCH v3 1/7 drm/radeon: remove load callback
Remove ".load" callback form "kms_driver", and move "struct drm_device" into radeon_device. Patch 2 to 7 follows up with changing the way of accessing drm_device, from "rdev->ddev" to "rdev_to_drm(rdev)" which is "&rdev->ddev".
--- drivers/gpu/drm/radeon/radeon.h | 11 ++++++++--- drivers/gpu/drm/radeon/radeon_drv.c | 27 ++++++++++++++++++--------- drivers/gpu/drm/radeon/radeon_drv.h | 1 - drivers/gpu/drm/radeon/radeon_kms.c | 18 ++++++------------ 4 files changed, 32 insertions(+), 25 deletions(-)
drivers/gpu/drm/radeon/radeon.h +8 -3
@@ -2297,7 +2297,7 @@ typedef void (*radeon_wreg_t)(struct radeon_device*, uint32_t, uint32_t);struct radeon_device {struct device *dev; -struct drm_device *ddev; +struct drm_device ddev;struct pci_dev *pdev;#ifdef __alpha__struct pci_controller *hose;
@@ -2440,10 +2440,13 @@ struct radeon_device {u64 gart_pin_size; }; +static inline struct drm_device *rdev_to_drm (struct radeon_device *rdev) +{ +return &rdev->ddev; +} +bool radeon_is_px (struct drm_device *dev);int radeon_device_init (struct radeon_device *rdev, -struct drm_device *ddev, -struct pci_dev *pdev,uint32_t flags);void radeon_device_fini (struct radeon_device *rdev);int radeon_gpu_wait_for_idle (struct radeon_device *rdev);
@@ -2818,6 +2821,8 @@ struct radeon_device *radeon_get_rdev(struct ttm_device *bdev);/* KMS */ +int radeon_driver_load_kms (struct radeon_device *dev,unsigned long flags); +u32 radeon_get_vblank_counter_kms (struct drm_crtc *crtc);int radeon_enable_vblank_kms (struct drm_crtc *crtc);void radeon_disable_vblank_kms (struct drm_crtc *crtc);
drivers/gpu/drm/radeon/radeon_drv.c +18 -9
@@ -259,7 +259,8 @@ static int radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) {unsigned long flags =0 ; -struct drm_device *dev; +struct drm_device *ddev; +struct radeon_device *rdev;int ret;if (!ent)
@@ -300,28 +301,37 @@ static int radeon_pci_probe(struct pci_dev *pdev,if (ret)return ret; - dev =drm_dev_alloc (&kms_driver, &pdev->dev); -if (IS_ERR (dev)) -return PTR_ERR (dev); + rdev =devm_drm_dev_alloc (&pdev->dev, &kms_driver,typeof (*rdev), ddev); +if (IS_ERR (rdev)) +return PTR_ERR (rdev); + + rdev->dev = &pdev->dev; + rdev->pdev = pdev; + ddev =rdev_to_drm (rdev); + ddev->dev_private = rdev; ret =pci_enable_device (pdev);if (ret) goto err_free; -pci_set_drvdata (pdev, dev); +pci_set_drvdata (pdev, ddev); + + ret =radeon_driver_load_kms (rdev, flags); +if (ret) + goto err_agp; - ret =drm_dev_register (dev, ent->driver_data); + ret =drm_dev_register (ddev, flags);if (ret) goto err_agp; -radeon_fbdev_setup (dev->dev_private); +radeon_fbdev_setup (ddev->dev_private);return 0 ; err_agp:pci_disable_device (pdev); err_free: -drm_dev_put (dev); +drm_dev_put (ddev);return ret; }
@@ -569,7 +579,6 @@ static const struct drm_ioctl_desc radeon_ioctls_kms[] = {static const struct drm_driver kms_driver = { .driver_features =DRIVER_GEM |DRIVER_RENDER |DRIVER_MODESET , - .load = radeon_driver_load_kms, .open = radeon_driver_open_kms, .postclose = radeon_driver_postclose_kms, .unload = radeon_driver_unload_kms,
drivers/gpu/drm/radeon/radeon_drv.h +0 -1
@@ -117,7 +117,6 @@long radeon_drm_ioctl (struct file *filp,unsigned int cmd,unsigned long arg); -int radeon_driver_load_kms (struct drm_device *dev,unsigned long flags);void radeon_driver_unload_kms (struct drm_device *dev);int radeon_driver_open_kms (struct drm_device *dev,struct drm_file *file_priv); void radeon_driver_postclose_kms(struct drm_device *dev,
drivers/gpu/drm/radeon/radeon_kms.c +6 -12
@@ -91,7 +91,7 @@ void radeon_driver_unload_kms(struct drm_device *dev)/** * radeon_driver_load_kms - Main load function for KMS. * -* @dev: drm dev pointer +* @rdev: radeon dev pointer * @flags: device flags * * This is the main load function for KMS (all asics).
@@ -101,24 +101,18 @@ void radeon_driver_unload_kms(struct drm_device *dev)* (crtcs, encoders, hotplug detect, etc.). * Returns 0 on success, error on failure. */ -int radeon_driver_load_kms (struct drm_device *dev,unsigned long flags) +int radeon_driver_load_kms (struct radeon_device *rdev,unsigned long flags) { -struct pci_dev *pdev =to_pci_dev (dev->dev); -struct radeon_device *rdev; +struct pci_dev *pdev = rdev->pdev; +struct drm_device *dev =rdev_to_drm (rdev);int r, acpi_status; - rdev =kzalloc (sizeof (struct radeon_device ),GFP_KERNEL ); -if (rdev ==NULL ) { -return -ENOMEM ; - } - dev->dev_private = (void *)rdev; -#ifdef __alpha__ rdev->hose = pdev->sysdata;#endif if (pci_find_capability (pdev,PCI_CAP_ID_AGP )) - rdev->agp =radeon_agp_head_init (dev); + rdev->agp =radeon_agp_head_init (rdev_to_drm (rdev));if (rdev->agp) { rdev->agp->agp_mtrr = arch_phys_wc_add( rdev->agp->agp_info.aper_base,
@@ -147,7 +141,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)* properly initialize the GPU MC controller and permit * VRAM allocation */ - r =radeon_device_init (rdev, dev, pdev, flags); + r =radeon_device_init (rdev, flags);if (r) {dev_err (dev->dev,"Fatal error during GPU init\n" ); goto out;
Signature · 1 line
2.45.2
Hi
Am 24.06.24 um 17:10 schrieb Wu Hoi Pok:
Quoted 4 lines
Remove ".load" callback form "
kms_driver", and move "structdrm_device" intoradeon_device. Patch 2 to 7 follows up with changing the way of accessingdrm_device, from "rdev->ddev" to "rdev_to_drm(rdev)" which is "&rdev->ddev".
This is not going to build, so it cannot go in.
This should be the final patch. First add rdev_to_drm() and convert the driver to use it (that's one patch). Then change radeon_device.dev from a pointer to a value in a second patch.
Best regards
Thomas
Quoted 177 lines
Signed-off-by Wu Hoi Pok <[email protected]>--- drivers/gpu/drm/radeon/radeon.h | 11 ++++++++--- drivers/gpu/drm/radeon/radeon_drv.c | 27 ++++++++++++++++++--------- drivers/gpu/drm/radeon/radeon_drv.h | 1 - drivers/gpu/drm/radeon/radeon_kms.c | 18 ++++++------------ 4 files changed, 32 insertions(+), 25 deletions(-)drivers/gpu/drm/radeon/radeon.h +8
-3@@ -2297,7 +2297,7 @@ typedef void (*radeon_wreg_t)(struct radeon_device*, uint32_t, uint32_t);struct radeon_device {struct device *dev; -struct drm_device *ddev; +struct drm_device ddev;struct pci_dev *pdev;#ifdef __alpha__struct pci_controller *hose;@@ -2440,10 +2440,13 @@ struct radeon_device {u64 gart_pin_size; }; +static inline struct drm_device *rdev_to_drm (struct radeon_device *rdev) +{ +return &rdev->ddev; +} +bool radeon_is_px (struct drm_device *dev);int radeon_device_init (struct radeon_device *rdev, -struct drm_device *ddev, -struct pci_dev *pdev,uint32_t flags);void radeon_device_fini (struct radeon_device *rdev);int radeon_gpu_wait_for_idle (struct radeon_device *rdev);@@ -2818,6 +2821,8 @@ struct radeon_device *radeon_get_rdev(struct ttm_device *bdev);/* KMS */ +int radeon_driver_load_kms (struct radeon_device *dev,unsigned long flags); +u32 radeon_get_vblank_counter_kms (struct drm_crtc *crtc);int radeon_enable_vblank_kms (struct drm_crtc *crtc);void radeon_disable_vblank_kms (struct drm_crtc *crtc);drivers/gpu/drm/radeon/radeon_drv.c +18
-9@@ -259,7 +259,8 @@ static int radeon_pci_probe(struct pci_dev *pdev, const struct pci_device_id *ent) {unsigned long flags =0 ; -struct drm_device *dev; +struct drm_device *ddev; +struct radeon_device *rdev;int ret;if (!ent)@@ -300,28 +301,37 @@ static int radeon_pci_probe(struct pci_dev *pdev,if (ret)return ret; - dev =drm_dev_alloc (&kms_driver, &pdev->dev); -if (IS_ERR (dev)) -return PTR_ERR (dev); + rdev =devm_drm_dev_alloc (&pdev->dev, &kms_driver,typeof (*rdev), ddev); +if (IS_ERR (rdev)) +return PTR_ERR (rdev); + + rdev->dev = &pdev->dev; + rdev->pdev = pdev; + ddev =rdev_to_drm (rdev); + ddev->dev_private = rdev; ret =pci_enable_device (pdev);if (ret) goto err_free; -pci_set_drvdata (pdev, dev); +pci_set_drvdata (pdev, ddev); + + ret =radeon_driver_load_kms (rdev, flags); +if (ret) + goto err_agp; - ret =drm_dev_register (dev, ent->driver_data); + ret =drm_dev_register (ddev, flags);if (ret) goto err_agp; -radeon_fbdev_setup (dev->dev_private); +radeon_fbdev_setup (ddev->dev_private);return 0 ; err_agp:pci_disable_device (pdev); err_free: -drm_dev_put (dev); +drm_dev_put (ddev);return ret; }@@ -569,7 +579,6 @@ static const struct drm_ioctl_desc radeon_ioctls_kms[] = {static const struct drm_driver kms_driver = { .driver_features =DRIVER_GEM |DRIVER_RENDER |DRIVER_MODESET , - .load = radeon_driver_load_kms, .open = radeon_driver_open_kms, .postclose = radeon_driver_postclose_kms, .unload = radeon_driver_unload_kms,drivers/gpu/drm/radeon/radeon_drv.h +0
-1@@ -117,7 +117,6 @@long radeon_drm_ioctl (struct file *filp,unsigned int cmd,unsigned long arg); -int radeon_driver_load_kms (struct drm_device *dev,unsigned long flags);void radeon_driver_unload_kms (struct drm_device *dev);int radeon_driver_open_kms (struct drm_device *dev,struct drm_file *file_priv); void radeon_driver_postclose_kms(struct drm_device *dev,drivers/gpu/drm/radeon/radeon_kms.c +6
-12@@ -91,7 +91,7 @@ void radeon_driver_unload_kms(struct drm_device *dev)/** * radeon_driver_load_kms - Main load function for KMS. * -* @dev: drm dev pointer +* @rdev: radeon dev pointer * @flags: device flags * * This is the main load function for KMS (all asics). @@ -101,24 +101,18 @@ void radeon_driver_unload_kms(struct drm_device *dev)* (crtcs, encoders, hotplug detect, etc.). * Returns 0 on success, error on failure. */ -int radeon_driver_load_kms (struct drm_device *dev,unsigned long flags) +int radeon_driver_load_kms (struct radeon_device *rdev,unsigned long flags) { -struct pci_dev *pdev =to_pci_dev (dev->dev); -struct radeon_device *rdev; +struct pci_dev *pdev = rdev->pdev; +struct drm_device *dev =rdev_to_drm (rdev);int r, acpi_status; - rdev =kzalloc (sizeof (struct radeon_device ),GFP_KERNEL ); -if (rdev ==NULL ) { -return -ENOMEM ; - } - dev->dev_private = (void *)rdev; -#ifdef __alpha__ rdev->hose = pdev->sysdata;#endif if (pci_find_capability (pdev,PCI_CAP_ID_AGP )) - rdev->agp =radeon_agp_head_init (dev); + rdev->agp =radeon_agp_head_init (rdev_to_drm (rdev));if (rdev->agp) { rdev->agp->agp_mtrr = arch_phys_wc_add( rdev->agp->agp_info.aper_base,@@ -147,7 +141,7 @@ int radeon_driver_load_kms(struct drm_device *dev, unsigned long flags)* properly initialize the GPU MC controller and permit * VRAM allocation */ - r =radeon_device_init (rdev, dev, pdev, flags); + r =radeon_device_init (rdev, flags);if (r) {dev_err (dev->dev,"Fatal error during GPU init\n" ); goto out;
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
PATCH v3 2/7 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 1
In reply to Wu Hoi PokPlease refer to patch 1.
--- drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- drivers/gpu/drm/radeon/cik.c | 14 ++++++------- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 12 +++++------ drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r100.c | 24 +++++++++++----------- 6 files changed, 28 insertions(+), 28 deletions(-)
drivers/gpu/drm/radeon/atombios_encoders.c +1 -1
@@ -2179,7 +2179,7 @@ int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder, int fe_idx)void radeon_atom_encoder_init (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_encoder *encoder;list_for_each_entry (encoder, &dev->mode_config.encoder_list, head) {
drivers/gpu/drm/radeon/cik.c +7 -7
@@ -7585,7 +7585,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[0 ]) { -drm_handle_vblank (rdev->ddev,0 ); +drm_handle_vblank (rdev_to_drm (rdev),0 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -7615,7 +7615,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[1 ]) { -drm_handle_vblank (rdev->ddev,1 ); +drm_handle_vblank (rdev_to_drm (rdev),1 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -7645,7 +7645,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[2 ]) { -drm_handle_vblank (rdev->ddev,2 ); +drm_handle_vblank (rdev_to_drm (rdev),2 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -7675,7 +7675,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[3 ]) { -drm_handle_vblank (rdev->ddev,3 ); +drm_handle_vblank (rdev_to_drm (rdev),3 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -7705,7 +7705,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[4 ]) { -drm_handle_vblank (rdev->ddev,4 ); +drm_handle_vblank (rdev_to_drm (rdev),4 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -7735,7 +7735,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[5 ]) { -drm_handle_vblank (rdev->ddev,5 ); +drm_handle_vblank (rdev_to_drm (rdev),5 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -8581,7 +8581,7 @@ int cik_init(struct radeon_device *rdev)/* Initialize surface registers */ radeon_surface_init (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* Fence driver */ radeon_fence_driver_init (rdev);
drivers/gpu/drm/radeon/dce6_afmt.c +1 -1
@@ -91,7 +91,7 @@ struct r600_audio_pin *dce6_audio_get_pin(struct radeon_device *rdev) pin = &rdev->audio.pin[i]; pin_count =0 ; -list_for_each_entry (encoder, &rdev->ddev->mode_config.encoder_list, head) { +list_for_each_entry (encoder, &rdev_to_drm (rdev)->mode_config.encoder_list, head) {if (radeon_encoder_is_digital (encoder)) { radeon_encoder =to_radeon_encoder (encoder); dig = radeon_encoder->enc_priv;
drivers/gpu/drm/radeon/evergreen.c +6 -6
@@ -1673,7 +1673,7 @@ void evergreen_pm_misc(struct radeon_device *rdev)*/ void evergreen_pm_prepare (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;
@@ -1698,7 +1698,7 @@ void evergreen_pm_prepare(struct radeon_device *rdev)*/ void evergreen_pm_finish (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;
@@ -1763,7 +1763,7 @@ void evergreen_hpd_set_polarity(struct radeon_device *rdev,*/ void evergreen_hpd_init (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned enabled =0 ; u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) |
@@ -1804,7 +1804,7 @@ void evergreen_hpd_init(struct radeon_device *rdev)*/ void evergreen_hpd_fini (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned disabled =0 ;
@@ -4753,7 +4753,7 @@ int evergreen_irq_process(struct radeon_device *rdev) event_name ="vblank" ;if (rdev->irq.crtc_vblank_int[crtc_idx]) { -drm_handle_vblank (rdev->ddev, crtc_idx); +drm_handle_vblank (rdev_to_drm (rdev), crtc_idx); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -5211,7 +5211,7 @@ int evergreen_init(struct radeon_device *rdev)/* Initialize surface registers */ radeon_surface_init (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* Fence driver */ radeon_fence_driver_init (rdev);/* initialize AGP */
drivers/gpu/drm/radeon/ni.c +1 -1
@@ -2360,7 +2360,7 @@ int cayman_init(struct radeon_device *rdev)/* Initialize surface registers */ radeon_surface_init (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* Fence driver */ radeon_fence_driver_init (rdev);/* initialize memory controller */
drivers/gpu/drm/radeon/r100.c +12 -12
@@ -459,7 +459,7 @@ void r100_pm_misc(struct radeon_device *rdev)*/ void r100_pm_prepare (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;
@@ -490,7 +490,7 @@ void r100_pm_prepare(struct radeon_device *rdev)*/ void r100_pm_finish (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;
@@ -603,7 +603,7 @@ void r100_hpd_set_polarity(struct radeon_device *rdev,*/ void r100_hpd_init (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned enable =0 ;
@@ -626,7 +626,7 @@ void r100_hpd_init(struct radeon_device *rdev)*/ void r100_hpd_fini (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned disable =0 ;
@@ -798,7 +798,7 @@ int r100_irq_process(struct radeon_device *rdev)/* Vertical blank interrupts */ if (status &RADEON_CRTC_VBLANK_STAT ) {if (rdev->irq.crtc_vblank_int[0 ]) { -drm_handle_vblank (rdev->ddev,0 ); +drm_handle_vblank (rdev_to_drm (rdev),0 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -807,7 +807,7 @@ int r100_irq_process(struct radeon_device *rdev) }if (status &RADEON_CRTC2_VBLANK_STAT ) {if (rdev->irq.crtc_vblank_int[1 ]) { -drm_handle_vblank (rdev->ddev,1 ); +drm_handle_vblank (rdev_to_drm (rdev),1 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -1471,7 +1471,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) header =radeon_get_ib_value (p, h_idx); crtc_id =radeon_get_ib_value (p, h_idx +5 ); reg =R100_CP_PACKET0_GET_REG (header); - crtc =drm_crtc_find (p->rdev->ddev, p->filp, crtc_id); + crtc =drm_crtc_find (rdev_to_drm (p->rdev), p->filp, crtc_id);if (!crtc) {DRM_ERROR ("cannot find crtc %d\n" , crtc_id);return -ENOENT ;
@@ -3059,7 +3059,7 @@ DEFINE_SHOW_ATTRIBUTE(r100_debugfs_mc_info);void r100_debugfs_rbbm_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("r100_rbbm_info" ,0444 , root, rdev, &r100_debugfs_rbbm_info_fops);
@@ -3069,7 +3069,7 @@ void r100_debugfs_rbbm_init(struct radeon_device *rdev)void r100_debugfs_cp_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("r100_cp_ring_info" ,0444 , root, rdev, &r100_debugfs_cp_ring_info_fops);
@@ -3081,7 +3081,7 @@ void r100_debugfs_cp_init(struct radeon_device *rdev)void r100_debugfs_mc_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("r100_mc_info" ,0444 , root, rdev, &r100_debugfs_mc_info_fops);
@@ -3947,7 +3947,7 @@ int r100_resume(struct radeon_device *rdev) RREG32(R_0007C0_CP_STAT)); }/* post */ -radeon_combios_asic_init (rdev->ddev); +radeon_combios_asic_init (rdev_to_drm (rdev));/* Resume clock after posting */ r100_clock_startup (rdev);/* Initialize surface registers */
@@ -4056,7 +4056,7 @@ int r100_init(struct radeon_device *rdev)/* Set asic errata */ r100_errata (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* initialize AGP */ if (rdev->flags &RADEON_IS_AGP ) { r =radeon_agp_init (rdev);
Signature · 1 line
2.45.2
Re: [PATCH v3 2/7] drm/radeon: rdev->ddev to rdev_to_drm(rdev) 1
Hi
please squash patches 2 to 7 into a single patch that goes first.
Am 24.06.24 um 17:10 schrieb Wu Hoi Pok:
Quoted 1 line
Please refer to patch 1.
That's not a commit message. Once a patchset landed, no one will know what patch 1 was.
Best regards
Thomas
Quoted 287 lines
Signed-off-by Wu Hoi Pok <[email protected]>--- drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- drivers/gpu/drm/radeon/cik.c | 14 ++++++------- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 12 +++++------ drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r100.c | 24 +++++++++++----------- 6 files changed, 28 insertions(+), 28 deletions(-)drivers/gpu/drm/radeon/atombios_encoders.c +1
-1@@ -2179,7 +2179,7 @@ int radeon_atom_pick_dig_encoder(struct drm_encoder *encoder, int fe_idx)void radeon_atom_encoder_init (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_encoder *encoder;list_for_each_entry (encoder, &dev->mode_config.encoder_list, head) {drivers/gpu/drm/radeon/cik.c +7
-7@@ -7585,7 +7585,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[0 ]) { -drm_handle_vblank (rdev->ddev,0 ); +drm_handle_vblank (rdev_to_drm (rdev),0 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }@@ -7615,7 +7615,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[1 ]) { -drm_handle_vblank (rdev->ddev,1 ); +drm_handle_vblank (rdev_to_drm (rdev),1 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }@@ -7645,7 +7645,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[2 ]) { -drm_handle_vblank (rdev->ddev,2 ); +drm_handle_vblank (rdev_to_drm (rdev),2 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }@@ -7675,7 +7675,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[3 ]) { -drm_handle_vblank (rdev->ddev,3 ); +drm_handle_vblank (rdev_to_drm (rdev),3 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }@@ -7705,7 +7705,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[4 ]) { -drm_handle_vblank (rdev->ddev,4 ); +drm_handle_vblank (rdev_to_drm (rdev),4 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }@@ -7735,7 +7735,7 @@ int cik_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[5 ]) { -drm_handle_vblank (rdev->ddev,5 ); +drm_handle_vblank (rdev_to_drm (rdev),5 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }@@ -8581,7 +8581,7 @@ int cik_init(struct radeon_device *rdev)/* Initialize surface registers */ radeon_surface_init (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* Fence driver */ radeon_fence_driver_init (rdev);drivers/gpu/drm/radeon/dce6_afmt.c +1
-1@@ -91,7 +91,7 @@ struct r600_audio_pin *dce6_audio_get_pin(struct radeon_device *rdev) pin = &rdev->audio.pin[i]; pin_count =0 ; -list_for_each_entry (encoder, &rdev->ddev->mode_config.encoder_list, head) { +list_for_each_entry (encoder, &rdev_to_drm (rdev)->mode_config.encoder_list, head) {if (radeon_encoder_is_digital (encoder)) { radeon_encoder =to_radeon_encoder (encoder); dig = radeon_encoder->enc_priv;drivers/gpu/drm/radeon/evergreen.c +6
-6@@ -1673,7 +1673,7 @@ void evergreen_pm_misc(struct radeon_device *rdev)*/ void evergreen_pm_prepare (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;@@ -1698,7 +1698,7 @@ void evergreen_pm_prepare(struct radeon_device *rdev)*/ void evergreen_pm_finish (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;@@ -1763,7 +1763,7 @@ void evergreen_hpd_set_polarity(struct radeon_device *rdev,*/ void evergreen_hpd_init (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned enabled =0 ; u32 tmp = DC_HPDx_CONNECTION_TIMER(0x9c4) |@@ -1804,7 +1804,7 @@ void evergreen_hpd_init(struct radeon_device *rdev)*/ void evergreen_hpd_fini (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned disabled =0 ;@@ -4753,7 +4753,7 @@ int evergreen_irq_process(struct radeon_device *rdev) event_name ="vblank" ;if (rdev->irq.crtc_vblank_int[crtc_idx]) { -drm_handle_vblank (rdev->ddev, crtc_idx); +drm_handle_vblank (rdev_to_drm (rdev), crtc_idx); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }@@ -5211,7 +5211,7 @@ int evergreen_init(struct radeon_device *rdev)/* Initialize surface registers */ radeon_surface_init (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* Fence driver */ radeon_fence_driver_init (rdev);/* initialize AGP */ drivers/gpu/drm/radeon/ni.c +1
-1@@ -2360,7 +2360,7 @@ int cayman_init(struct radeon_device *rdev)/* Initialize surface registers */ radeon_surface_init (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* Fence driver */ radeon_fence_driver_init (rdev);/* initialize memory controller */ drivers/gpu/drm/radeon/r100.c +12
-12@@ -459,7 +459,7 @@ void r100_pm_misc(struct radeon_device *rdev)*/ void r100_pm_prepare (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;@@ -490,7 +490,7 @@ void r100_pm_prepare(struct radeon_device *rdev)*/ void r100_pm_finish (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;@@ -603,7 +603,7 @@ void r100_hpd_set_polarity(struct radeon_device *rdev,*/ void r100_hpd_init (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned enable =0 ;@@ -626,7 +626,7 @@ void r100_hpd_init(struct radeon_device *rdev)*/ void r100_hpd_fini (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned disable =0 ;@@ -798,7 +798,7 @@ int r100_irq_process(struct radeon_device *rdev)/* Vertical blank interrupts */ if (status &RADEON_CRTC_VBLANK_STAT ) {if (rdev->irq.crtc_vblank_int[0 ]) { -drm_handle_vblank (rdev->ddev,0 ); +drm_handle_vblank (rdev_to_drm (rdev),0 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }@@ -807,7 +807,7 @@ int r100_irq_process(struct radeon_device *rdev) }if (status &RADEON_CRTC2_VBLANK_STAT ) {if (rdev->irq.crtc_vblank_int[1 ]) { -drm_handle_vblank (rdev->ddev,1 ); +drm_handle_vblank (rdev_to_drm (rdev),1 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }@@ -1471,7 +1471,7 @@ int r100_cs_packet_parse_vline(struct radeon_cs_parser *p) header =radeon_get_ib_value (p, h_idx); crtc_id =radeon_get_ib_value (p, h_idx +5 ); reg =R100_CP_PACKET0_GET_REG (header); - crtc =drm_crtc_find (p->rdev->ddev, p->filp, crtc_id); + crtc =drm_crtc_find (rdev_to_drm (p->rdev), p->filp, crtc_id);if (!crtc) {DRM_ERROR ("cannot find crtc %d\n" , crtc_id);return -ENOENT ;@@ -3059,7 +3059,7 @@ DEFINE_SHOW_ATTRIBUTE(r100_debugfs_mc_info);void r100_debugfs_rbbm_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("r100_rbbm_info" ,0444 , root, rdev, &r100_debugfs_rbbm_info_fops);@@ -3069,7 +3069,7 @@ void r100_debugfs_rbbm_init(struct radeon_device *rdev)void r100_debugfs_cp_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("r100_cp_ring_info" ,0444 , root, rdev, &r100_debugfs_cp_ring_info_fops);@@ -3081,7 +3081,7 @@ void r100_debugfs_cp_init(struct radeon_device *rdev)void r100_debugfs_mc_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("r100_mc_info" ,0444 , root, rdev, &r100_debugfs_mc_info_fops);@@ -3947,7 +3947,7 @@ int r100_resume(struct radeon_device *rdev) RREG32(R_0007C0_CP_STAT)); }/* post */ -radeon_combios_asic_init (rdev->ddev); +radeon_combios_asic_init (rdev_to_drm (rdev));/* Resume clock after posting */ r100_clock_startup (rdev);/* Initialize surface registers */ @@ -4056,7 +4056,7 @@ int r100_init(struct radeon_device *rdev)/* Set asic errata */ r100_errata (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* initialize AGP */ if (rdev->flags &RADEON_IS_AGP ) { r =radeon_agp_init (rdev);
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
PATCH v3 3/7 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 2
In reply to Wu Hoi PokPlease refer to patch 1.
--- drivers/gpu/drm/radeon/r300.c | 6 +++--- drivers/gpu/drm/radeon/r420.c | 6 +++--- drivers/gpu/drm/radeon/r520.c | 2 +- drivers/gpu/drm/radeon/r600.c | 12 ++++++------ drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600_dpm.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/radeon/r300.c +3 -3
@@ -616,7 +616,7 @@ DEFINE_SHOW_ATTRIBUTE(rv370_debugfs_pcie_gart_info);static void rv370_debugfs_pcie_gart_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("rv370_pcie_gart_info" ,0444 , root, rdev, &rv370_debugfs_pcie_gart_info_fops);
@@ -1452,7 +1452,7 @@ int r300_resume(struct radeon_device *rdev) RREG32(R_0007C0_CP_STAT)); }/* post */ -radeon_combios_asic_init (rdev->ddev); +radeon_combios_asic_init (rdev_to_drm (rdev));/* Resume clock after posting */ r300_clock_startup (rdev);/* Initialize surface registers */
@@ -1538,7 +1538,7 @@ int r300_init(struct radeon_device *rdev)/* Set asic errata */ r300_errata (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* initialize AGP */ if (rdev->flags &RADEON_IS_AGP ) { r =radeon_agp_init (rdev);
drivers/gpu/drm/radeon/r420.c +3 -3
@@ -322,7 +322,7 @@ int r420_resume(struct radeon_device *rdev)if (rdev->is_atom_bios) {atom_asic_init (rdev->mode_info.atom_context); }else { -radeon_combios_asic_init (rdev->ddev); +radeon_combios_asic_init (rdev_to_drm (rdev)); }/* Resume clock after posting */ r420_clock_resume (rdev);
@@ -414,7 +414,7 @@ int r420_init(struct radeon_device *rdev)return -EINVAL ;/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* initialize AGP */ if (rdev->flags &RADEON_IS_AGP ) { r =radeon_agp_init (rdev);
@@ -493,7 +493,7 @@ DEFINE_SHOW_ATTRIBUTE(r420_debugfs_pipes_info);void r420_debugfs_pipes_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("r420_pipes_info" ,0444 , root, rdev, &r420_debugfs_pipes_info_fops);
drivers/gpu/drm/radeon/r520.c +1 -1
@@ -287,7 +287,7 @@ int r520_init(struct radeon_device *rdev)atom_asic_init (rdev->mode_info.atom_context); }/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* initialize AGP */ if (rdev->flags &RADEON_IS_AGP ) { r =radeon_agp_init (rdev);
drivers/gpu/drm/radeon/r600.c +6 -6
@@ -950,7 +950,7 @@ void r600_hpd_set_polarity(struct radeon_device *rdev,void r600_hpd_init (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned enable =0 ;
@@ -1017,7 +1017,7 @@ void r600_hpd_init(struct radeon_device *rdev)void r600_hpd_fini (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned disable =0 ;
@@ -3280,7 +3280,7 @@ int r600_init(struct radeon_device *rdev)/* Initialize surface registers */ radeon_surface_init (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* Fence driver */ radeon_fence_driver_init (rdev);if (rdev->flags &RADEON_IS_AGP ) {
@@ -4136,7 +4136,7 @@ int r600_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: D1 vblank - IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[0 ]) { -drm_handle_vblank (rdev->ddev,0 ); +drm_handle_vblank (rdev_to_drm (rdev),0 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -4166,7 +4166,7 @@ int r600_irq_process(struct radeon_device *rdev)DRM_DEBUG ("IH: D2 vblank - IH event w/o asserted irq bit?\n" );if (rdev->irq.crtc_vblank_int[1 ]) { -drm_handle_vblank (rdev->ddev,1 ); +drm_handle_vblank (rdev_to_drm (rdev),1 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -4358,7 +4358,7 @@ DEFINE_SHOW_ATTRIBUTE(r600_debugfs_mc_info);static void r600_debugfs_mc_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("r600_mc_info" ,0444 , root, rdev, &r600_debugfs_mc_info_fops);
drivers/gpu/drm/radeon/r600_cs.c +1 -1
@@ -884,7 +884,7 @@ int r600_cs_common_vline_parse(struct radeon_cs_parser *p, crtc_id =radeon_get_ib_value (p, h_idx +2 +7 +1 ); reg =R600_CP_PACKET0_GET_REG (header); - crtc =drm_crtc_find (p->rdev->ddev, p->filp, crtc_id); + crtc =drm_crtc_find (rdev_to_drm (p->rdev), p->filp, crtc_id);if (!crtc) {DRM_ERROR ("cannot find crtc %d\n" , crtc_id);return -ENOENT ;
drivers/gpu/drm/radeon/r600_dpm.c +2 -2
@@ -153,7 +153,7 @@ void r600_dpm_print_ps_status(struct radeon_device *rdev,u32 r600_dpm_get_vblank_time (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 vblank_in_pixels;
@@ -180,7 +180,7 @@ u32 r600_dpm_get_vblank_time(struct radeon_device *rdev)u32 r600_dpm_get_vrefresh (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 vrefresh =0 ;
Signature · 1 line
2.45.2
PATCH v3 4/7 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 3
In reply to Wu Hoi PokPlease refer to patch 1.
--- drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- drivers/gpu/drm/radeon/radeon_acpi.c | 10 +++++----- drivers/gpu/drm/radeon/radeon_agp.c | 2 +- drivers/gpu/drm/radeon/radeon_atombios.c | 2 +- drivers/gpu/drm/radeon/radeon_audio.c | 4 ++-- drivers/gpu/drm/radeon/radeon_combios.c | 12 ++++++------ 6 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/radeon/r600_hdmi.c +1 -1
@@ -116,7 +116,7 @@ void r600_audio_update_hdmi(struct work_struct *work) { struct radeon_device *rdev = container_of(work, struct radeon_device, audio_work); -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct r600_audio_pin audio_status =r600_audio_status (rdev);struct drm_encoder *encoder;bool changed = false;
drivers/gpu/drm/radeon/radeon_acpi.c +5 -5
@@ -405,11 +405,11 @@ static int radeon_atif_handler(struct radeon_device *rdev,if (req.pending &ATIF_DGPU_DISPLAY_EVENT ) {if ((rdev->flags &RADEON_IS_PX ) &&radeon_atpx_dgpu_req_power_for_displays ()) { -pm_runtime_get_sync (rdev->ddev->dev); +pm_runtime_get_sync (rdev_to_drm (rdev)->dev);/* Just fire off a uevent and let userspace tell us what to do */ -drm_helper_hpd_irq_event (rdev->ddev); -pm_runtime_mark_last_busy (rdev->ddev->dev); -pm_runtime_put_autosuspend (rdev->ddev->dev); +drm_helper_hpd_irq_event (rdev_to_drm (rdev)); +pm_runtime_mark_last_busy (rdev_to_drm (rdev)->dev); +pm_runtime_put_autosuspend (rdev_to_drm (rdev)->dev); } }/* TODO: check other events */
@@ -736,7 +736,7 @@ int radeon_acpi_init(struct radeon_device *rdev)struct radeon_encoder *target =NULL ;/* Find the encoder controlling the brightness */ -list_for_each_entry (tmp, &rdev->ddev->mode_config.encoder_list, +list_for_each_entry (tmp, &rdev_to_drm (rdev)->mode_config.encoder_list, head) {struct radeon_encoder *enc =to_radeon_encoder (tmp);
drivers/gpu/drm/radeon/radeon_agp.c +1 -1
@@ -161,7 +161,7 @@ struct radeon_agp_head *radeon_agp_head_init(struct drm_device *dev)static int radeon_agp_head_acquire (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct pci_dev *pdev =to_pci_dev (dev->dev);if (!rdev->agp)
drivers/gpu/drm/radeon/radeon_atombios.c +1 -1
@@ -187,7 +187,7 @@ void radeon_atombios_i2c_init(struct radeon_device *rdev)if (i2c.valid) {sprintf (stmp,"0x%x" , i2c.i2c_id); - rdev->i2c_bus[i] =radeon_i2c_create (rdev->ddev, &i2c, stmp); + rdev->i2c_bus[i] =radeon_i2c_create (rdev_to_drm (rdev), &i2c, stmp); } gpio = (ATOM_GPIO_I2C_ASSIGMENT *) ((u8 *)gpio +sizeof (ATOM_GPIO_I2C_ASSIGMENT ));
drivers/gpu/drm/radeon/radeon_audio.c +2 -2
@@ -196,7 +196,7 @@ static void radeon_audio_enable(struct radeon_device *rdev,return ;if (rdev->mode_info.mode_config_initialized) { -list_for_each_entry (encoder, &rdev->ddev->mode_config.encoder_list, head) { +list_for_each_entry (encoder, &rdev_to_drm (rdev)->mode_config.encoder_list, head) {if (radeon_encoder_is_digital (encoder)) { radeon_encoder =to_radeon_encoder (encoder); dig = radeon_encoder->enc_priv;
@@ -760,7 +760,7 @@ static int radeon_audio_component_get_eld(struct device *kdev, int port,if (!rdev->audio.enabled || !rdev->mode_info.mode_config_initialized)return 0 ; -list_for_each_entry (encoder, &rdev->ddev->mode_config.encoder_list, head) { +list_for_each_entry (encoder, &rdev_to_drm (rdev)->mode_config.encoder_list, head) {if (!radeon_encoder_is_digital (encoder))continue ; radeon_encoder =to_radeon_encoder (encoder);
drivers/gpu/drm/radeon/radeon_combios.c +6 -6
@@ -372,7 +372,7 @@ bool radeon_combios_check_hardcoded_edid(struct radeon_device *rdev)int edid_info, size;struct edid *edid;unsigned char *raw; - edid_info =combios_get_table_offset (rdev->ddev,COMBIOS_HARDCODED_EDID_TABLE ); + edid_info =combios_get_table_offset (rdev_to_drm (rdev),COMBIOS_HARDCODED_EDID_TABLE );if (!edid_info)return false;
@@ -642,7 +642,7 @@ static struct radeon_i2c_bus_rec combios_setup_i2c_bus(struct radeon_device *rdestatic struct radeon_i2c_bus_rec radeon_combios_get_i2c_info_from_table (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct radeon_i2c_bus_rec i2c;u16 offset;u8 id, blocks, clk, data;
@@ -670,7 +670,7 @@ static struct radeon_i2c_bus_rec radeon_combios_get_i2c_info_from_table(struct rvoid radeon_combios_i2c_init (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct radeon_i2c_bus_rec i2c;/* actual hw pads
@@ -812,7 +812,7 @@ bool radeon_combios_get_clock_info(struct drm_device *dev)bool radeon_combios_sideport_present (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);u16 igp_info;/* sideport is AMD only */
@@ -915,7 +915,7 @@ struct radeon_encoder_primary_dac *radeon_combios_get_primary_dac_info(structenum radeon_tv_std radeon_combios_get_tv_info (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);uint16_t tv_info;enum radeon_tv_std tv_std =TV_STD_NTSC ;
@@ -2637,7 +2637,7 @@ static const char *thermal_controller_names[] = {void radeon_combios_get_power_modes (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);u16 offset, misc, misc2 =0 ;u8 rev, tmp;int state_index =0 ;
Signature · 1 line
2.45.2
PATCH v3 5/7 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 4
In reply to Wu Hoi PokPlease refer to patch 1.
--- drivers/gpu/drm/radeon/radeon_device.c | 19 +++---- drivers/gpu/drm/radeon/radeon_display.c | 74 ++++++++++++------------- drivers/gpu/drm/radeon/radeon_fbdev.c | 26 ++++----- drivers/gpu/drm/radeon/radeon_fence.c | 8 +-- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- 6 files changed, 63 insertions(+), 68 deletions(-)
drivers/gpu/drm/radeon/radeon_device.c +7 -12
@@ -760,7 +760,7 @@ bool radeon_boot_test_post_card(struct radeon_device *rdev)if (rdev->is_atom_bios)atom_asic_init (rdev->mode_info.atom_context);else -radeon_combios_asic_init (rdev->ddev); +radeon_combios_asic_init (rdev_to_drm (rdev));return true; }else {dev_err (rdev->dev,"Card not posted and no BIOS - ignoring\n" );
@@ -980,7 +980,7 @@ int radeon_atombios_init(struct radeon_device *rdev)return -ENOMEM ; rdev->mode_info.atom_card_info = atom_card_info; - atom_card_info->dev = rdev->ddev; + atom_card_info->dev =rdev_to_drm (rdev); atom_card_info->reg_read = cail_reg_read; atom_card_info->reg_write = cail_reg_write;/* needed for iio ops */
@@ -1005,7 +1005,7 @@ int radeon_atombios_init(struct radeon_device *rdev)mutex_init (&rdev->mode_info.atom_context->mutex);mutex_init (&rdev->mode_info.atom_context->scratch_mutex); -radeon_atom_initialize_bios_scratch_regs (rdev->ddev); +radeon_atom_initialize_bios_scratch_regs (rdev_to_drm (rdev));atom_allocate_fb_scratch (rdev->mode_info.atom_context);return 0 ; }
@@ -1049,7 +1049,7 @@ void radeon_atombios_fini(struct radeon_device *rdev)*/ int radeon_combios_init (struct radeon_device *rdev) { -radeon_combios_initialize_bios_scratch_regs (rdev->ddev); +radeon_combios_initialize_bios_scratch_regs (rdev_to_drm (rdev));return 0 ; }
@@ -1267,8 +1267,6 @@ static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {* radeon_device_init - initialize the driver * * @rdev: radeon_device pointer -* @ddev: drm dev pointer -* @pdev: pci dev pointer * @flags: driver flags * * Initializes the driver info and hw (all asics).
@@ -1276,18 +1274,15 @@ static const struct vga_switcheroo_client_ops radeon_switcheroo_ops = {* Called at driver startup. */ int radeon_device_init (struct radeon_device *rdev, -struct drm_device *ddev, -struct pci_dev *pdev,uint32_t flags) { +struct pci_dev *pdev = rdev->pdev; +struct drm_device *ddev =rdev_to_drm (rdev);int r, i;int dma_bits;bool runtime = false; rdev->shutdown = false; - rdev->dev = &pdev->dev; - rdev->ddev = ddev; - rdev->pdev = pdev; rdev->flags = flags; rdev->family = flags &RADEON_FAMILY_MASK ; rdev->is_atom_bios = false;
@@ -1847,7 +1842,7 @@ int radeon_gpu_reset(struct radeon_device *rdev)downgrade_write (&rdev->exclusive_lock); -drm_helper_resume_force_mode (rdev->ddev); +drm_helper_resume_force_mode (rdev_to_drm (rdev));/* set the power state here in case we are a PX system or headless */ if ((rdev->pm.pm_method ==PM_METHOD_DPM ) && rdev->pm.dpm_enabled)
drivers/gpu/drm/radeon/radeon_display.c +37 -37
214 lines not on this page · raw message
drivers/gpu/drm/radeon/radeon_fbdev.c +13 -13
@@ -67,7 +67,7 @@ static int radeon_fbdev_create_pinned_object(struct drm_fb_helper *fb_helper,int height = mode_cmd->height;u32 cpp; - info =drm_get_format_info (rdev->ddev, mode_cmd); + info =drm_get_format_info (rdev_to_drm (rdev), mode_cmd); cpp = info->cpp[0 ];/* need to align pitch with crtc limits */
@@ -148,15 +148,15 @@ static int radeon_fbdev_fb_open(struct fb_info *info, int user)struct radeon_device *rdev = fb_helper->dev->dev_private;int ret; - ret =pm_runtime_get_sync (rdev->ddev->dev); + ret =pm_runtime_get_sync (rdev_to_drm (rdev)->dev);if (ret <0 && ret != -EACCES ) goto err_pm_runtime_mark_last_busy;return 0 ; err_pm_runtime_mark_last_busy: -pm_runtime_mark_last_busy (rdev->ddev->dev); -pm_runtime_put_autosuspend (rdev->ddev->dev); +pm_runtime_mark_last_busy (rdev_to_drm (rdev)->dev); +pm_runtime_put_autosuspend (rdev_to_drm (rdev)->dev);return ret; }
@@ -165,8 +165,8 @@ static int radeon_fbdev_fb_release(struct fb_info *info, int user)struct drm_fb_helper *fb_helper = info->par;struct radeon_device *rdev = fb_helper->dev->dev_private; -pm_runtime_mark_last_busy (rdev->ddev->dev); -pm_runtime_put_autosuspend (rdev->ddev->dev); +pm_runtime_mark_last_busy (rdev_to_drm (rdev)->dev); +pm_runtime_put_autosuspend (rdev_to_drm (rdev)->dev);return 0 ; }
@@ -236,7 +236,7 @@ static int radeon_fbdev_fb_helper_fb_probe(struct drm_fb_helper *fb_helper, ret = -ENOMEM ; goto err_radeon_fbdev_destroy_pinned_object; } - ret =radeon_framebuffer_init (rdev->ddev, fb, &mode_cmd, gobj); + ret =radeon_framebuffer_init (rdev_to_drm (rdev), fb, &mode_cmd, gobj);if (ret) {DRM_ERROR ("failed to initialize framebuffer %d\n" , ret); goto err_kfree;
@@ -374,12 +374,12 @@ void radeon_fbdev_setup(struct radeon_device *rdev) fb_helper =kzalloc (sizeof (*fb_helper),GFP_KERNEL );if (!fb_helper)return ; -drm_fb_helper_prepare (rdev->ddev, fb_helper, bpp_sel, &radeon_fbdev_fb_helper_funcs); +drm_fb_helper_prepare (rdev_to_drm (rdev), fb_helper, bpp_sel, &radeon_fbdev_fb_helper_funcs); - ret =drm_client_init (rdev->ddev, &fb_helper->client,"radeon-fbdev" , + ret =drm_client_init (rdev_to_drm (rdev), &fb_helper->client,"radeon-fbdev" , &radeon_fbdev_client_funcs);if (ret) { -drm_err (rdev->ddev,"Failed to register client: %d\n" , ret); +drm_err (rdev_to_drm (rdev),"Failed to register client: %d\n" , ret); goto err_drm_client_init; }
@@ -394,13 +394,13 @@ void radeon_fbdev_setup(struct radeon_device *rdev)void radeon_fbdev_set_suspend (struct radeon_device *rdev,int state) { -if (rdev->ddev->fb_helper) -drm_fb_helper_set_suspend (rdev->ddev->fb_helper, state); +if (rdev_to_drm (rdev)->fb_helper) +drm_fb_helper_set_suspend (rdev_to_drm (rdev)->fb_helper, state); }bool radeon_fbdev_robj_is_fb (struct radeon_device *rdev,struct radeon_bo *robj) { -struct drm_fb_helper *fb_helper = rdev->ddev->fb_helper; +struct drm_fb_helper *fb_helper =rdev_to_drm (rdev)->fb_helper;struct drm_gem_object *gobj;if (!fb_helper)
drivers/gpu/drm/radeon/radeon_fence.c +4 -4
@@ -150,7 +150,7 @@ int radeon_fence_emit(struct radeon_device *rdev, rdev->fence_context + ring, seq);radeon_fence_ring_emit (rdev, ring, *fence); -trace_radeon_fence_emit (rdev->ddev, ring, (*fence)->seq); +trace_radeon_fence_emit (rdev_to_drm (rdev), ring, (*fence)->seq);radeon_fence_schedule_check (rdev, ring);return 0 ; }
@@ -489,7 +489,7 @@ static long radeon_fence_wait_seq_timeout(struct radeon_device *rdev,if (!target_seq[i])continue ; -trace_radeon_fence_wait_begin (rdev->ddev, i, target_seq[i]); +trace_radeon_fence_wait_begin (rdev_to_drm (rdev), i, target_seq[i]);radeon_irq_kms_sw_irq_get (rdev, i); }
@@ -511,7 +511,7 @@ static long radeon_fence_wait_seq_timeout(struct radeon_device *rdev,continue ;radeon_irq_kms_sw_irq_put (rdev, i); -trace_radeon_fence_wait_end (rdev->ddev, i, target_seq[i]); +trace_radeon_fence_wait_end (rdev_to_drm (rdev), i, target_seq[i]); }return r;
@@ -995,7 +995,7 @@ DEFINE_DEBUGFS_ATTRIBUTE(radeon_debugfs_gpu_reset_fops,void radeon_debugfs_fence_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("radeon_gpu_reset" ,0444 , root, rdev, &radeon_debugfs_gpu_reset_fops);
drivers/gpu/drm/radeon/radeon_gem.c +1 -1
@@ -899,7 +899,7 @@ DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_gem_info);void radeon_gem_debugfs_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("radeon_gem_info" ,0444 , root, rdev, &radeon_debugfs_gem_info_fops);
drivers/gpu/drm/radeon/radeon_i2c.c +1 -1
@@ -1011,7 +1011,7 @@ void radeon_i2c_add(struct radeon_device *rdev,struct radeon_i2c_bus_rec *rec, const char *name) { - struct drm_device *dev = rdev->ddev; + struct drm_device *dev = rdev_to_drm(rdev);int i;for (i =0 ; i <RADEON_MAX_I2C_BUS ; i++) {
Signature · 1 line
2.45.2
PATCH v3 6/7 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 5
In reply to Wu Hoi PokPlease refer to patch 1.
--- drivers/gpu/drm/radeon/radeon_ib.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 ++++++------ drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 20 ++++++++++---------- drivers/gpu/drm/radeon/radeon_ring.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 6 +++--- 6 files changed, 22 insertions(+), 22 deletions(-)
drivers/gpu/drm/radeon/radeon_ib.c +1 -1
@@ -309,7 +309,7 @@ DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_sa_info);static void radeon_debugfs_sa_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("radeon_sa_info" ,0444 , root, rdev, &radeon_debugfs_sa_info_fops);
drivers/gpu/drm/radeon/radeon_irq_kms.c +6 -6
@@ -80,7 +80,7 @@ static void radeon_hotplug_work_func(struct work_struct *work) { struct radeon_device *rdev = container_of(work, struct radeon_device, hotplug_work.work); -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_mode_config *mode_config = &dev->mode_config;struct drm_connector *connector;
@@ -101,7 +101,7 @@ static void radeon_dp_work_func(struct work_struct *work) { struct radeon_device *rdev = container_of(work, struct radeon_device, dp_work); -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_mode_config *mode_config = &dev->mode_config;struct drm_connector *connector;
@@ -197,7 +197,7 @@ static void radeon_driver_irq_uninstall_kms(struct drm_device *dev)static int radeon_irq_install (struct radeon_device *rdev,int irq) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);int ret;if (irq ==IRQ_NOTCONNECTED )
@@ -218,7 +218,7 @@ static int radeon_irq_install(struct radeon_device *rdev, int irq)static void radeon_irq_uninstall (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct pci_dev *pdev =to_pci_dev (dev->dev);radeon_driver_irq_uninstall_kms (dev);
@@ -322,9 +322,9 @@ int radeon_irq_kms_init(struct radeon_device *rdev)spin_lock_init (&rdev->irq.lock);/* Disable vblank irqs aggressively for power-saving */ - rdev->ddev->vblank_disable_immediate = true; +rdev_to_drm (rdev)->vblank_disable_immediate = true; - r =drm_vblank_init (rdev->ddev, rdev->num_crtc); + r =drm_vblank_init (rdev_to_drm (rdev), rdev->num_crtc);if (r) {return r; }
drivers/gpu/drm/radeon/radeon_object.c +1 -1
@@ -150,7 +150,7 @@ int radeon_bo_create(struct radeon_device *rdev, bo =kzalloc (sizeof (struct radeon_bo ),GFP_KERNEL );if (bo ==NULL )return -ENOMEM ; -drm_gem_private_object_init (rdev->ddev, &bo->tbo.base, size); +drm_gem_private_object_init (rdev_to_drm (rdev), &bo->tbo.base, size); bo->rdev = rdev; bo->surface_reg =-1 ;INIT_LIST_HEAD (&bo->list);
drivers/gpu/drm/radeon/radeon_pm.c +10 -10
@@ -282,7 +282,7 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)if (rdev->irq.installed) { i =0 ; -drm_for_each_crtc (crtc, rdev->ddev) { +drm_for_each_crtc (crtc,rdev_to_drm (rdev)) {if (rdev->pm.active_crtcs & (1 << i)) {/* This can fail if a modeset is in progress */ if (drm_crtc_vblank_get (crtc) ==0 )
@@ -299,7 +299,7 @@ static void radeon_pm_set_clocks(struct radeon_device *rdev)if (rdev->irq.installed) { i =0 ; -drm_for_each_crtc (crtc, rdev->ddev) { +drm_for_each_crtc (crtc,rdev_to_drm (rdev)) {if (rdev->pm.req_vblank & (1 << i)) { rdev->pm.req_vblank &= ~(1 << i);drm_crtc_vblank_put (crtc);
@@ -671,7 +671,7 @@ static ssize_t radeon_hwmon_show_temp(struct device *dev, char *buf) {struct radeon_device *rdev =dev_get_drvdata (dev); -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);int temp;/* Can't get temperature when the card is off */
@@ -715,7 +715,7 @@ static ssize_t radeon_hwmon_show_sclk(struct device *dev, struct device_attribute *attr, char *buf) { struct radeon_device *rdev = dev_get_drvdata(dev); -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);u32 sclk =0 ;/* Can't get clock frequency when the card is off */
@@ -740,7 +740,7 @@ static ssize_t radeon_hwmon_show_vddc(struct device *dev, struct device_attribute *attr, char *buf) { struct radeon_device *rdev = dev_get_drvdata(dev); -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);u16 vddc =0 ;/* Can't get vddc when the card is off */
@@ -1692,7 +1692,7 @@ void radeon_pm_fini(struct radeon_device *rdev)static void radeon_pm_compute_clocks_old (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;
@@ -1765,7 +1765,7 @@ static void radeon_pm_compute_clocks_old(struct radeon_device *rdev)static void radeon_pm_compute_clocks_dpm (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;struct radeon_connector *radeon_connector;
@@ -1826,7 +1826,7 @@ static bool radeon_pm_in_vbl(struct radeon_device *rdev)*/ for (crtc =0 ; (crtc < rdev->num_crtc) && in_vbl; crtc++) {if (rdev->pm.active_crtcs & (1 << crtc)) { - vbl_status = radeon_get_crtc_scanoutpos(rdev->ddev, + vbl_status = radeon_get_crtc_scanoutpos(rdev_to_drm(rdev), crtc, USE_REAL_VBLANKSTART, &vpos, &hpos, NULL, NULL,
@@ -1918,7 +1918,7 @@ static void radeon_dynpm_idle_work_handler(struct work_struct *work)static int radeon_debugfs_pm_info_show (struct seq_file *m,void *unused) {struct radeon_device *rdev = m->private; -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);if ((rdev->flags &RADEON_IS_PX ) && (ddev->switch_power_state !=DRM_SWITCH_POWER_ON )) {
@@ -1955,7 +1955,7 @@ DEFINE_SHOW_ATTRIBUTE(radeon_debugfs_pm_info);static void radeon_debugfs_pm_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("radeon_pm_info" ,0444 , root, rdev, &radeon_debugfs_pm_info_fops);
drivers/gpu/drm/radeon/radeon_ring.c +1 -1
@@ -550,7 +550,7 @@ static void radeon_debugfs_ring_init(struct radeon_device *rdev, struct radeon_r {#if defined(CONFIG_DEBUG_FS )const char *ring_name =radeon_debugfs_ring_idx_to_name (ring->idx); -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;if (ring_name) debugfs_create_file(ring_name, 0444, root, ring,
drivers/gpu/drm/radeon/radeon_ttm.c +3 -3
@@ -682,8 +682,8 @@ int radeon_ttm_init(struct radeon_device *rdev)/* No others user of address space so set it to 0 */ r =ttm_device_init (&rdev->mman.bdev, &radeon_bo_driver, rdev->dev, - rdev->ddev->anon_inode->i_mapping, - rdev->ddev->vma_offset_manager, +rdev_to_drm (rdev)->anon_inode->i_mapping, +rdev_to_drm (rdev)->vma_offset_manager, rdev->need_swiotlb,dma_addressing_limited (&rdev->pdev->dev));if (r) {
@@ -890,7 +890,7 @@ static const struct file_operations radeon_ttm_gtt_fops = {static void radeon_ttm_debugfs_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct drm_minor *minor = rdev->ddev->primary; +struct drm_minor *minor =rdev_to_drm (rdev)->primary;struct dentry *root = minor->debugfs_root; debugfs_create_file("radeon_vram", 0444, root, rdev,
Signature · 1 line
2.45.2
PATCH v3 7/7 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 6
In reply to Wu Hoi PokPlease refer to patch 1.
--- drivers/gpu/drm/radeon/rs400.c | 6 +++--- drivers/gpu/drm/radeon/rs600.c | 14 +++++++------- drivers/gpu/drm/radeon/rs690.c | 2 +- drivers/gpu/drm/radeon/rv515.c | 4 ++-- drivers/gpu/drm/radeon/rv770.c | 2 +- drivers/gpu/drm/radeon/si.c | 4 ++-- 6 files changed, 16 insertions(+), 16 deletions(-)
drivers/gpu/drm/radeon/rs400.c +3 -3
@@ -379,7 +379,7 @@ DEFINE_SHOW_ATTRIBUTE(rs400_debugfs_gart_info);static void rs400_debugfs_pcie_gart_info_init (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("rs400_gart_info" ,0444 , root, rdev, &rs400_debugfs_gart_info_fops);
@@ -474,7 +474,7 @@ int rs400_resume(struct radeon_device *rdev) RREG32(R_0007C0_CP_STAT)); }/* post */ -radeon_combios_asic_init (rdev->ddev); +radeon_combios_asic_init (rdev_to_drm (rdev));/* Resume clock after posting */ r300_clock_startup (rdev);/* Initialize surface registers */
@@ -552,7 +552,7 @@ int rs400_init(struct radeon_device *rdev)return -EINVAL ;/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* initialize memory controller */ rs400_mc_init (rdev);/* Fence driver */
drivers/gpu/drm/radeon/rs600.c +7 -7
@@ -321,7 +321,7 @@ void rs600_pm_misc(struct radeon_device *rdev)void rs600_pm_prepare (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;
@@ -339,7 +339,7 @@ void rs600_pm_prepare(struct radeon_device *rdev)void rs600_pm_finish (struct radeon_device *rdev) { -struct drm_device *ddev = rdev->ddev; +struct drm_device *ddev =rdev_to_drm (rdev);struct drm_crtc *crtc;struct radeon_crtc *radeon_crtc;u32 tmp;
@@ -408,7 +408,7 @@ void rs600_hpd_set_polarity(struct radeon_device *rdev,void rs600_hpd_init (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned enable =0 ;
@@ -435,7 +435,7 @@ void rs600_hpd_init(struct radeon_device *rdev)void rs600_hpd_fini (struct radeon_device *rdev) { -struct drm_device *dev = rdev->ddev; +struct drm_device *dev =rdev_to_drm (rdev);struct drm_connector *connector;unsigned disable =0 ;
@@ -797,7 +797,7 @@ int rs600_irq_process(struct radeon_device *rdev)/* Vertical blank interrupts */ if (G_007EDC_LB_D1_VBLANK_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) {if (rdev->irq.crtc_vblank_int[0 ]) { -drm_handle_vblank (rdev->ddev,0 ); +drm_handle_vblank (rdev_to_drm (rdev),0 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -806,7 +806,7 @@ int rs600_irq_process(struct radeon_device *rdev) }if (G_007EDC_LB_D2_VBLANK_INTERRUPT (rdev->irq.stat_regs.r500.disp_int)) {if (rdev->irq.crtc_vblank_int[1 ]) { -drm_handle_vblank (rdev->ddev,1 ); +drm_handle_vblank (rdev_to_drm (rdev),1 ); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -1133,7 +1133,7 @@ int rs600_init(struct radeon_device *rdev)return -EINVAL ;/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* initialize memory controller */ rs600_mc_init (rdev);r100_debugfs_rbbm_init (rdev);
drivers/gpu/drm/radeon/rs690.c +1 -1
@@ -845,7 +845,7 @@ int rs690_init(struct radeon_device *rdev)return -EINVAL ;/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* initialize memory controller */ rs690_mc_init (rdev);rv515_debugfs (rdev);
drivers/gpu/drm/radeon/rv515.c +2 -2
@@ -255,7 +255,7 @@ DEFINE_SHOW_ATTRIBUTE(rv515_debugfs_ga_info);void rv515_debugfs (struct radeon_device *rdev) {#if defined(CONFIG_DEBUG_FS ) -struct dentry *root = rdev->ddev->primary->debugfs_root; +struct dentry *root =rdev_to_drm (rdev)->primary->debugfs_root;debugfs_create_file ("rv515_pipes_info" ,0444 , root, rdev, &rv515_debugfs_pipes_info_fops);
@@ -636,7 +636,7 @@ int rv515_init(struct radeon_device *rdev)if (radeon_boot_test_post_card (rdev) == false)return -EINVAL ;/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* initialize AGP */ if (rdev->flags &RADEON_IS_AGP ) { r =radeon_agp_init (rdev);
drivers/gpu/drm/radeon/rv770.c +1 -1
@@ -1935,7 +1935,7 @@ int rv770_init(struct radeon_device *rdev)/* Initialize surface registers */ radeon_surface_init (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* Fence driver */ radeon_fence_driver_init (rdev);/* initialize AGP */
drivers/gpu/drm/radeon/si.c +2 -2
@@ -6277,7 +6277,7 @@ int si_irq_process(struct radeon_device *rdev) event_name ="vblank" ;if (rdev->irq.crtc_vblank_int[crtc_idx]) { -drm_handle_vblank (rdev->ddev, crtc_idx); +drm_handle_vblank (rdev_to_drm (rdev), crtc_idx); rdev->pm.vblank_sync = true;wake_up (&rdev->irq.vblank_queue); }
@@ -6839,7 +6839,7 @@ int si_init(struct radeon_device *rdev)/* Initialize surface registers */ radeon_surface_init (rdev);/* Initialize clocks */ -radeon_get_clock_info (rdev->ddev); +radeon_get_clock_info (rdev_to_drm (rdev));/* Fence driver */ radeon_fence_driver_init (rdev);
Signature · 1 line
2.45.2
Hi
Am 24.06.24 um 17:10 schrieb Wu Hoi Pok:
Quoted 4 lines
Changes between v1 and v3:
1. add "
ddev->dev_private= rdev;"
2. include a cover letter
A cover letter should briefly say what the patchset is about.
BTW it's not clear to me why you need to modify radeon_dev.dev for removing the load callback. It seems it's a separate issue.
Best regards
Thomas
Quoted 52 lines
Wu Hoi Pok (7):
drm/radeon: remove load callback drm/radeon: rdev->ddev to rdev_to_drm(rdev) 1 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 2 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 3 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 4 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 5 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 6drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- drivers/gpu/drm/radeon/cik.c | 14 ++-- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 12 ++-- drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r100.c | 24 +++---- drivers/gpu/drm/radeon/r300.c | 6 +- drivers/gpu/drm/radeon/r420.c | 6 +- drivers/gpu/drm/radeon/r520.c | 2 +- drivers/gpu/drm/radeon/r600.c | 12 ++-- drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600_dpm.c | 4 +- drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 11 +++- drivers/gpu/drm/radeon/radeon_acpi.c | 10 +-- drivers/gpu/drm/radeon/radeon_agp.c | 2 +- drivers/gpu/drm/radeon/radeon_atombios.c | 2 +- drivers/gpu/drm/radeon/radeon_audio.c | 4 +- drivers/gpu/drm/radeon/radeon_combios.c | 12 ++-- drivers/gpu/drm/radeon/radeon_device.c | 19 ++---- drivers/gpu/drm/radeon/radeon_display.c | 74 +++++++++++----------- drivers/gpu/drm/radeon/radeon_drv.c | 27 +++++--- drivers/gpu/drm/radeon/radeon_drv.h | 1 - drivers/gpu/drm/radeon/radeon_fbdev.c | 26 ++++---- drivers/gpu/drm/radeon/radeon_fence.c | 8 +-- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- drivers/gpu/drm/radeon/radeon_ib.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 ++-- drivers/gpu/drm/radeon/radeon_kms.c | 18 ++---- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 20 +++--- drivers/gpu/drm/radeon/radeon_ring.c | 2 +- drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- drivers/gpu/drm/radeon/rs400.c | 6 +- drivers/gpu/drm/radeon/rs600.c | 14 ++-- drivers/gpu/drm/radeon/rs690.c | 2 +- drivers/gpu/drm/radeon/rv515.c | 4 +- drivers/gpu/drm/radeon/rv770.c | 2 +- drivers/gpu/drm/radeon/si.c | 4 +- 40 files changed, 193 insertions(+), 191 deletions(-)
Signature · 7 lines
-- Thomas Zimmermann Graphics Driver Developer SUSE Software Solutions Germany GmbH Frankenstrasse 146, 90461 Nuernberg, Germany GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)
Dear Thmoas,
Thanks a lot for the feedback.
I admit that my patch was a mess, sorry about that.
I have submitted a v3 to change a lot of stuff, these patches should be able to be built now.
I also improve readability, where each patch does their own stuff.
Best regards,
Wu
Quoted 80 lines · Thomas Zimmermann
Hi
Am 24.06.24 um 17:10 schrieb Wu Hoi Pok:
Quoted 4 lines
Changes between v1 and v3:
1. add "
ddev->dev_private= rdev;"
2. include a cover letterA cover letter should briefly say what the patchset is about.
BTW it's not clear to me why you need to modify radeon_dev.dev for removing the load callback. It seems it's a separate issue.
Best regards
ThomasQuoted 43 lines
Wu Hoi Pok (7):
drm/radeon: remove load callback drm/radeon: rdev->ddev to rdev_to_drm(rdev) 1 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 2 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 3 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 4 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 5 drm/radeon: rdev->ddev to rdev_to_drm(rdev) 6drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- drivers/gpu/drm/radeon/cik.c | 14 ++-- drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- drivers/gpu/drm/radeon/evergreen.c | 12 ++-- drivers/gpu/drm/radeon/ni.c | 2 +- drivers/gpu/drm/radeon/r100.c | 24 +++---- drivers/gpu/drm/radeon/r300.c | 6 +- drivers/gpu/drm/radeon/r420.c | 6 +- drivers/gpu/drm/radeon/r520.c | 2 +- drivers/gpu/drm/radeon/r600.c | 12 ++-- drivers/gpu/drm/radeon/r600_cs.c | 2 +- drivers/gpu/drm/radeon/r600_dpm.c | 4 +- drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- drivers/gpu/drm/radeon/radeon.h | 11 +++- drivers/gpu/drm/radeon/radeon_acpi.c | 10 +-- drivers/gpu/drm/radeon/radeon_agp.c | 2 +- drivers/gpu/drm/radeon/radeon_atombios.c | 2 +- drivers/gpu/drm/radeon/radeon_audio.c | 4 +- drivers/gpu/drm/radeon/radeon_combios.c | 12 ++-- drivers/gpu/drm/radeon/radeon_device.c | 19 ++---- drivers/gpu/drm/radeon/radeon_display.c | 74 +++++++++++----------- drivers/gpu/drm/radeon/radeon_drv.c | 27 +++++--- drivers/gpu/drm/radeon/radeon_drv.h | 1 - drivers/gpu/drm/radeon/radeon_fbdev.c | 26 ++++---- drivers/gpu/drm/radeon/radeon_fence.c | 8 +-- drivers/gpu/drm/radeon/radeon_gem.c | 2 +- drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- drivers/gpu/drm/radeon/radeon_ib.c | 2 +- drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 ++-- drivers/gpu/drm/radeon/radeon_kms.c | 18 ++---- drivers/gpu/drm/radeon/radeon_object.c | 2 +- drivers/gpu/drm/radeon/radeon_pm.c | 20 +++--- drivers/gpu/drm/radeon/radeon_ring.c | 2 +-Quoted 9 lines
drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- drivers/gpu/drm/radeon/rs400.c | 6 +- drivers/gpu/drm/radeon/rs600.c | 14 ++-- drivers/gpu/drm/radeon/rs690.c | 2 +- drivers/gpu/drm/radeon/rv515.c | 4 +- drivers/gpu/drm/radeon/rv770.c | 2 +- drivers/gpu/drm/radeon/si.c | 4 +- 40 files changed, 193 insertions(+), 191 deletions(-)--
--
Thomas Zimmermann
Graphics Driver Developer
SUSE Software Solutions Germany GmbH
Frankenstrasse 146, 90461 Nuernberg, Germany
GF: Ivo Totev, Andrew Myers, Andrew McDonald, Boudien Moerman HRB 36809 (AG Nuernberg)