drivers/gpu/drm/via/via_drv.h | 117 ++++++++++++++++++++-------------------
drivers/gpu/drm/via/via_object.c | 15 ++---
drivers/gpu/drm/via/via_pm.c | 10 +--
3 files changed, 73 insertions(+), 69 deletions(-)
New commits:
commit 5fe6fa6222c6d422d33ccf428ac50a768cad9b84
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Oct 6 14:21:13 2023 -0700
drm/via: Alter via_object.c error messages slightly
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index 78d232eb306e..f4e9d33ff319 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -182,7 +182,7 @@ int via_bo_create(struct drm_device *dev,
bo = kzalloc(sizeof(*bo), GFP_KERNEL);
if (!bo) {
- drm_err(dev, "Cannot allocate a TTM buffer object.\n");
+ drm_err(dev, "Cannot allocate a TTM buffer object!\n");
ret = -ENOMEM;
goto exit;
}
@@ -198,7 +198,7 @@ int via_bo_create(struct drm_device *dev,
ret = drm_gem_object_init(dev, &ttm_bo->base, size);
if (ret) {
- drm_err(dev, "Cannot initialize a GEM object.\n");
+ drm_err(dev, "Cannot initialize a GEM object!\n");
goto error;
}
@@ -210,7 +210,7 @@ int via_bo_create(struct drm_device *dev,
PAGE_SIZE >> PAGE_SHIFT, false,
NULL, NULL, via_ttm_bo_destroy);
if (ret) {
- drm_err(dev, "Cannot initialize a TTM object.\n");
+ drm_err(dev, "Cannot initialize a TTM object!\n");
goto exit;
}
@@ -291,7 +291,7 @@ int via_mm_init(struct drm_device *dev)
false,
true);
if (ret) {
- drm_err(dev, "Failed initializing buffer object driver.\n");
+ drm_err(dev, "Failed initializing buffer object driver!\n");
goto exit;
}
@@ -301,7 +301,7 @@ int via_mm_init(struct drm_device *dev)
ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM, false,
dev_priv->vram_size >> PAGE_SHIFT);
if (ret) {
- drm_err(dev, "Failed initializing TTM VRAM memory manager.\n");
+ drm_err(dev, "Failed initializing TTM VRAM memory manager!\n");
goto error_ttm_range_man;
}
commit 976549117c281dfb463f34a3a47e79a1274ab11c
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Oct 6 13:59:57 2023 -0700
drm/via: Small indentation adjustment of via_object.c
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index 34d959e6c0b3..78d232eb306e 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -298,9 +298,8 @@ int via_mm_init(struct drm_device *dev)
/*
* Initialize TTM range manager for VRAM management.
*/
- ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM,
- false,
- dev_priv->vram_size >> PAGE_SHIFT);
+ ret = ttm_range_man_init(&dev_priv->bdev, TTM_PL_VRAM, false,
+ dev_priv->vram_size >> PAGE_SHIFT);
if (ret) {
drm_err(dev, "Failed initializing TTM VRAM memory manager.\n");
goto error_ttm_range_man;
commit 3b398d61132997fccbf932b11a4d0334825fe38a
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Oct 6 13:16:39 2023 -0700
drm/via: Alter via_pm.c error messages slightly
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_pm.c b/drivers/gpu/drm/via/via_pm.c
index f5efa9e89abc..563525c41af8 100644
--- a/drivers/gpu/drm/via/via_pm.c
+++ b/drivers/gpu/drm/via/via_pm.c
@@ -84,7 +84,7 @@ int via_dev_pm_ops_suspend(struct device *dev)
ret = drm_mode_config_helper_suspend(drm_dev);
if (ret) {
- drm_err(drm_dev, "Failed to prepare for suspend.\n");
+ drm_err(drm_dev, "Failed to prepare for suspend!\n");
goto exit;
}
@@ -107,8 +107,8 @@ int via_dev_pm_ops_resume(struct device *dev)
drm_dbg_driver(drm_dev, "Entered %s.\n", __func__);
if (pci_enable_device(pdev)) {
- drm_err(drm_dev, "Failed to initialize a PCI "
- "after resume.\n");
+ drm_err(drm_dev, "Failed to reinitialize a PCI device "
+ "after resume!\n");
ret = -EIO;
goto exit;
}
@@ -178,8 +178,8 @@ int via_dev_pm_ops_resume(struct device *dev)
ret = drm_mode_config_helper_resume(drm_dev);
if (ret) {
- drm_err(drm_dev, "Failed to perform a modeset "
- "after resume.\n");
+ drm_err(drm_dev, "Failed to perform a mode setting "
+ "after resume!\n");
goto exit;
}
commit 56eeb549125af6d72d7989da7ef764de7541aa86
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Oct 6 13:16:37 2023 -0700
drm/via: Rearrange external function declarations
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 288b8bfff446..0c035b907bf3 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -302,14 +302,61 @@ struct via_drm_priv {
#define VGABASE (VIA_BASE+VIA_MMIO_VGABASE)
-extern struct ttm_device_funcs via_bo_driver;
+/* via_connector.c */
+void via_connector_destroy(struct drm_connector *connector);
+
+/* via_crtc.c */
+void via_load_crtc_pixel_timing(struct drm_crtc *crtc,
+ struct drm_display_mode *mode);
+int via_crtc_init(struct via_drm_priv *dev_priv, uint32_t index);
+void via_dac_probe(struct drm_device *dev);
+bool via_vt1632_probe(struct drm_device *dev,
+ struct i2c_adapter *i2c_bus);
+bool via_sii164_probe(struct drm_device *dev,
+ struct i2c_adapter *i2c_bus);
+void via_ext_dvi_probe(struct drm_device *dev);
+void via_tmds_probe(struct drm_device *dev);
+void via_lvds_probe(struct drm_device *dev);
+void via_hdmi_init(struct drm_device *dev, u32 di_port);
+void via_dac_init(struct drm_device *dev);
+void via_vt1632_init(struct drm_device *dev);
+void via_sii164_init(struct drm_device *dev);
+void via_ext_dvi_init(struct drm_device *dev);
+void via_tmds_init(struct drm_device *dev);
+void via_lvds_init(struct drm_device *dev);
+
+/* via_cursor.c */
+extern const struct drm_plane_helper_funcs via_cursor_drm_plane_helper_funcs;
+extern const struct drm_plane_funcs via_cursor_drm_plane_funcs;
+extern const uint32_t via_cursor_formats[];
+extern const unsigned int via_cursor_formats_size;
+/* via_encoder.c */
+void via_encoder_destroy(struct drm_encoder *encoder);
+
+/* via_i2c.c */
+struct i2c_adapter *via_find_ddc_bus(int port);
+void via_i2c_readbytes(struct i2c_adapter *adapter,
+ u8 slave_addr, char offset,
+ u8 *buffer, unsigned int size);
+void via_i2c_writebytes(struct i2c_adapter *adapter,
+ u8 slave_addr, char offset,
+ u8 *data, unsigned int size);
+void via_i2c_reg_init(struct via_drm_priv *dev_priv);
+int via_i2c_init(struct drm_device *dev);
+void via_i2c_exit(void);
+
+/* via_init.c */
int via_drm_init(struct drm_device *dev);
void via_drm_fini(struct drm_device *dev);
-int via_dev_pm_ops_suspend(struct device *dev);
-int via_dev_pm_ops_resume(struct device *dev);
+/* via_ioctl.c */
+int via_gem_alloc_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+int via_gem_mmap_ioctl(struct drm_device *dev, void *data,
+ struct drm_file *file_priv);
+/* via_object.c */
void via_ttm_domain_to_placement(struct via_bo *bo, uint32_t ttm_domain);
void via_ttm_bo_destroy(struct ttm_buffer_object *tbo);
int via_bo_pin(struct via_bo *bo, uint32_t ttm_domain);
@@ -322,6 +369,18 @@ void via_bo_destroy(struct via_bo *bo, bool kmap);
int via_mm_init(struct drm_device *dev);
void via_mm_fini(struct drm_device *dev);
+/* via_pll.c */
+u32 via_get_clk_value(struct drm_device *dev, u32 clk);
+void via_set_vclock(struct drm_crtc *crtc, u32 clk);
+
+/* via_pm.c */
+int via_dev_pm_ops_suspend(struct device *dev);
+int via_dev_pm_ops_resume(struct device *dev);
+
+/* via_ttm.c */
+extern struct ttm_device_funcs via_bo_driver;
+
+/* via_tx.c */
void via_transmitter_io_pad_state(struct drm_device *dev,
uint32_t di_port,
bool io_pad_on);
@@ -338,56 +397,4 @@ void via_transmitter_data_drive_strength(struct drm_device
*dev,
void via_transmitter_display_source(struct drm_device *dev,
u32 di_port, int index);
-void via_encoder_destroy(struct drm_encoder *encoder);
-
-void via_connector_destroy(struct drm_connector *connector);
-
-extern const struct drm_plane_helper_funcs via_cursor_drm_plane_helper_funcs;
-extern const struct drm_plane_funcs via_cursor_drm_plane_funcs;
-extern const uint32_t via_cursor_formats[];
-extern const unsigned int via_cursor_formats_size;
-
-/* i2c */
-struct i2c_adapter *via_find_ddc_bus(int port);
-void via_i2c_readbytes(struct i2c_adapter *adapter,
- u8 slave_addr, char offset,
- u8 *buffer, unsigned int size);
-void via_i2c_writebytes(struct i2c_adapter *adapter,
- u8 slave_addr, char offset,
- u8 *data, unsigned int size);
-void via_i2c_reg_init(struct via_drm_priv *dev_priv);
-int via_i2c_init(struct drm_device *dev);
-void via_i2c_exit(void);
-
-/* clock */
-u32 via_get_clk_value(struct drm_device *dev, u32 clk);
-void via_set_vclock(struct drm_crtc *crtc, u32 clk);
-
-/* crtc */
-void via_load_crtc_pixel_timing(struct drm_crtc *crtc,
- struct drm_display_mode *mode);
-int via_crtc_init(struct via_drm_priv *dev_priv, uint32_t index);
-
-void via_dac_probe(struct drm_device *dev);
-bool via_vt1632_probe(struct drm_device *dev,
- struct i2c_adapter *i2c_bus);
-bool via_sii164_probe(struct drm_device *dev,
- struct i2c_adapter *i2c_bus);
-void via_ext_dvi_probe(struct drm_device *dev);
-void via_tmds_probe(struct drm_device *dev);
-void via_lvds_probe(struct drm_device *dev);
-
-void via_hdmi_init(struct drm_device *dev, u32 di_port);
-void via_dac_init(struct drm_device *dev);
-void via_vt1632_init(struct drm_device *dev);
-void via_sii164_init(struct drm_device *dev);
-void via_ext_dvi_init(struct drm_device *dev);
-void via_tmds_init(struct drm_device *dev);
-void via_lvds_init(struct drm_device *dev);
-
-int via_gem_alloc_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-int via_gem_mmap_ioctl(struct drm_device *dev, void *data,
- struct drm_file *file_priv);
-
#endif /* _VIA_DRV_H */
commit 44f96c1d355ecc53fce9fd35e46f6d9e325370b6
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Fri Oct 6 13:16:34 2023 -0700
drm/via: Delete an obsolete external reference via_driver_num_ioctls
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 3feea09c830b..288b8bfff446 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -302,8 +302,6 @@ struct via_drm_priv {
#define VGABASE (VIA_BASE+VIA_MMIO_VGABASE)
-extern int via_driver_num_ioctls;
-
extern struct ttm_device_funcs via_bo_driver;
int via_drm_init(struct drm_device *dev);
