[openchrome-devel] drm-openchrome: Branch 'drm-next-5.12' - 6 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Apr 2 16:36:25 UTC 2021
drivers/gpu/drm/openchrome/openchrome_drv.c | 84 +++++++++----------------
drivers/gpu/drm/openchrome/openchrome_drv.h | 11 +--
drivers/gpu/drm/openchrome/openchrome_hdmi.c | 2
drivers/gpu/drm/openchrome/openchrome_ioctl.c | 4 -
drivers/gpu/drm/openchrome/openchrome_object.c | 23 ++++++
5 files changed, 64 insertions(+), 60 deletions(-)
New commits:
commit f66ac1c2dd3c65ca3d035407217a2a289c615d6f
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 2 09:33:50 2021 -0700
drm/openchrome: Version bumped to 3.4.7
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 1c0f08da78c6..a36cb5939968 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -61,10 +61,10 @@
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 4
-#define DRIVER_PATCHLEVEL 6
+#define DRIVER_PATCHLEVEL 7
#define DRIVER_NAME "openchrome"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20210331"
+#define DRIVER_DATE "20210402"
#define DRIVER_AUTHOR "OpenChrome Project"
commit bcb616948ba00a93360139beafa1976891b78da1
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 2 09:29:51 2021 -0700
drm/openchrome: Change openchrome_driver{} member names
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 6a7eaa9855a5..7877ef1dee1f 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -42,7 +42,7 @@ MODULE_PARM_DESC(audio, "HDMI Audio enable (1 = enable)");
module_param_named(audio, openchrome_hdmi_audio, int, 0444);
-static int openchrome_drm_driver_open(struct drm_device *dev,
+static int openchrome_driver_open(struct drm_device *dev,
struct drm_file *file_priv)
{
int ret = 0;
@@ -53,7 +53,7 @@ static int openchrome_drm_driver_open(struct drm_device *dev,
return ret;
}
-static void openchrome_drm_driver_postclose(struct drm_device *dev,
+static void openchrome_driver_postclose(struct drm_device *dev,
struct drm_file *file_priv)
{
DRM_DEBUG_KMS("Entered %s.\n", __func__);
@@ -61,7 +61,7 @@ static void openchrome_drm_driver_postclose(struct drm_device *dev,
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
-static void openchrome_drm_driver_lastclose(struct drm_device *dev)
+static void openchrome_driver_lastclose(struct drm_device *dev)
{
DRM_DEBUG_KMS("Entered %s.\n", __func__);
@@ -70,7 +70,7 @@ static void openchrome_drm_driver_lastclose(struct drm_device *dev)
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
-static int openchrome_drm_driver_dumb_create(
+static int openchrome_driver_dumb_create(
struct drm_file *file_priv,
struct drm_device *dev,
struct drm_mode_create_dumb *args)
@@ -114,7 +114,7 @@ exit:
return ret;
}
-static int openchrome_drm_driver_dumb_map_offset(
+static int openchrome_driver_dumb_map_offset(
struct drm_file *file_priv,
struct drm_device *dev,
uint32_t handle,
@@ -156,13 +156,12 @@ static struct drm_driver openchrome_driver = {
DRIVER_GEM |
DRIVER_MODESET |
DRIVER_ATOMIC,
- .open = openchrome_drm_driver_open,
- .postclose = openchrome_drm_driver_postclose,
- .lastclose = openchrome_drm_driver_lastclose,
- .dumb_create = openchrome_drm_driver_dumb_create,
- .dumb_map_offset =
- openchrome_drm_driver_dumb_map_offset,
- .ioctls = openchrome_ioctls,
+ .open = openchrome_driver_open,
+ .postclose = openchrome_driver_postclose,
+ .lastclose = openchrome_driver_lastclose,
+ .dumb_create = openchrome_driver_dumb_create,
+ .dumb_map_offset = openchrome_driver_dumb_map_offset,
+ .ioctls = openchrome_driver_ioctls,
.fops = &openchrome_driver_fops,
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
@@ -255,7 +254,7 @@ static int __init openchrome_init(void)
DRM_DEBUG_KMS("Entered %s.\n", __func__);
- openchrome_driver.num_ioctls = openchrome_max_ioctl;
+ openchrome_driver.num_ioctls = openchrome_driver_num_ioctls;
ret = pci_register_driver(&openchrome_pci_driver);
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index fe9b7bcdff79..1c0f08da78c6 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -365,8 +365,8 @@ disable_second_display_channel(void __iomem *regs)
}
-extern const struct drm_ioctl_desc openchrome_ioctls[];
-extern int openchrome_max_ioctl;
+extern const struct drm_ioctl_desc openchrome_driver_ioctls[];
+extern int openchrome_driver_num_ioctls;
extern int openchrome_hdmi_audio;
diff --git a/drivers/gpu/drm/openchrome/openchrome_ioctl.c b/drivers/gpu/drm/openchrome/openchrome_ioctl.c
index 147b8e92b174..36453b40e775 100644
--- a/drivers/gpu/drm/openchrome/openchrome_ioctl.c
+++ b/drivers/gpu/drm/openchrome/openchrome_ioctl.c
@@ -116,11 +116,11 @@ static int openchrome_gem_unmap_ioctl(struct drm_device *dev,
}
-const struct drm_ioctl_desc openchrome_ioctls[] = {
+const struct drm_ioctl_desc openchrome_driver_ioctls[] = {
DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_CREATE, openchrome_gem_create_ioctl, DRM_AUTH | DRM_UNLOCKED),
DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_MAP, openchrome_gem_map_ioctl, DRM_AUTH | DRM_UNLOCKED),
DRM_IOCTL_DEF_DRV(OPENCHROME_GEM_UNMAP, openchrome_gem_unmap_ioctl, DRM_AUTH | DRM_UNLOCKED),
};
-int openchrome_max_ioctl = ARRAY_SIZE(openchrome_ioctls);
+int openchrome_driver_num_ioctls = ARRAY_SIZE(openchrome_driver_ioctls);
commit 4f680ce5c0d2ef0f3f66f22b3e5e431bd4152b46
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 2 09:24:50 2021 -0700
drm/openchrome: Move openchrome_ttm_mmap() into openchrome_object.c
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index b0c071fe7583..6a7eaa9855a5 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -141,33 +141,12 @@ exit:
return ret;
}
-static int openchrome_drm_mmap(struct file *filp, struct vm_area_struct *vma)
-{
- struct drm_file *file_priv = filp->private_data;
- struct openchrome_drm_private *dev_private =
- file_priv->minor->dev->dev_private;
- int ret = -EINVAL;
-
- DRM_DEBUG_KMS("Entered %s.\n", __func__);
-
- if (!dev_private) {
- DRM_DEBUG_KMS("No device private data.\n");
- ret = -EINVAL;
- goto exit;
- }
-
- ret = ttm_bo_mmap(filp, vma, &dev_private->bdev);
-exit:
- DRM_DEBUG_KMS("Exiting %s.\n", __func__);
- return ret;
-}
-
static const struct file_operations openchrome_driver_fops = {
.owner = THIS_MODULE,
.open = drm_open,
.release = drm_release,
.unlocked_ioctl = drm_ioctl,
- .mmap = openchrome_drm_mmap,
+ .mmap = openchrome_ttm_mmap,
.poll = drm_poll,
.llseek = noop_llseek,
};
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 32ada4de52c6..fe9b7bcdff79 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -390,6 +390,7 @@ void openchrome_drm_fini(struct drm_device *dev);
int openchrome_dev_pm_ops_suspend(struct device *dev);
int openchrome_dev_pm_ops_resume(struct device *dev);
+int openchrome_ttm_mmap(struct file *filp, struct vm_area_struct *vma);
void openchrome_ttm_domain_to_placement(struct openchrome_bo *bo,
uint32_t ttm_domain);
void openchrome_ttm_bo_destroy(struct ttm_buffer_object *tbo);
diff --git a/drivers/gpu/drm/openchrome/openchrome_object.c b/drivers/gpu/drm/openchrome/openchrome_object.c
index bbb7b138bad2..c79f28d87d00 100644
--- a/drivers/gpu/drm/openchrome/openchrome_object.c
+++ b/drivers/gpu/drm/openchrome/openchrome_object.c
@@ -35,6 +35,8 @@
*
*/
+#include <drm/drm_file.h>
+
#include <drm/ttm/ttm_bo_api.h>
#include <drm/ttm/ttm_bo_driver.h>
@@ -57,6 +59,27 @@ static const struct drm_gem_object_funcs openchrome_gem_object_funcs = {
.free = openchrome_gem_free,
};
+int openchrome_ttm_mmap(struct file *filp, struct vm_area_struct *vma)
+{
+ struct drm_file *file_priv = filp->private_data;
+ struct openchrome_drm_private *dev_private =
+ file_priv->minor->dev->dev_private;
+ int ret = -EINVAL;
+
+ DRM_DEBUG_KMS("Entered %s.\n", __func__);
+
+ if (!dev_private) {
+ DRM_DEBUG_KMS("No device private data.\n");
+ ret = -EINVAL;
+ goto exit;
+ }
+
+ ret = ttm_bo_mmap(filp, vma, &dev_private->bdev);
+exit:
+ DRM_DEBUG_KMS("Exiting %s.\n", __func__);
+ return ret;
+}
+
void openchrome_ttm_domain_to_placement(struct openchrome_bo *bo,
uint32_t ttm_domain)
{
commit df42e17929db205c601997d7e86ee8d0c463777d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 2 08:24:05 2021 -0700
drm/openchrome: Move openchrome_pci_driver{} member structs
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index ff950928676e..b0c071fe7583 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -41,10 +41,6 @@ int openchrome_hdmi_audio = 0;
MODULE_PARM_DESC(audio, "HDMI Audio enable (1 = enable)");
module_param_named(audio, openchrome_hdmi_audio, int, 0444);
-static struct pci_device_id openchrome_pci_table[] = {
- viadrv_PCI_IDS,
-};
-MODULE_DEVICE_TABLE(pci, openchrome_pci_table);
static int openchrome_drm_driver_open(struct drm_device *dev,
struct drm_file *file_priv)
@@ -166,11 +162,6 @@ exit:
return ret;
}
-static const struct dev_pm_ops openchrome_dev_pm_ops = {
- .suspend = openchrome_dev_pm_ops_suspend,
- .resume = openchrome_dev_pm_ops_resume,
-};
-
static const struct file_operations openchrome_driver_fops = {
.owner = THIS_MODULE,
.open = drm_open,
@@ -202,6 +193,12 @@ static struct drm_driver openchrome_driver = {
.patchlevel = DRIVER_PATCHLEVEL,
};
+static struct pci_device_id openchrome_pci_table[] = {
+ viadrv_PCI_IDS,
+};
+
+MODULE_DEVICE_TABLE(pci, openchrome_pci_table);
+
static int openchrome_pci_probe(struct pci_dev *pdev,
const struct pci_device_id *ent)
{
@@ -260,6 +257,11 @@ static void openchrome_pci_remove(struct pci_dev *pdev)
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
+static const struct dev_pm_ops openchrome_dev_pm_ops = {
+ .suspend = openchrome_dev_pm_ops_suspend,
+ .resume = openchrome_dev_pm_ops_resume,
+};
+
static struct pci_driver openchrome_pci_driver = {
.name = DRIVER_NAME,
.id_table = openchrome_pci_table,
commit bab81460b36ca466e4ba19e0604c604f6d9b6ab0
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 2 08:03:06 2021 -0700
drm/openchrome: Convert via_* to openchrome_* inside openchrome_drv.c
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 9e294a5a18ee..ff950928676e 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -41,10 +41,10 @@ int openchrome_hdmi_audio = 0;
MODULE_PARM_DESC(audio, "HDMI Audio enable (1 = enable)");
module_param_named(audio, openchrome_hdmi_audio, int, 0444);
-static struct pci_device_id via_pci_table[] = {
+static struct pci_device_id openchrome_pci_table[] = {
viadrv_PCI_IDS,
};
-MODULE_DEVICE_TABLE(pci, via_pci_table);
+MODULE_DEVICE_TABLE(pci, openchrome_pci_table);
static int openchrome_drm_driver_open(struct drm_device *dev,
struct drm_file *file_priv)
@@ -171,7 +171,7 @@ static const struct dev_pm_ops openchrome_dev_pm_ops = {
.resume = openchrome_dev_pm_ops_resume,
};
-static const struct file_operations via_driver_fops = {
+static const struct file_operations openchrome_driver_fops = {
.owner = THIS_MODULE,
.open = drm_open,
.release = drm_release,
@@ -193,7 +193,7 @@ static struct drm_driver openchrome_driver = {
.dumb_map_offset =
openchrome_drm_driver_dumb_map_offset,
.ioctls = openchrome_ioctls,
- .fops = &via_driver_fops,
+ .fops = &openchrome_driver_fops,
.name = DRIVER_NAME,
.desc = DRIVER_DESC,
.date = DRIVER_DATE,
@@ -260,9 +260,9 @@ static void openchrome_pci_remove(struct pci_dev *pdev)
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
-static struct pci_driver via_pci_driver = {
+static struct pci_driver openchrome_pci_driver = {
.name = DRIVER_NAME,
- .id_table = via_pci_table,
+ .id_table = openchrome_pci_table,
.probe = openchrome_pci_probe,
.remove = openchrome_pci_remove,
.driver.pm = &openchrome_dev_pm_ops,
@@ -276,7 +276,7 @@ static int __init openchrome_init(void)
openchrome_driver.num_ioctls = openchrome_max_ioctl;
- ret = pci_register_driver(&via_pci_driver);
+ ret = pci_register_driver(&openchrome_pci_driver);
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
return ret;
@@ -286,7 +286,7 @@ static void __exit openchrome_exit(void)
{
DRM_DEBUG_KMS("Entered %s.\n", __func__);
- pci_unregister_driver(&via_pci_driver);
+ pci_unregister_driver(&openchrome_pci_driver);
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
commit 919daccca2e8e22603cacea697beda84f10f1f96
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Fri Apr 2 07:38:21 2021 -0700
drm/openchrome: Convert via_hdmi_audio parameter to openchrome_hdmi_audio
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.c b/drivers/gpu/drm/openchrome/openchrome_drv.c
index 3173a576ac5e..9e294a5a18ee 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.c
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.c
@@ -36,10 +36,10 @@
#include "openchrome_drv.h"
-int via_hdmi_audio = 0;
+int openchrome_hdmi_audio = 0;
MODULE_PARM_DESC(audio, "HDMI Audio enable (1 = enable)");
-module_param_named(audio, via_hdmi_audio, int, 0444);
+module_param_named(audio, openchrome_hdmi_audio, int, 0444);
static struct pci_device_id via_pci_table[] = {
viadrv_PCI_IDS,
diff --git a/drivers/gpu/drm/openchrome/openchrome_drv.h b/drivers/gpu/drm/openchrome/openchrome_drv.h
index 2aef42d5227c..32ada4de52c6 100644
--- a/drivers/gpu/drm/openchrome/openchrome_drv.h
+++ b/drivers/gpu/drm/openchrome/openchrome_drv.h
@@ -368,7 +368,7 @@ disable_second_display_channel(void __iomem *regs)
extern const struct drm_ioctl_desc openchrome_ioctls[];
extern int openchrome_max_ioctl;
-extern int via_hdmi_audio;
+extern int openchrome_hdmi_audio;
extern struct ttm_bo_driver openchrome_bo_driver;
diff --git a/drivers/gpu/drm/openchrome/openchrome_hdmi.c b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
index a95f0170188c..59285de44e00 100644
--- a/drivers/gpu/drm/openchrome/openchrome_hdmi.c
+++ b/drivers/gpu/drm/openchrome/openchrome_hdmi.c
@@ -653,7 +653,7 @@ via_hdmi_get_modes(struct drm_connector *connector)
if (edid->input & DRM_EDID_INPUT_DIGITAL) {
con = container_of(connector, struct via_connector, base);
- if (via_hdmi_audio)
+ if (openchrome_hdmi_audio)
con->flags |= drm_detect_monitor_audio(edid);
}
}
More information about the openchrome-devel
mailing list