drm-openchrome: Branch 'drm-next-6.9' - 3 commits - drivers/gpu/drm

Kevin Brace kevinbrace at kemper.freedesktop.org
Thu Jun 20 19:05:20 UTC 2024


 drivers/gpu/drm/via/via_crtc.c   |   14 +++++++-------
 drivers/gpu/drm/via/via_cursor.c |    2 +-
 drivers/gpu/drm/via/via_hdmi.c   |    6 +++---
 drivers/gpu/drm/via/via_i2c.c    |    1 -
 drivers/gpu/drm/via/via_init.c   |    4 ++--
 drivers/gpu/drm/via/via_object.c |    2 --
 drivers/gpu/drm/via/via_sii164.c |    2 +-
 drivers/gpu/drm/via/via_vt1632.c |    2 +-
 8 files changed, 15 insertions(+), 18 deletions(-)

New commits:
commit ac5e7e1ca4d4e000d8ab468816a26fc2f7480ae0
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Tue Mar 26 11:22:17 2024 -0700

    drm/ttm: replace busy placement with flags v6
    
    Based on commit a78a8da (drm/ttm: replace busy placement with flags
    v6).
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index 0a3203614f92..e93a92f37b38 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -79,7 +79,6 @@ void via_ttm_domain_to_placement(struct via_bo *bo,
 	drm_dbg_driver(dev, "Entered %s.\n", __func__);
 
 	bo->placement.placement = bo->placements;
-	bo->placement.busy_placement = bo->placements;
 
 	if (ttm_domain == TTM_PL_SYSTEM) {
 		bo->placements[i].fpfn = 0;
@@ -106,7 +105,6 @@ void via_ttm_domain_to_placement(struct via_bo *bo,
 	}
 
 	bo->placement.num_placement = i;
-	bo->placement.num_busy_placement = i;
 
 	drm_dbg_driver(dev, "Exiting %s.\n", __func__);
 }
commit 1c72572d10470a4d8d493d972f0acad11538c25a
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Tue Mar 26 11:22:08 2024 -0700

    drm: remove I2C_CLASS_DDC support
    
    Based on commit e965a70 (drm: remove I2C_CLASS_DDC support).
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_i2c.c b/drivers/gpu/drm/via/via_i2c.c
index 228e6fd11b42..0431f4af33e0 100644
--- a/drivers/gpu/drm/via/via_i2c.c
+++ b/drivers/gpu/drm/via/via_i2c.c
@@ -114,7 +114,6 @@ static int create_i2c_bus(struct drm_device *dev,
 
 	sprintf(adapter->name, "via i2c bit bus 0x%02x", i2c_par->i2c_port);
 	adapter->owner = THIS_MODULE;
-	adapter->class = I2C_CLASS_DDC;
 	adapter->algo_data = algo;
 	i2c_set_adapdata(adapter, dev);
 
commit 7643dc2c344f2ff43c329cdb4736aa24e2f0a8ab
Author: Kevin Brace <kevinbrace at bracecomputerlab.com>
Date:   Tue Mar 26 11:21:55 2024 -0700

    drm/via: Add a missing static keyword to functions
    
    Many functions that do not get referenced from outside of the
    file were missing a static keyword when declaring them.
    
    Signed-off-by: Kevin Brace <kevinbrace at bracecomputerlab.com>

diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 74537c31e0f0..743656e55b2b 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -1182,7 +1182,7 @@ void via_load_crtc_pixel_timing(struct drm_crtc *crtc,
 }
 
 /* Load CRTC timing registers */
-void via_load_crtc_timing(struct via_crtc *iga, struct drm_display_mode *mode)
+static void via_load_crtc_timing(struct via_crtc *iga, struct drm_display_mode *mode)
 {
 	struct drm_device *dev = iga->base.dev;
 	struct pci_dev *pdev = to_pci_dev(dev->dev);
@@ -1278,7 +1278,7 @@ void via_load_crtc_timing(struct via_crtc *iga, struct drm_display_mode *mode)
  * crtc : which IGA
  * scale_type : upscaling(VIA_EXPAND) or downscaling(VIA_SHRINK)
  */
-void via_set_scale_path(struct drm_crtc *crtc, u32 scale_type)
+static void via_set_scale_path(struct drm_crtc *crtc, u32 scale_type)
 {
 	struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
 	struct drm_device *dev = crtc->dev;
@@ -1369,7 +1369,7 @@ static void via_disable_iga_scaling(struct drm_crtc *crtc)
  * scale_type	=	VIA_HOR_EXPAND or VIA_VER_EXPAND or VIA_EXPAND or
  *			VIA_SHRINK or VIA_SHRINK + VIA_EXPAND
  */
-bool via_set_iga_scale_function(struct drm_crtc *crtc, u32 scale_type)
+static bool via_set_iga_scale_function(struct drm_crtc *crtc, u32 scale_type)
 {
 	struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
 	struct drm_device *dev = crtc->dev;
@@ -1456,7 +1456,7 @@ bool via_set_iga_scale_function(struct drm_crtc *crtc, u32 scale_type)
  * 2. load scale factors into registers
  * 3. enable H or V scale ( set CRA2 bit7 or bit3 )
  */
-bool via_load_iga_scale_factor_regs(struct via_drm_priv *dev_priv,
+static bool via_load_iga_scale_factor_regs(struct via_drm_priv *dev_priv,
 					struct drm_display_mode *mode,
 					struct drm_display_mode *adjusted_mode,
 					u32 scale_type, u32 is_hor_or_ver)
@@ -1530,7 +1530,7 @@ bool via_load_iga_scale_factor_regs(struct via_drm_priv *dev_priv,
 	return true;
 }
 
-void via_set_iga2_downscale_source_timing(struct drm_crtc *crtc,
+static void via_set_iga2_downscale_source_timing(struct drm_crtc *crtc,
 				struct drm_display_mode *mode,
 				struct drm_display_mode *adjusted_mode)
 {
@@ -1580,7 +1580,7 @@ void via_set_iga2_downscale_source_timing(struct drm_crtc *crtc,
 	drm_mode_destroy(crtc->dev, src_timing);
 }
 
-void via_mode_set_nofb(struct drm_crtc *crtc)
+static void via_mode_set_nofb(struct drm_crtc *crtc)
 {
 	struct drm_device *dev = crtc->dev;
 	struct pci_dev *pdev = to_pci_dev(dev->dev);
@@ -1892,7 +1892,7 @@ static void via_primary_atomic_disable(struct drm_plane *plane,
 	return;
 }
 
-void via_primary_atomic_update(struct drm_plane *plane,
+static void via_primary_atomic_update(struct drm_plane *plane,
 					struct drm_atomic_state *state)
 {
 	struct drm_plane_state *new_state =
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 9e38b9c37d55..594e0ebb9267 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -377,7 +377,7 @@ static void via_cursor_atomic_enable(struct drm_plane *plane,
 	}
 }
 
-void via_cursor_atomic_disable(struct drm_plane *plane,
+static void via_cursor_atomic_disable(struct drm_plane *plane,
 					struct drm_atomic_state *state)
 {
 	struct drm_plane_state *new_state =
diff --git a/drivers/gpu/drm/via/via_hdmi.c b/drivers/gpu/drm/via/via_hdmi.c
index b01552e6b49e..9ad42204b7f2 100644
--- a/drivers/gpu/drm/via/via_hdmi.c
+++ b/drivers/gpu/drm/via/via_hdmi.c
@@ -377,7 +377,7 @@ static unsigned int via_check_hdmi_i2c_status(struct via_drm_priv *dev_priv,
 	return status;
 }
 
-unsigned int via_ddc_read_bytes_by_hdmi(struct via_drm_priv *dev_priv,
+static unsigned int via_ddc_read_bytes_by_hdmi(struct via_drm_priv *dev_priv,
 					unsigned int offset,
 					unsigned char *block)
 {
@@ -449,7 +449,7 @@ unsigned int via_ddc_read_bytes_by_hdmi(struct via_drm_priv *dev_priv,
 	return status;
 }
 
-struct edid* via_hdmi_get_edid(struct drm_connector *connector)
+static struct edid* via_hdmi_get_edid(struct drm_connector *connector)
 {
 	bool print_bad_edid = !connector->bad_edid_counter || (drm_debug_enabled(DRM_UT_KMS));
 	struct drm_device *dev = connector->dev;
@@ -592,7 +592,7 @@ static int via_hdmi_mode_valid(struct drm_connector *connector,
 	return MODE_OK;
 }
 
-int via_hdmi_get_modes(struct drm_connector *connector)
+static int via_hdmi_get_modes(struct drm_connector *connector)
 {
 	struct edid *edid = via_hdmi_get_edid(connector);
 
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index be1c2783703b..1c999e3ebd51 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -1337,7 +1337,7 @@ static const struct drm_mode_config_funcs via_drm_mode_config_funcs = {
 	.atomic_commit		= drm_atomic_helper_commit,
 };
 
-int via_modeset_init(struct drm_device *dev)
+static int via_modeset_init(struct drm_device *dev)
 {
 	struct pci_dev *pdev = to_pci_dev(dev->dev);
 	struct via_drm_priv *dev_priv = to_via_drm_priv(dev);
@@ -1415,7 +1415,7 @@ exit:
 	return ret;
 }
 
-void via_modeset_fini(struct drm_device *dev)
+static void via_modeset_fini(struct drm_device *dev)
 {
 	drm_kms_helper_poll_fini(dev);
 
diff --git a/drivers/gpu/drm/via/via_sii164.c b/drivers/gpu/drm/via/via_sii164.c
index f55304347534..8fddef5b594f 100644
--- a/drivers/gpu/drm/via/via_sii164.c
+++ b/drivers/gpu/drm/via/via_sii164.c
@@ -401,7 +401,7 @@ static const struct drm_connector_funcs via_sii164_drm_connector_funcs = {
 };
 
 
-int via_sii164_mode_valid(struct drm_connector *connector,
+static int via_sii164_mode_valid(struct drm_connector *connector,
 					struct drm_display_mode *mode)
 {
 	struct drm_device *dev = connector->dev;
diff --git a/drivers/gpu/drm/via/via_vt1632.c b/drivers/gpu/drm/via/via_vt1632.c
index 99b6da9f4192..23d2bfd3ef38 100644
--- a/drivers/gpu/drm/via/via_vt1632.c
+++ b/drivers/gpu/drm/via/via_vt1632.c
@@ -421,7 +421,7 @@ static const struct drm_connector_funcs via_vt1632_drm_connector_funcs = {
 };
 
 
-int via_vt1632_mode_valid(struct drm_connector *connector,
+static int via_vt1632_mode_valid(struct drm_connector *connector,
 					struct drm_display_mode *mode)
 {
 	struct drm_device *dev = connector->dev;


More information about the openchrome-devel mailing list