[Openchrome-devel] drm-openchrome: 4 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Tue Jan 24 18:51:56 UTC 2017
drivers/gpu/drm/via/via_drv.c | 24 +++++++++++++++++++++---
drivers/gpu/drm/via/via_drv.h | 6 +++---
drivers/gpu/drm/via/via_fb.c | 8 ++++----
3 files changed, 28 insertions(+), 10 deletions(-)
New commits:
commit 9a6b3f29218c2d02e4542c0b297be15ee8d1da4d
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Jan 24 12:50:25 2017 -0600
Version bumped to 3.0.20
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 34799cb..314c1f6 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -30,11 +30,11 @@
#define DRIVER_AUTHOR "The OpenChrome Project"
#define DRIVER_NAME "via"
#define DRIVER_DESC "OpenChrome DRM for VIA Technologies Chrome IGP"
-#define DRIVER_DATE "20170123"
+#define DRIVER_DATE "20170124"
#define DRIVER_MAJOR 3
#define DRIVER_MINOR 0
-#define DRIVER_PATCHLEVEL 19
+#define DRIVER_PATCHLEVEL 20
#include <linux/module.h>
commit 1d4e50b3291dc372d3e502f0d8f8d34c51dae126
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Jan 24 12:48:23 2017 -0600
Changing via_vram_init argument
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index cd257c0..5f72023 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -240,12 +240,11 @@ static int gem_dumb_destroy(struct drm_file *filp, struct drm_device *dev,
static int
via_device_init(struct via_device *dev_priv)
{
- struct drm_device *dev = dev_priv->dev;
int ret;
DRM_DEBUG("Entered via_device_init.\n");
- ret = via_vram_init(dev);
+ ret = via_vram_init(dev_priv);
if (ret) {
DRM_ERROR("Failed to initialize video RAM.\n");
goto exit;
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 4c41e46..34799cb 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -219,7 +219,7 @@ extern int via_pci_cmdbuffer(struct drm_device *dev, void *data, struct drm_file
extern int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv);
extern int via_wait_idle(struct via_device *dev_priv);
-extern int via_vram_init(struct drm_device *dev);
+extern int via_vram_init(struct via_device *dev_priv);
extern int via_enable_vblank(struct drm_device *dev, int crtc);
extern void via_disable_vblank(struct drm_device *dev, int crtc);
diff --git a/drivers/gpu/drm/via/via_fb.c b/drivers/gpu/drm/via/via_fb.c
index 6da6461..9b3ff5a 100644
--- a/drivers/gpu/drm/via/via_fb.c
+++ b/drivers/gpu/drm/via/via_fb.c
@@ -692,9 +692,9 @@ vx900_mem_type(struct via_device *dev_priv, struct pci_dev *fn3)
return ret;
}
-int via_vram_init(struct drm_device *dev)
+int via_vram_init(struct via_device *dev_priv)
{
- struct via_device *dev_priv = dev->dev_private;
+ struct drm_device *dev = dev_priv->dev;
struct pci_dev *bridge = NULL;
struct pci_dev *fn3 = NULL;
char *name = "unknown";
commit 06a3e6705dc5bcbbab8e7b83ce03f215968b3492
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Jan 24 12:45:03 2017 -0600
Changed via_detect_vram to via_vram_init
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 19ff6d9..cd257c0 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -245,7 +245,7 @@ via_device_init(struct via_device *dev_priv)
DRM_DEBUG("Entered via_device_init.\n");
- ret = via_detect_vram(dev);
+ ret = via_vram_init(dev);
if (ret) {
DRM_ERROR("Failed to initialize video RAM.\n");
goto exit;
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index ff27c21..4c41e46 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -219,7 +219,7 @@ extern int via_pci_cmdbuffer(struct drm_device *dev, void *data, struct drm_file
extern int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv);
extern int via_wait_idle(struct via_device *dev_priv);
-extern int via_detect_vram(struct drm_device *dev);
+extern int via_vram_init(struct drm_device *dev);
extern int via_enable_vblank(struct drm_device *dev, int crtc);
extern void via_disable_vblank(struct drm_device *dev, int crtc);
diff --git a/drivers/gpu/drm/via/via_fb.c b/drivers/gpu/drm/via/via_fb.c
index b48808a..6da6461 100644
--- a/drivers/gpu/drm/via/via_fb.c
+++ b/drivers/gpu/drm/via/via_fb.c
@@ -692,7 +692,7 @@ vx900_mem_type(struct via_device *dev_priv, struct pci_dev *fn3)
return ret;
}
-int via_detect_vram(struct drm_device *dev)
+int via_vram_init(struct drm_device *dev)
{
struct via_device *dev_priv = dev->dev_private;
struct pci_dev *bridge = NULL;
@@ -702,7 +702,7 @@ int via_detect_vram(struct drm_device *dev)
u8 size;
int ret = 0;
- DRM_DEBUG("Entered via_detect_vram.\n");
+ DRM_DEBUG("Entered via_vram_init.\n");
bus = pci_find_bus(0, 0);
if (bus == NULL) {
@@ -911,7 +911,7 @@ out_err:
if (fn3)
pci_dev_put(fn3);
- DRM_DEBUG("Exiting via_detect_vram.\n");
+ DRM_DEBUG("Exiting via_vram_init.\n");
return ret;
}
commit 25cc7c19655706885b7be7cf3297bc2a60859227
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Tue Jan 24 12:44:08 2017 -0600
Created via_device_init
The code that calls via_detect_vram function was moved into
via_device_init function.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 5f4a7a51..19ff6d9 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -237,6 +237,25 @@ static int gem_dumb_destroy(struct drm_file *filp, struct drm_device *dev,
return drm_gem_handle_delete(filp, handle);
}
+static int
+via_device_init(struct via_device *dev_priv)
+{
+ struct drm_device *dev = dev_priv->dev;
+ int ret;
+
+ DRM_DEBUG("Entered via_device_init.\n");
+
+ ret = via_detect_vram(dev);
+ if (ret) {
+ DRM_ERROR("Failed to initialize video RAM.\n");
+ goto exit;
+ }
+
+exit:
+ DRM_DEBUG("Exiting via_device_init.\n");
+ return ret;
+}
+
static int via_driver_unload(struct drm_device *dev)
{
struct via_device *dev_priv = dev->dev_private;
@@ -313,13 +332,13 @@ via_driver_load(struct drm_device *dev, unsigned long chipset)
via_init_command_verifier();
- ret = via_detect_vram(dev);
+ ret = via_device_init(dev_priv);
if (ret) {
- DRM_ERROR("Failed to initialize video RAM.\n");
+ DRM_ERROR("Failed to initialize Chrome IGP.\n");
goto init_error;
}
- ret = via_mm_init(dev_priv);
+ ret = via_mm_init(dev_priv);
if (ret) {
DRM_ERROR("Failed to initialize TTM.\n");
goto init_error;
More information about the Openchrome-devel
mailing list