drivers/gpu/drm/via/via_crtc.c | 56 +++++++++++------------
drivers/gpu/drm/via/via_crtc_hw.c | 6 +-
drivers/gpu/drm/via/via_crtc_hw.h | 4 +
drivers/gpu/drm/via/via_cursor.c | 56 ++++++++++-------------
drivers/gpu/drm/via/via_dac.c | 6 +-
drivers/gpu/drm/via/via_display.c | 8 ++-
drivers/gpu/drm/via/via_drv.c | 28 ++++++-----
drivers/gpu/drm/via/via_drv.h | 46 ++++++++-----------
drivers/gpu/drm/via/via_encoder.c | 9 +--
drivers/gpu/drm/via/via_hdmi.c | 8 ++-
drivers/gpu/drm/via/via_i2c.c | 20 ++------
drivers/gpu/drm/via/via_init.c | 13 +++--
drivers/gpu/drm/via/via_ioctl.c | 61 +++++++++++--------------
drivers/gpu/drm/via/via_lvds.c | 8 ++-
drivers/gpu/drm/via/via_object.c | 92 ++++++++++++++++++++------------------
drivers/gpu/drm/via/via_pll.c | 37 +++++++++------
drivers/gpu/drm/via/via_pm.c | 40 +++++++---------
drivers/gpu/drm/via/via_regs.h | 5 --
drivers/gpu/drm/via/via_sii164.c | 9 +--
drivers/gpu/drm/via/via_tmds.c | 8 +--
drivers/gpu/drm/via/via_ttm.c | 40 +++++++---------
drivers/gpu/drm/via/via_vt1632.c | 9 +--
22 files changed, 281 insertions(+), 288 deletions(-)
New commits:
commit fc56960114c0e596963a35f8d07f93a88eb51aa2
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:51:56 2022 -0500
drm/via: Version bumped to 3.5.1
Cleaned up file header sections to properly acknowledge copyright,
authorship, and licensing terms. Switched the module license to GPL.
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 dbda1f666e56..8993844d6b74 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -50,10 +50,10 @@
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 5
-#define DRIVER_PATCHLEVEL 0
+#define DRIVER_PATCHLEVEL 1
#define DRIVER_NAME "via"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20220607"
+#define DRIVER_DATE "20220618"
#define DRIVER_AUTHOR "OpenChrome Project"
commit a33763eba400f9417ff70627c85c156a4b1cbcd1
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:51:54 2022 -0500
drm/via: Destroy a BO if a GEM handle was not acquired
Forgot to destroy a BO of the dumb buffer if acquiring a GEM handle
for it failed.
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 68a8d9ac177c..b38b92dda18a 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -119,6 +119,7 @@ static int via_driver_dumb_create(struct drm_file
*file_priv,
ret = drm_gem_handle_create(file_priv, &ttm_bo->base, &handle);
drm_gem_object_put(&ttm_bo->base);
if (ret) {
+ via_bo_destroy(bo, false);
goto exit;
}
commit 09e8214227828a6e1cc7c826cb6dc75e657e6e6f
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:51:52 2022 -0500
drm/via: Use *ttm_bo to access itself and its members
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 76823a6c1492..afd42bd99f25 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -1912,7 +1912,7 @@ void via_primary_atomic_update(struct drm_plane *plane,
via_iga1_set_color_depth(dev_priv, fb->format->depth);
/* Set the framebuffer offset */
- addr = round_up((bo->ttm_bo.resource->start << PAGE_SHIFT) +
+ addr = round_up((ttm_bo->resource->start << PAGE_SHIFT) +
pitch, 16) >> 1;
vga_wcrt(VGABASE, 0x0D, addr & 0xFF);
@@ -1936,7 +1936,7 @@ void via_primary_atomic_update(struct drm_plane *plane,
via_iga2_set_color_depth(dev_priv, fb->format->depth);
/* Set the framebuffer offset */
- addr = round_up((bo->ttm_bo.resource->start << PAGE_SHIFT) +
+ addr = round_up((ttm_bo->resource->start << PAGE_SHIFT) +
pitch, 16);
/* Bits 9 to 3 of the frame buffer go into bits 7 to 1
* of the register. Bit 0 is for setting tile mode or
@@ -1976,13 +1976,13 @@ static int via_primary_prepare_fb(struct drm_plane
*plane,
ttm_bo = container_of(gem, struct ttm_buffer_object, base);
bo = to_ttm_bo(ttm_bo);
- ret = ttm_bo_reserve(&bo->ttm_bo, true, false, NULL);
+ ret = ttm_bo_reserve(ttm_bo, true, false, NULL);
if (ret) {
goto exit;
}
ret = via_bo_pin(bo, TTM_PL_VRAM);
- ttm_bo_unreserve(&bo->ttm_bo);
+ ttm_bo_unreserve(ttm_bo);
exit:
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
return ret;
@@ -2006,13 +2006,13 @@ static void via_primary_cleanup_fb(struct drm_plane
*plane,
ttm_bo = container_of(gem, struct ttm_buffer_object, base);
bo = to_ttm_bo(ttm_bo);
- ret = ttm_bo_reserve(&bo->ttm_bo, true, false, NULL);
+ ret = ttm_bo_reserve(ttm_bo, true, false, NULL);
if (ret) {
goto exit;
}
via_bo_unpin(bo);
- ttm_bo_unreserve(&bo->ttm_bo);
+ ttm_bo_unreserve(ttm_bo);
exit:
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index f949d5fe8721..9a6bce1cf922 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -270,16 +270,14 @@ static int via_cursor_prepare_fb(struct drm_plane *plane,
ttm_bo = container_of(gem, struct ttm_buffer_object, base);
bo = to_ttm_bo(ttm_bo);
- ret = ttm_bo_reserve(&bo->ttm_bo, true, false, NULL);
+ ret = ttm_bo_reserve(ttm_bo, true, false, NULL);
if (ret) {
goto exit;
}
ret = via_bo_pin(bo, TTM_PL_VRAM);
- ttm_bo_unreserve(&bo->ttm_bo);
- ret = ttm_bo_kmap(&bo->ttm_bo, 0,
- bo->ttm_bo.resource->num_pages,
- &bo->kmap);
+ ttm_bo_unreserve(ttm_bo);
+ ret = ttm_bo_kmap(ttm_bo, 0, ttm_bo->resource->num_pages, &bo->kmap);
if (ret) {
goto exit;
}
@@ -308,13 +306,13 @@ static void via_cursor_cleanup_fb(struct drm_plane *plane,
bo = to_ttm_bo(ttm_bo);
ttm_bo_kunmap(&bo->kmap);
- ret = ttm_bo_reserve(&bo->ttm_bo, true, false, NULL);
+ ret = ttm_bo_reserve(ttm_bo, true, false, NULL);
if (ret) {
goto exit;
}
via_bo_unpin(bo);
- ttm_bo_unreserve(&bo->ttm_bo);
+ ttm_bo_unreserve(ttm_bo);
exit:
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 24a71330ffbc..68a8d9ac177c 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -88,6 +88,7 @@ static int via_driver_dumb_create(struct drm_file *file_priv,
struct drm_device *dev,
struct drm_mode_create_dumb *args)
{
+ struct ttm_buffer_object *ttm_bo;
struct via_drm_priv *dev_priv = to_via_drm_priv(dev);
struct via_bo *bo;
uint32_t handle, pitch;
@@ -113,8 +114,10 @@ static int via_driver_dumb_create(struct drm_file
*file_priv,
goto exit;
}
- ret = drm_gem_handle_create(file_priv, &bo->ttm_bo.base, &handle);
- drm_gem_object_put(&bo->ttm_bo.base);
+ ttm_bo = &bo->ttm_bo;
+
+ ret = drm_gem_handle_create(file_priv, &ttm_bo->base, &handle);
+ drm_gem_object_put(&ttm_bo->base);
if (ret) {
goto exit;
}
@@ -147,7 +150,7 @@ static int via_driver_dumb_map_offset(struct drm_file
*file_priv,
ttm_bo = container_of(gem, struct ttm_buffer_object, base);
bo = to_ttm_bo(ttm_bo);
- *offset = drm_vma_node_offset_addr(&bo->ttm_bo.base.vma_node);
+ *offset = drm_vma_node_offset_addr(&ttm_bo->base.vma_node);
drm_gem_object_put(gem);
exit:
diff --git a/drivers/gpu/drm/via/via_ioctl.c b/drivers/gpu/drm/via/via_ioctl.c
index 01fdf4146b17..6910b4aa6ef4 100644
--- a/drivers/gpu/drm/via/via_ioctl.c
+++ b/drivers/gpu/drm/via/via_ioctl.c
@@ -39,6 +39,7 @@ static int via_gem_create_ioctl(struct drm_device *dev,
struct drm_file *file_priv)
{
struct drm_via_gem_create *args = data;
+ struct ttm_buffer_object *ttm_bo;
struct via_drm_priv *dev_priv = to_via_drm_priv(dev);
struct via_bo *bo;
uint32_t handle;
@@ -54,18 +55,19 @@ static int via_gem_create_ioctl(struct drm_device *dev,
goto exit;
}
- ret = drm_gem_handle_create(file_priv, &bo->ttm_bo.base,
- &handle);
- drm_gem_object_put(&bo->ttm_bo.base);
+ ttm_bo = &bo->ttm_bo;
+
+ ret = drm_gem_handle_create(file_priv, &ttm_bo->base, &handle);
+ drm_gem_object_put(&ttm_bo->base);
if (ret) {
via_bo_destroy(bo, false);
goto exit;
}
- args->size = bo->ttm_bo.base.size;
- args->domain = bo->ttm_bo.resource->placement;
- args->handle = handle;
- args->offset = bo->ttm_bo.resource->start << PAGE_SHIFT;
+ args->size = ttm_bo->base.size;
+ args->domain = ttm_bo->resource->placement;
+ args->handle = handle;
+ args->offset = ttm_bo->resource->start << PAGE_SHIFT;
exit:
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
return ret;
@@ -78,7 +80,6 @@ static int via_gem_map_ioctl(struct drm_device *dev,
struct drm_via_gem_map *args = data;
struct drm_gem_object *gem;
struct ttm_buffer_object *ttm_bo;
- struct via_bo *bo;
int ret = 0;
DRM_DEBUG_KMS("Entered %s.\n", __func__);
@@ -90,10 +91,8 @@ static int via_gem_map_ioctl(struct drm_device *dev,
}
ttm_bo = container_of(gem, struct ttm_buffer_object, base);
- bo = to_ttm_bo(ttm_bo);
- args->map_offset = drm_vma_node_offset_addr(
- &bo->ttm_bo.base.vma_node);
+ args->map_offset = drm_vma_node_offset_addr(&ttm_bo->base.vma_node);
exit:
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
return ret;
diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index 3b2053198f37..0f96df8da786 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -45,14 +45,12 @@
static void via_gem_free(struct drm_gem_object *obj)
{
struct ttm_buffer_object *ttm_bo;
- struct via_bo *bo;
DRM_DEBUG_KMS("Entered %s.\n", __func__);
ttm_bo = container_of(obj, struct ttm_buffer_object, base);
- bo = to_ttm_bo(ttm_bo);
- ttm_bo_put(&bo->ttm_bo);
+ ttm_bo_put(ttm_bo);
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
@@ -120,7 +118,7 @@ void via_ttm_bo_destroy(struct ttm_buffer_object *tbo)
bo = to_ttm_bo(tbo);
- drm_gem_object_release(&bo->ttm_bo.base);
+ drm_gem_object_release(&tbo->base);
kfree(bo);
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
@@ -128,23 +126,26 @@ void via_ttm_bo_destroy(struct ttm_buffer_object *tbo)
int via_bo_pin(struct via_bo *bo, uint32_t ttm_domain)
{
+ struct ttm_buffer_object *ttm_bo;
struct ttm_operation_ctx ctx = {false, false};
int ret = 0;
DRM_DEBUG_KMS("Entered %s.\n", __func__);
- if (bo->ttm_bo.pin_count) {
+ ttm_bo = &bo->ttm_bo;
+
+ if (ttm_bo->pin_count) {
goto pin;
}
via_ttm_domain_to_placement(bo, ttm_domain);
- ret = ttm_bo_validate(&bo->ttm_bo, &bo->placement, &ctx);
+ ret = ttm_bo_validate(ttm_bo, &bo->placement, &ctx);
if (ret) {
goto exit;
}
pin:
- ttm_bo_pin(&bo->ttm_bo);
+ ttm_bo_pin(ttm_bo);
exit:
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
@@ -153,9 +154,13 @@ exit:
void via_bo_unpin(struct via_bo *bo)
{
+ struct ttm_buffer_object *ttm_bo;
+
DRM_DEBUG_KMS("Entered %s.\n", __func__);
- ttm_bo_unpin(&bo->ttm_bo);
+ ttm_bo = &bo->ttm_bo;
+
+ ttm_bo_unpin(ttm_bo);
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
@@ -168,6 +173,7 @@ int via_bo_create(struct drm_device *dev,
bool kmap,
struct via_bo **bo_ptr)
{
+ struct ttm_buffer_object *ttm_bo;
struct via_drm_priv *dev_priv = to_via_drm_priv(dev);
struct via_bo *bo;
int ret;
@@ -182,6 +188,8 @@ int via_bo_create(struct drm_device *dev,
goto exit;
}
+ ttm_bo = &bo->ttm_bo;
+
/*
* It is imperative to page align the requested buffer size
* prior to a memory allocation request, or various memory
@@ -189,16 +197,16 @@ int via_bo_create(struct drm_device *dev,
*/
size = ALIGN(size, PAGE_SIZE);
- ret = drm_gem_object_init(dev, &bo->ttm_bo.base, size);
+ ret = drm_gem_object_init(dev, &ttm_bo->base, size);
if (ret) {
DRM_ERROR("Cannot initialize a GEM object.\n");
goto error;
}
- bo->ttm_bo.base.funcs = &via_gem_object_funcs;
+ ttm_bo->base.funcs = &via_gem_object_funcs;
via_ttm_domain_to_placement(bo, ttm_domain);
- ret = ttm_bo_init(&dev_priv->bdev, &bo->ttm_bo,
+ ret = ttm_bo_init(&dev_priv->bdev, ttm_bo,
size, type, &bo->placement,
PAGE_SIZE >> PAGE_SHIFT, false,
NULL, NULL, via_ttm_bo_destroy);
@@ -208,24 +216,23 @@ int via_bo_create(struct drm_device *dev,
}
if (kmap) {
- ret = ttm_bo_reserve(&bo->ttm_bo, true, false, NULL);
+ ret = ttm_bo_reserve(ttm_bo, true, false, NULL);
if (ret) {
- ttm_bo_put(&bo->ttm_bo);
+ ttm_bo_put(ttm_bo);
goto exit;
}
ret = via_bo_pin(bo, ttm_domain);
- ttm_bo_unreserve(&bo->ttm_bo);
+ ttm_bo_unreserve(ttm_bo);
if (ret) {
- ttm_bo_put(&bo->ttm_bo);
+ ttm_bo_put(ttm_bo);
goto exit;
}
- ret = ttm_bo_kmap(&bo->ttm_bo, 0,
- bo->ttm_bo.resource->num_pages,
+ ret = ttm_bo_kmap(ttm_bo, 0, ttm_bo->resource->num_pages,
&bo->kmap);
if (ret) {
- ttm_bo_put(&bo->ttm_bo);
+ ttm_bo_put(ttm_bo);
goto exit;
}
}
@@ -241,26 +248,29 @@ exit:
void via_bo_destroy(struct via_bo *bo, bool kmap)
{
+ struct ttm_buffer_object *ttm_bo;
int ret;
DRM_DEBUG_KMS("Entered %s.\n", __func__);
+ ttm_bo = &bo->ttm_bo;
+
if (kmap) {
ttm_bo_kunmap(&bo->kmap);
- ret = ttm_bo_reserve(&bo->ttm_bo, true, false, NULL);
+ ret = ttm_bo_reserve(ttm_bo, true, false, NULL);
if (ret) {
goto exit;
}
via_bo_unpin(bo);
- ttm_bo_unreserve(&bo->ttm_bo);
+ ttm_bo_unreserve(ttm_bo);
if (ret) {
goto exit;
}
}
- ttm_bo_put(&bo->ttm_bo);
+ ttm_bo_put(ttm_bo);
exit:
DRM_DEBUG_KMS("Exiting %s.\n", __func__);
}
commit 6e625d07a0ecfb9a8348da533510bd86b6112130
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:51:48 2022 -0500
drm/via: Stop lying about supporting interrupts
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 94d326ffb462..24a71330ffbc 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -166,8 +166,7 @@ static const struct file_operations via_driver_fops = {
};
static struct drm_driver via_driver = {
- .driver_features = DRIVER_HAVE_IRQ |
- DRIVER_GEM |
+ .driver_features = DRIVER_GEM |
DRIVER_MODESET |
DRIVER_ATOMIC,
.open = via_driver_open,
commit 5e2dcaa530c776719dfa66b6735c531874ab0497
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:51:42 2022 -0500
drm/via: Change the module license to GPL
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index a8081fb705f2..94d326ffb462 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -312,4 +312,4 @@ module_exit(via_exit);
MODULE_AUTHOR(DRIVER_AUTHOR);
MODULE_DESCRIPTION(DRIVER_DESC);
-MODULE_LICENSE("GPL and additional rights");
+MODULE_LICENSE("GPL");
commit a0f3117569a0b9155476f890327974f3f75ab033
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:49:25 2022 -0500
drm/via: Add Kevin Brace to the author section of file header
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 74bde71c839d..32184e6a01f3 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -22,6 +22,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_display.c
b/drivers/gpu/drm/via/via_display.c
index e864aa7cae78..6c6b902c828e 100644
--- a/drivers/gpu/drm/via/via_display.c
+++ b/drivers/gpu/drm/via/via_display.c
@@ -22,6 +22,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index eb122d3e540f..a8081fb705f2 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -22,6 +22,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index c3390fac79cb..a46b9fb79884 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -25,6 +25,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
* Luc Verhaegen
*/
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index ffe1e1cd249d..c8ec693d3ad2 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -24,6 +24,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
commit 23cad51fb590644f5c8540a0f2439526f3abccb2
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:08:20 2022 -0500
drm/via: Add or remove James Simmons from the author section of file header
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index ceb9085ce526..eb122d3e540f 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -22,6 +22,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * James Simmons <jsimm...@infradead.org>
*/
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/via/via_i2c.c b/drivers/gpu/drm/via/via_i2c.c
index a502f31ae40f..f2e8b118754e 100644
--- a/drivers/gpu/drm/via/via_i2c.c
+++ b/drivers/gpu/drm/via/via_i2c.c
@@ -5,6 +5,7 @@
* Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
*
* Author(s):
+ * James Simmons <jsimm...@infradead.org>
*/
#include <linux/delay.h>
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index 470519ff65da..c3390fac79cb 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -25,6 +25,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * James Simmons <jsimm...@infradead.org>
* Luc Verhaegen
*/
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index a6e5675e791b..ffe1e1cd249d 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -24,6 +24,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * James Simmons <jsimm...@infradead.org>
*/
#include <linux/delay.h>
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 02e93c043d8c..ec61d044504d 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -23,6 +23,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * James Simmons <jsimm...@infradead.org>
*/
#include <linux/delay.h>
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 9ba647a5f852..11c29c69239e 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -22,7 +22,6 @@
*
* Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
- * James Simmons <jsimm...@infradead.org>
*/
#include <linux/pci.h>
commit 46ac48a0f056168f72dd2a5b4b0edac7f3b607c1
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:08:10 2022 -0500
drm/via: Add Luc Verhaegen to the author section of file header
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index c97d4e70c220..470519ff65da 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -25,6 +25,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Author(s):
+ * Luc Verhaegen
*/
#include <linux/pci.h>
commit 2d1fc995f881f536dc7829470f5a2b5831a31549
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:08:06 2022 -0500
drm/via: Add or modify file header author section
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index a75d4256ddfa..76823a6c1492 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -22,10 +22,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_crtc_hw.c
b/drivers/gpu/drm/via/via_crtc_hw.c
index 1f6b10d45688..f5446da52c0f 100644
--- a/drivers/gpu/drm/via/via_crtc_hw.c
+++ b/drivers/gpu/drm/via/via_crtc_hw.c
@@ -20,8 +20,8 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * Authors:
- * James Simmons <jsimm...@infradead.org>
+ * Author(s):
+ * James Simmons <jsimm...@infradead.org>
*/
#include <video/vga.h>
diff --git a/drivers/gpu/drm/via/via_crtc_hw.h
b/drivers/gpu/drm/via/via_crtc_hw.h
index a31c82181452..9cce4fdcb33a 100644
--- a/drivers/gpu/drm/via/via_crtc_hw.h
+++ b/drivers/gpu/drm/via/via_crtc_hw.h
@@ -20,7 +20,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * Authors:
+ * Author(s):
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index c14892b12a70..f949d5fe8721 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -22,10 +22,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index c457ecbef2b8..74bde71c839d 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -21,7 +21,7 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * Authors:
+ * Author(s):
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_display.c
b/drivers/gpu/drm/via/via_display.c
index d5b337e545aa..e864aa7cae78 100644
--- a/drivers/gpu/drm/via/via_display.c
+++ b/drivers/gpu/drm/via/via_display.c
@@ -21,8 +21,8 @@
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * Authors:
- * James Simmons <jsimm...@infradead.org>
+ * Author(s):
+ * James Simmons <jsimm...@infradead.org>
*/
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index c452c872b51c..ceb9085ce526 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -20,6 +20,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
+ *
+ * Author(s):
*/
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 999980366821..dbda1f666e56 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -20,10 +20,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_encoder.c
b/drivers/gpu/drm/via/via_encoder.c
index 6c83a1353f1d..eae693fc5141 100644
--- a/drivers/gpu/drm/via/via_encoder.c
+++ b/drivers/gpu/drm/via/via_encoder.c
@@ -19,12 +19,9 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
- *
*/
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/via/via_hdmi.c b/drivers/gpu/drm/via/via_hdmi.c
index bf5c077217a9..9412054a24df 100644
--- a/drivers/gpu/drm/via/via_hdmi.c
+++ b/drivers/gpu/drm/via/via_hdmi.c
@@ -22,8 +22,8 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * Authors:
- * James Simmons <jsimm...@infradead.org>
+ * Author(s):
+ * James Simmons <jsimm...@infradead.org>
*/
#include <linux/delay.h>
diff --git a/drivers/gpu/drm/via/via_i2c.c b/drivers/gpu/drm/via/via_i2c.c
index aed8bd035676..a502f31ae40f 100644
--- a/drivers/gpu/drm/via/via_i2c.c
+++ b/drivers/gpu/drm/via/via_i2c.c
@@ -3,6 +3,8 @@
* Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+ *
+ * Author(s):
*/
#include <linux/delay.h>
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index 085432c210be..c97d4e70c220 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -23,6 +23,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
+ *
+ * Author(s):
*/
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/via/via_ioctl.c b/drivers/gpu/drm/via/via_ioctl.c
index e1ed3743f566..01fdf4146b17 100644
--- a/drivers/gpu/drm/via/via_ioctl.c
+++ b/drivers/gpu/drm/via/via_ioctl.c
@@ -19,10 +19,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
*/
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index d56b0eede8b6..a6e5675e791b 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -22,6 +22,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
+ *
+ * Author(s):
*/
#include <linux/delay.h>
diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index b6b2319a456b..3b2053198f37 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -19,10 +19,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
*/
/*
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 239fec01e506..02e93c043d8c 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -21,6 +21,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
+ *
+ * Author(s):
*/
#include <linux/delay.h>
diff --git a/drivers/gpu/drm/via/via_pm.c b/drivers/gpu/drm/via/via_pm.c
index 1289f0a685a7..9b80886ab06a 100644
--- a/drivers/gpu/drm/via/via_pm.c
+++ b/drivers/gpu/drm/via/via_pm.c
@@ -19,10 +19,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
*/
diff --git a/drivers/gpu/drm/via/via_sii164.c b/drivers/gpu/drm/via/via_sii164.c
index b3b15a4d74ca..76f8dd783eca 100644
--- a/drivers/gpu/drm/via/via_sii164.c
+++ b/drivers/gpu/drm/via/via_sii164.c
@@ -19,12 +19,9 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
- *
*/
#include <drm/drm_atomic_state_helper.h>
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index ebef65da3fa3..9ba647a5f852 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -20,9 +20,9 @@
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*
- * Authors:
- * Kevin Brace <kevinbr...@bracecomputerlab.com>
- * James Simmons <jsimm...@infradead.org>
+ * Author(s):
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
+ * James Simmons <jsimm...@infradead.org>
*/
#include <linux/pci.h>
diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c
index 318d2a3e60b6..8676623ee074 100644
--- a/drivers/gpu/drm/via/via_ttm.c
+++ b/drivers/gpu/drm/via/via_ttm.c
@@ -19,10 +19,8 @@
* OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
*/
/*
diff --git a/drivers/gpu/drm/via/via_vt1632.c b/drivers/gpu/drm/via/via_vt1632.c
index 14c340dc5a1d..c621b116933b 100644
--- a/drivers/gpu/drm/via/via_vt1632.c
+++ b/drivers/gpu/drm/via/via_vt1632.c
@@ -19,12 +19,9 @@
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
- */
-/*
- * Author(s):
*
+ * Author(s):
* Kevin Brace <kevinbr...@bracecomputerlab.com>
- *
*/
#include <drm/drm_atomic_state_helper.h>
commit 6f2a3cc0e42f2f2398e3d2fef1a7b7f6ce7a47f8
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:08:01 2022 -0500
drm/via: Update Kevin Brace contact e-mail
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 70c0a2bd5f9d..a75d4256ddfa 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -26,7 +26,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 17d9964773f6..c14892b12a70 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -26,7 +26,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 2b573551b14f..999980366821 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -24,7 +24,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_encoder.c
b/drivers/gpu/drm/via/via_encoder.c
index 7c425e999b3b..6c83a1353f1d 100644
--- a/drivers/gpu/drm/via/via_encoder.c
+++ b/drivers/gpu/drm/via/via_encoder.c
@@ -23,7 +23,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
*
*/
diff --git a/drivers/gpu/drm/via/via_ioctl.c b/drivers/gpu/drm/via/via_ioctl.c
index 783777541bb4..e1ed3743f566 100644
--- a/drivers/gpu/drm/via/via_ioctl.c
+++ b/drivers/gpu/drm/via/via_ioctl.c
@@ -23,7 +23,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
*/
#include <drm/drm_gem.h>
diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index 5ef710a56f9e..b6b2319a456b 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -23,7 +23,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
*/
/*
* via_object.c
diff --git a/drivers/gpu/drm/via/via_pm.c b/drivers/gpu/drm/via/via_pm.c
index 7843274ea9c5..1289f0a685a7 100644
--- a/drivers/gpu/drm/via/via_pm.c
+++ b/drivers/gpu/drm/via/via_pm.c
@@ -23,7 +23,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
*/
diff --git a/drivers/gpu/drm/via/via_sii164.c b/drivers/gpu/drm/via/via_sii164.c
index d26591caca0c..b3b15a4d74ca 100644
--- a/drivers/gpu/drm/via/via_sii164.c
+++ b/drivers/gpu/drm/via/via_sii164.c
@@ -23,7 +23,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
*
*/
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 486b9d9291a8..ebef65da3fa3 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -21,7 +21,7 @@
* DEALINGS IN THE SOFTWARE.
*
* Authors:
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
* James Simmons <jsimm...@infradead.org>
*/
diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c
index 4ec97826c9c0..318d2a3e60b6 100644
--- a/drivers/gpu/drm/via/via_ttm.c
+++ b/drivers/gpu/drm/via/via_ttm.c
@@ -23,7 +23,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
*/
/*
* via_ttm.c
diff --git a/drivers/gpu/drm/via/via_vt1632.c b/drivers/gpu/drm/via/via_vt1632.c
index 78e9b48a60b2..14c340dc5a1d 100644
--- a/drivers/gpu/drm/via/via_vt1632.c
+++ b/drivers/gpu/drm/via/via_vt1632.c
@@ -23,7 +23,7 @@
/*
* Author(s):
*
- * Kevin Brace <kevinbr...@gmx.com>
+ * Kevin Brace <kevinbr...@bracecomputerlab.com>
*
*/
commit dfdef287813f4090b1c0bca756232221792487c4
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:07:56 2022 -0500
drm/via: Update Kevin Brace copyright notice and year
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 1fffee421cad..70c0a2bd5f9d 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2019-2020 Kevin Brace
+ * Copyright © 2019-2020 Kevin Brace.
* Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index d0ee4188c944..17d9964773f6 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2019-2020 Kevin Brace
+ * Copyright © 2019-2020 Kevin Brace.
* Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index ca8478befeba..c457ecbef2b8 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -1,4 +1,5 @@
/*
+ * Copyright © 2016-2018 Kevin Brace.
* Copyright 2012 James Simmons. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/drivers/gpu/drm/via/via_display.c
b/drivers/gpu/drm/via/via_display.c
index 27a9ad69e71c..d5b337e545aa 100644
--- a/drivers/gpu/drm/via/via_display.c
+++ b/drivers/gpu/drm/via/via_display.c
@@ -1,4 +1,5 @@
/*
+ * Copyright © 2017-2020 Kevin Brace.
* Copyright 2012 James Simmons. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 69ed3e9db580..c452c872b51c 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Kevin Brace. All Rights Reserved.
+ * Copyright © 2019-2021 Kevin Brace.
* Copyright 2012 James Simmons. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 3480f9b8b5ea..2b573551b14f 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -1,5 +1,5 @@
/*
- * Copyright © 2019 Kevin Brace
+ * Copyright © 2019 Kevin Brace.
* Copyright 2012 James Simmons. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
diff --git a/drivers/gpu/drm/via/via_encoder.c
b/drivers/gpu/drm/via/via_encoder.c
index c7104f275bd5..7c425e999b3b 100644
--- a/drivers/gpu/drm/via/via_encoder.c
+++ b/drivers/gpu/drm/via/via_encoder.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2017-2018 Kevin Brace. All Rights Reserved.
+ * Copyright © 2017-2018 Kevin Brace.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index fd142db64a1c..085432c210be 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Kevin Brace. All Rights Reserved.
+ * Copyright © 2019 Kevin Brace.
* Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 2006-2009 Luc Verhaegen.
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
diff --git a/drivers/gpu/drm/via/via_ioctl.c b/drivers/gpu/drm/via/via_ioctl.c
index c7ef46c5b4a4..783777541bb4 100644
--- a/drivers/gpu/drm/via/via_ioctl.c
+++ b/drivers/gpu/drm/via/via_ioctl.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2020 Kevin Brace
+ * Copyright © 2020 Kevin Brace.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index 47ac376abd4f..d56b0eede8b6 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2017 Kevin Brace. All Rights Reserved.
+ * Copyright © 2016-2018 Kevin Brace.
* Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index 1bd9f2d6ed75..5ef710a56f9e 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2018-2019 Kevin Brace
+ * Copyright © 2018-2019 Kevin Brace.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_pm.c b/drivers/gpu/drm/via/via_pm.c
index 061391271825..7843274ea9c5 100644
--- a/drivers/gpu/drm/via/via_pm.c
+++ b/drivers/gpu/drm/via/via_pm.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2017 Kevin Brace
+ * Copyright © 2017-2020 Kevin Brace.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_sii164.c b/drivers/gpu/drm/via/via_sii164.c
index 30ed720b8854..d26591caca0c 100644
--- a/drivers/gpu/drm/via/via_sii164.c
+++ b/drivers/gpu/drm/via/via_sii164.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Kevin Brace. All Rights Reserved.
+ * Copyright © 2016-2018 Kevin Brace.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index f6c54fcac236..486b9d9291a8 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Kevin Brace. All Rights Reserved.
+ * Copyright © 2016-2018 Kevin Brace.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c
index fd27ca314d86..4ec97826c9c0 100644
--- a/drivers/gpu/drm/via/via_ttm.c
+++ b/drivers/gpu/drm/via/via_ttm.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2018-2019 Kevin Brace
+ * Copyright © 2018-2019 Kevin Brace.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_vt1632.c b/drivers/gpu/drm/via/via_vt1632.c
index 9cd640e2bc65..78e9b48a60b2 100644
--- a/drivers/gpu/drm/via/via_vt1632.c
+++ b/drivers/gpu/drm/via/via_vt1632.c
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2016-2018 Kevin Brace. All Rights Reserved.
+ * Copyright © 2016-2018 Kevin Brace.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
commit db5d1dd9c4de2ba0955f47ce9cd1c38fe2345249
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:07:50 2022 -0500
drm/via: Change license language line limit assumption
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index f103b8b5a76e..1fffee421cad 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -4,25 +4,23 @@
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice (including
- * the next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
/*
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index b9656303ee5a..d0ee4188c944 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -4,25 +4,23 @@
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice (including
- * the next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
/*
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 632e9fc76bf7..3480f9b8b5ea 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -2,25 +2,23 @@
* Copyright © 2019 Kevin Brace
* Copyright 2012 James Simmons. All Rights Reserved.
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice (including
- * the next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
/*
diff --git a/drivers/gpu/drm/via/via_ioctl.c b/drivers/gpu/drm/via/via_ioctl.c
index 52cb0b0ce2b1..c7ef46c5b4a4 100644
--- a/drivers/gpu/drm/via/via_ioctl.c
+++ b/drivers/gpu/drm/via/via_ioctl.c
@@ -1,25 +1,23 @@
/*
* Copyright © 2020 Kevin Brace
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice (including
- * the next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
/*
diff --git a/drivers/gpu/drm/via/via_object.c b/drivers/gpu/drm/via/via_object.c
index a8c6a569043b..1bd9f2d6ed75 100644
--- a/drivers/gpu/drm/via/via_object.c
+++ b/drivers/gpu/drm/via/via_object.c
@@ -1,25 +1,23 @@
/*
* Copyright © 2018-2019 Kevin Brace
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice (including
- * the next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
/*
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index aa6ef5aeaeb5..239fec01e506 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -3,25 +3,23 @@
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice (including
- * the next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
diff --git a/drivers/gpu/drm/via/via_pm.c b/drivers/gpu/drm/via/via_pm.c
index bc6d30a9100a..061391271825 100644
--- a/drivers/gpu/drm/via/via_pm.c
+++ b/drivers/gpu/drm/via/via_pm.c
@@ -1,25 +1,23 @@
/*
* Copyright © 2017 Kevin Brace
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice (including
- * the next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
/*
diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c
index 721f3608c505..fd27ca314d86 100644
--- a/drivers/gpu/drm/via/via_ttm.c
+++ b/drivers/gpu/drm/via/via_ttm.c
@@ -1,25 +1,23 @@
/*
* Copyright © 2018-2019 Kevin Brace
*
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sub license,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
*
- * The above copyright notice and this permission notice (including
- * the next paragraph) shall be included in all copies or substantial
- * portions of the Software.
+ * The above copyright notice and this permission notice (including the
+ * next paragraph) shall be included in all copies or substantial portions
+ * of the Software.
*
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
- * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHOR(S) OR COPYRIGHT HOLDER(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
* DEALINGS IN THE SOFTWARE.
*/
/*
commit e2e6357fabf83a731565933d1fc936ea0a8311f9
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:07:45 2022 -0500
drm/via: Make James Simmons copyright notice more consistent
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 5d69a32b9932..f103b8b5a76e 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -1,6 +1,6 @@
/*
* Copyright © 2019-2020 Kevin Brace
- * Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
+ * Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index b1b16b64eb33..b9656303ee5a 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -1,6 +1,6 @@
/*
* Copyright © 2019-2020 Kevin Brace
- * Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
+ * Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
diff --git a/drivers/gpu/drm/via/via_dac.c b/drivers/gpu/drm/via/via_dac.c
index 67a5c0516387..ca8478befeba 100644
--- a/drivers/gpu/drm/via/via_dac.c
+++ b/drivers/gpu/drm/via/via_dac.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2012 James Simmons
+ * Copyright 2012 James Simmons. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index f4ab479676fc..69ed3e9db580 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -1,6 +1,6 @@
/*
* Copyright 2017 Kevin Brace. All Rights Reserved.
- * Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
+ * Copyright 2012 James Simmons. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 93e00ce2d841..632e9fc76bf7 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -1,6 +1,6 @@
/*
* Copyright © 2019 Kevin Brace
- * Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
+ * Copyright 2012 James Simmons. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
diff --git a/drivers/gpu/drm/via/via_hdmi.c b/drivers/gpu/drm/via/via_hdmi.c
index 85affb8d4143..bf5c077217a9 100644
--- a/drivers/gpu/drm/via/via_hdmi.c
+++ b/drivers/gpu/drm/via/via_hdmi.c
@@ -1,5 +1,5 @@
/*
- * Copyright © 2013 James Simmons
+ * Copyright 2013 James Simmons. All Rights Reserved.
* Copyright 1998-2012 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2012 S3 Graphics, Inc. All Rights Reserved.
*
diff --git a/drivers/gpu/drm/via/via_i2c.c b/drivers/gpu/drm/via/via_i2c.c
index d838c8e3b2a3..aed8bd035676 100644
--- a/drivers/gpu/drm/via/via_i2c.c
+++ b/drivers/gpu/drm/via/via_i2c.c
@@ -1,6 +1,6 @@
// SPDX-License-Identifier: GPL-2.0-or-later
/*
- * Copyright 2012 James Simmons <jsimm...@infradead.org> All Rights Reserved.
+ * Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
*/
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index 9598e5a187b9..fd142db64a1c 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -1,6 +1,6 @@
/*
* Copyright 2017 Kevin Brace. All Rights Reserved.
- * Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
+ * Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 2006-2009 Luc Verhaegen.
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
diff --git a/drivers/gpu/drm/via/via_lvds.c b/drivers/gpu/drm/via/via_lvds.c
index e1f523ccf184..47ac376abd4f 100644
--- a/drivers/gpu/drm/via/via_lvds.c
+++ b/drivers/gpu/drm/via/via_lvds.c
@@ -1,6 +1,6 @@
/*
* Copyright 2017 Kevin Brace. All Rights Reserved.
- * Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
+ * Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
*
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 2606485ed16a..aa6ef5aeaeb5 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -1,5 +1,5 @@
/*
- * Copyright 2012 James Simmons <jsimm...@infradead.org>
+ * Copyright 2012 James Simmons. All Rights Reserved.
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
commit e67e0912c66879364e43dd852a6f8dc69ff70efe
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:07:41 2022 -0500
drm/via: Attach or remove James Simmons copyright
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc_hw.c
b/drivers/gpu/drm/via/via_crtc_hw.c
index ab6c458a8659..1f6b10d45688 100644
--- a/drivers/gpu/drm/via/via_crtc_hw.c
+++ b/drivers/gpu/drm/via/via_crtc_hw.c
@@ -1,4 +1,6 @@
/*
+ * Copyright 2012 James Simmons. All Rights Reserved.
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
diff --git a/drivers/gpu/drm/via/via_crtc_hw.h
b/drivers/gpu/drm/via/via_crtc_hw.h
index a673b72de321..a31c82181452 100644
--- a/drivers/gpu/drm/via/via_crtc_hw.h
+++ b/drivers/gpu/drm/via/via_crtc_hw.h
@@ -1,4 +1,6 @@
/*
+ * Copyright 2012 James Simmons. All Rights Reserved.
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
diff --git a/drivers/gpu/drm/via/via_display.c
b/drivers/gpu/drm/via/via_display.c
index 063384ebe234..27a9ad69e71c 100644
--- a/drivers/gpu/drm/via/via_display.c
+++ b/drivers/gpu/drm/via/via_display.c
@@ -1,4 +1,6 @@
/*
+ * Copyright 2012 James Simmons. All Rights Reserved.
+ *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
diff --git a/drivers/gpu/drm/via/via_regs.h b/drivers/gpu/drm/via/via_regs.h
index eb6bc55b0186..5ac06d75f0b5 100644
--- a/drivers/gpu/drm/via/via_regs.h
+++ b/drivers/gpu/drm/via/via_regs.h
@@ -1,5 +1,4 @@
/*
- * Copyright 2012 James Simmons <jsimm...@infradead.org>
* Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 8eff1a566a76..f6c54fcac236 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -1,6 +1,5 @@
/*
* Copyright (C) 2016-2018 Kevin Brace. All Rights Reserved.
- * Copyright © 2013 James Simmons
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
commit b47b4294fb34732962b02742553c04284ab87753
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:07:29 2022 -0500
drm/via: Attach or remove VIA Technologies and S3 Graphics copyright
The original code for via_hdmi.c appears to have originated from
VIA Technologies Chrome9 DDX, hence, VIA Technologies and S3 Graphics
should be given credit for it. The copyright year for the HDMI support
code is 2012.
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index a4a1854371b6..5d69a32b9932 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -1,6 +1,8 @@
/*
* Copyright © 2019-2020 Kevin Brace
* Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
+ * Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
diff --git a/drivers/gpu/drm/via/via_cursor.c b/drivers/gpu/drm/via/via_cursor.c
index 0d1de28d98ad..b1b16b64eb33 100644
--- a/drivers/gpu/drm/via/via_cursor.c
+++ b/drivers/gpu/drm/via/via_cursor.c
@@ -1,6 +1,8 @@
/*
* Copyright © 2019-2020 Kevin Brace
* Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
+ * Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 7d9f15f9a980..f4ab479676fc 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -1,8 +1,6 @@
/*
* Copyright 2017 Kevin Brace. All Rights Reserved.
* Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_hdmi.c b/drivers/gpu/drm/via/via_hdmi.c
index 37b7fb02ab0b..85affb8d4143 100644
--- a/drivers/gpu/drm/via/via_hdmi.c
+++ b/drivers/gpu/drm/via/via_hdmi.c
@@ -1,5 +1,7 @@
/*
* Copyright © 2013 James Simmons
+ * Copyright 1998-2012 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2012 S3 Graphics, Inc. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_init.c b/drivers/gpu/drm/via/via_init.c
index 52ad87c8e418..9598e5a187b9 100644
--- a/drivers/gpu/drm/via/via_init.c
+++ b/drivers/gpu/drm/via/via_init.c
@@ -2,8 +2,8 @@
* Copyright 2017 Kevin Brace. All Rights Reserved.
* Copyright 2012 James Simmons <jsimm...@infradead.org>. All Rights Reserved.
* Copyright 2006-2009 Luc Verhaegen.
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+ * Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 05e694574c0d..2606485ed16a 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -1,7 +1,7 @@
/*
* Copyright 2012 James Simmons <jsimm...@infradead.org>
- * Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
+ * Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person
* obtaining a copy of this software and associated documentation
diff --git a/drivers/gpu/drm/via/via_regs.h b/drivers/gpu/drm/via/via_regs.h
index 079540f7a1a5..eb6bc55b0186 100644
--- a/drivers/gpu/drm/via/via_regs.h
+++ b/drivers/gpu/drm/via/via_regs.h
@@ -1,7 +1,7 @@
/*
* Copyright 2012 James Simmons <jsimm...@infradead.org>
- * Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
- * Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
+ * Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2009 S3 Graphics, Inc. All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
commit 9dd312ad706e5e3431bc2d861519d771c81a52dc
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:07:20 2022 -0500
drm/via: Convert via_i2c.c license language to SPDX license identifier
The copyright text was copied from drivers/video/fbdev/via/via_i2c.c
where the code originated from.
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_i2c.c b/drivers/gpu/drm/via/via_i2c.c
index 6c8012c5be00..d838c8e3b2a3 100644
--- a/drivers/gpu/drm/via/via_i2c.c
+++ b/drivers/gpu/drm/via/via_i2c.c
@@ -1,19 +1,8 @@
+// SPDX-License-Identifier: GPL-2.0-or-later
/*
* Copyright 2012 James Simmons <jsimm...@infradead.org> All Rights Reserved.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation;
- * either version 2, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE.See the GNU General Public License
- * for more details.
- *
- * This part was influenced by the via i2c code written for the viafb
- * driver by VIA Technologies and S3 Graphics
+ * Copyright 1998-2009 VIA Technologies, Inc. All Rights Reserved.
+ * Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
*/
#include <linux/delay.h>
commit 6296f5c10466b63430efba5434632f394d54e0d4
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:07:14 2022 -0500
drm/via: Switch to MIT license for via_pll.c
Historically, VIA Technologies Chrome graphics related code were
licensed with an MIT license, hence, specifying GPL 2.0 or later
will be inappropriate.
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 209860b458d6..05e694574c0d 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -3,16 +3,26 @@
* Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public
- * License as published by the Free Software Foundation;
- * either version 2, or (at your option) any later version.
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use, copy,
+ * modify, merge, publish, distribute, sublicense, and/or sell copies
+ * of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
*
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTIES OR REPRESENTATIONS; without even
- * the implied warranty of MERCHANTABILITY or FITNESS FOR
- * A PARTICULAR PURPOSE.See the GNU General Public License
- * for more details.
+ * The above copyright notice and this permission notice (including
+ * the next paragraph) shall be included in all copies or substantial
+ * portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
*/
#include <linux/delay.h>
commit 72eb2ccdcd52ab717f454681c17403a8e5ab2540
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:07:11 2022 -0500
drm/via: Remove some comments from via_pll.c
It does not appear that PLL clock frequency calculation code was
borrowed from viafb, so delete the reference to it. At the same
time, delete the reference to OpenChrome DDX at the beginning of
the file.
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_pll.c b/drivers/gpu/drm/via/via_pll.c
index 78aa63a39b48..209860b458d6 100644
--- a/drivers/gpu/drm/via/via_pll.c
+++ b/drivers/gpu/drm/via/via_pll.c
@@ -1,9 +1,5 @@
/*
* Copyright 2012 James Simmons <jsimm...@infradead.org>
- *
- * Based on code for the viafb driver.
- * UniChrome PLL parameters calculation code borrowed from OpenChrome DDX
- * device driver.
* Copyright 1998-2008 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2008 S3 Graphics, Inc. All Rights Reserved.
*
commit 863d4ebc1ad62294950aac925db9e2c0dc5ba99a
Author: Kevin Brace <kevinbr...@bracecomputerlab.com>
Date: Sat Jun 18 18:07:09 2022 -0500
drm/via: Delete a reference to Radeon DRM
Signed-off-by: Kevin Brace <kevinbr...@bracecomputerlab.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 39197317c713..7d9f15f9a980 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -4,9 +4,6 @@
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
- * This DRM's standby and resume code is based on Radeon DRM's code,
- * but it was shortened and simplified.
- *
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
* to deal in the Software without restriction, including without limitation
