[Openchrome-devel] drm-openchrome: 3 commits - drivers/gpu/drm
Kevin Brace
kevinbrace at kemper.freedesktop.org
Fri Jan 20 04:43:42 UTC 2017
drivers/gpu/drm/via/init_ttm.c | 2
drivers/gpu/drm/via/ttm_gem.c | 2
drivers/gpu/drm/via/via_analog.c | 2
drivers/gpu/drm/via/via_clocks.c | 2
drivers/gpu/drm/via/via_crtc.c | 44 +++++++++----------
drivers/gpu/drm/via/via_display.c | 18 +++----
drivers/gpu/drm/via/via_drv.c | 18 +++----
drivers/gpu/drm/via/via_drv.h | 51 ++++++++++++++++++++--
drivers/gpu/drm/via/via_fb.c | 24 +++++-----
drivers/gpu/drm/via/via_fence.c | 2
drivers/gpu/drm/via/via_fp.c | 14 +++---
drivers/gpu/drm/via/via_h1_cmdbuf.c | 56 ++++++++++++------------
drivers/gpu/drm/via/via_h1_dma.c | 12 ++---
drivers/gpu/drm/via/via_hdmi.c | 14 +++---
drivers/gpu/drm/via/via_i2c.c | 8 +--
drivers/gpu/drm/via/via_ioc32.c | 4 -
drivers/gpu/drm/via/via_irq.c | 24 +++++-----
drivers/gpu/drm/via/via_mem.h | 81 -----------------------------------
drivers/gpu/drm/via/via_pm.c | 10 ++--
drivers/gpu/drm/via/via_sgdma.c | 8 +--
drivers/gpu/drm/via/via_tmds.c | 4 -
drivers/gpu/drm/via/via_ttm.c | 83 +++++++++++++++++++-----------------
drivers/gpu/drm/via/via_verifier.c | 16 +++---
23 files changed, 234 insertions(+), 265 deletions(-)
New commits:
commit d92ffefde5ca08e10719c47007b3f65e03bcf706
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Jan 19 22:28:41 2017 -0600
Discontinuing via_mem.h
Contents merged into via_drv.h
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/init_ttm.c b/drivers/gpu/drm/via/init_ttm.c
index 93e826c..78916a6 100644
--- a/drivers/gpu/drm/via/init_ttm.c
+++ b/drivers/gpu/drm/via/init_ttm.c
@@ -23,7 +23,6 @@
*/
#include "drmP.h"
#include "via_drv.h"
-#include "via_mem.h"
int
ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 536ede5..fc7e98a 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -1,4 +1,7 @@
/*
+ * Copyright 2014 James Simmons <jsimmons at infradead.org>
+ * Influenced by sample code from VIA Technologies and the radeon driver.
+ *
* Copyright 1998-2003 VIA Technologies, Inc. All Rights Reserved.
* Copyright 2001-2003 S3 Graphics, Inc. All Rights Reserved.
*
@@ -47,7 +50,6 @@
#include <drm/via_drm.h>
#include "via_regs.h"
-#include "via_mem.h"
#include "via_fence.h"
#include "via_dma.h"
#include "via_verifier.h"
diff --git a/drivers/gpu/drm/via/via_mem.h b/drivers/gpu/drm/via/via_mem.h
index 328e94a..e69de29 100644
--- a/drivers/gpu/drm/via/via_mem.h
+++ b/drivers/gpu/drm/via/via_mem.h
@@ -1,33 +0,0 @@
-/*
- * Copyright 2014 James Simmons <jsimmons at infradead.org>
- *
- * Influenced by sample code from VIA Technologies and the radeon driver.
- *
- * 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 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.
- */
-#ifndef _VIA_MEM_H_
-#define _VIA_MEM_H_
-
-#include "drm_gem.h"
-#include "ttm/ttm_bo_driver.h"
-#include "ttm/ttm_placement.h"
-
-
-#endif /* _VIA_MEM_H_ */
commit 1105aa1a396aa1e360737a61e751f1dd2ae25f76
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Jan 19 22:26:22 2017 -0600
via_mm_init superseding via_ttm_init
Did major rewriting, in order to make the code similar to Matrox G200
DRM code.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/init_ttm.c b/drivers/gpu/drm/via/init_ttm.c
index 0fe0565..93e826c 100644
--- a/drivers/gpu/drm/via/init_ttm.c
+++ b/drivers/gpu/drm/via/init_ttm.c
@@ -22,6 +22,7 @@
* USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
#include "drmP.h"
+#include "via_drv.h"
#include "via_mem.h"
int
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index ed5229c..74be92e 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -331,7 +331,7 @@ via_driver_load(struct drm_device *dev, unsigned long chipset)
via_init_command_verifier();
- ret = via_ttm_init(dev);
+ ret = via_mm_init(dev_priv);
if (ret) {
DRM_ERROR("Failed to initialize TTM.\n");
goto init_error;
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 60375d6..536ede5 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -103,6 +103,12 @@ struct via_state {
struct vga_regset seq_regs[256];
};
+struct ttm_heap {
+ struct ttm_place busy_placements[TTM_NUM_MEM_TYPES];
+ struct ttm_place placements[TTM_NUM_MEM_TYPES];
+ struct ttm_buffer_object pbo;
+};
+
enum via_engine {
VIA_ENG_H1 = 0,
VIA_ENG_H2,
@@ -226,4 +232,41 @@ extern int via_dma_cleanup(struct drm_device *dev);
extern void via_dmablit_handler(struct drm_device *dev, int engine, int from_irq);
extern int via_dmablit_init(struct drm_device *dev);
+extern int ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
+ uint32_t alignment, uint32_t domain,
+ struct ttm_bo_kmap_obj *kmap);
+
+extern void via_ttm_global_release(struct drm_global_reference *global_ref,
+ struct ttm_bo_global_ref *global_bo,
+ struct ttm_bo_device *bdev);
+extern int via_mm_init(struct via_device *dev_priv);
+void via_mm_fini(struct drm_device *dev);
+extern void ttm_placement_from_domain(struct ttm_buffer_object *bo,
+ struct ttm_placement *placement,
+ u32 domains, struct ttm_bo_device *bdev);
+extern int via_bo_create(struct ttm_bo_device *bdev, unsigned long size,
+ enum ttm_bo_type origin, uint32_t domains,
+ uint32_t byte_align, uint32_t page_align,
+ bool interruptible, struct sg_table *sg,
+ struct reservation_object *resv,
+ struct ttm_buffer_object **p_bo);
+extern int via_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
+extern int ttm_bo_unpin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
+
+extern int ttm_mmap(struct file *filp, struct vm_area_struct *vma);
+
+extern int ttm_gem_open_object(struct drm_gem_object *obj, struct drm_file *file_priv);
+extern void ttm_gem_free_object(struct drm_gem_object *obj);
+extern struct drm_gem_object *ttm_gem_create(struct drm_device *dev,
+ struct ttm_bo_device *bdev,
+ enum ttm_bo_type origin,
+ int type, bool interruptible,
+ int byte_align, int page_align,
+ unsigned long size);
+extern struct ttm_buffer_object *ttm_gem_mapping(struct drm_gem_object *obj);
+
+extern struct ttm_tt *
+via_sgdma_backend_init(struct ttm_bo_device *bdev, unsigned long size,
+ uint32_t page_flags, struct page *dummy_read_page);
+
#endif
diff --git a/drivers/gpu/drm/via/via_mem.h b/drivers/gpu/drm/via/via_mem.h
index d2b64e8..328e94a 100644
--- a/drivers/gpu/drm/via/via_mem.h
+++ b/drivers/gpu/drm/via/via_mem.h
@@ -29,53 +29,5 @@
#include "ttm/ttm_bo_driver.h"
#include "ttm/ttm_placement.h"
-struct ttm_heap {
- struct ttm_place busy_placements[TTM_NUM_MEM_TYPES];
- struct ttm_place placements[TTM_NUM_MEM_TYPES];
- struct ttm_buffer_object pbo;
-};
-
-extern int ttm_allocate_kernel_buffer(struct ttm_bo_device *bdev, unsigned long size,
- uint32_t alignment, uint32_t domain,
- struct ttm_bo_kmap_obj *kmap);
-
-extern void via_ttm_global_release(struct drm_global_reference *global_ref,
- struct ttm_bo_global_ref *global_bo,
- struct ttm_bo_device *bdev);
-extern int via_ttm_global_init(struct drm_global_reference *global_ref,
- struct ttm_bo_global_ref *global_bo,
- struct ttm_bo_driver *driver,
- struct ttm_bo_device *bdev,
- struct drm_device *dev,
- bool dma32);
-extern int via_ttm_init(struct drm_device *dev);
-void via_mm_fini(struct drm_device *dev);
-extern void ttm_placement_from_domain(struct ttm_buffer_object *bo,
- struct ttm_placement *placement,
- u32 domains, struct ttm_bo_device *bdev);
-extern int via_bo_create(struct ttm_bo_device *bdev, unsigned long size,
- enum ttm_bo_type origin, uint32_t domains,
- uint32_t byte_align, uint32_t page_align,
- bool interruptible, struct sg_table *sg,
- struct reservation_object *resv,
- struct ttm_buffer_object **p_bo);
-extern int via_bo_pin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
-extern int ttm_bo_unpin(struct ttm_buffer_object *bo, struct ttm_bo_kmap_obj *kmap);
-
-extern int ttm_mmap(struct file *filp, struct vm_area_struct *vma);
-
-extern int ttm_gem_open_object(struct drm_gem_object *obj, struct drm_file *file_priv);
-extern void ttm_gem_free_object(struct drm_gem_object *obj);
-extern struct drm_gem_object *ttm_gem_create(struct drm_device *dev,
- struct ttm_bo_device *bdev,
- enum ttm_bo_type origin,
- int type, bool interruptible,
- int byte_align, int page_align,
- unsigned long size);
-extern struct ttm_buffer_object *ttm_gem_mapping(struct drm_gem_object *obj);
-
-extern struct ttm_tt *
-via_sgdma_backend_init(struct ttm_bo_device *bdev, unsigned long size,
- uint32_t page_flags, struct page *dummy_read_page);
#endif /* _VIA_MEM_H_ */
diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c
index 72d246b..a522957 100644
--- a/drivers/gpu/drm/via/via_ttm.c
+++ b/drivers/gpu/drm/via/via_ttm.c
@@ -58,17 +58,14 @@ via_ttm_global_release(struct drm_global_reference *global_ref,
DRM_DEBUG("Exiting via_ttm_global_release.\n");
}
-int
-via_ttm_global_init(struct drm_global_reference *global_ref,
- struct ttm_bo_global_ref *global_bo,
- struct ttm_bo_driver *driver,
- struct ttm_bo_device *bdev,
- struct drm_device *dev,
- bool dma32)
+static int
+via_ttm_global_init(struct via_device *dev_priv)
{
+ struct drm_global_reference *global_ref;
struct drm_global_reference *bo_ref;
int rc;
+ global_ref = &dev_priv->mem_global_ref;
global_ref->global_type = DRM_GLOBAL_TTM_MEM;
global_ref->size = sizeof(struct ttm_mem_global);
global_ref->init = &via_ttm_global_mem_init;
@@ -81,8 +78,8 @@ via_ttm_global_init(struct drm_global_reference *global_ref,
return rc;
}
- global_bo->mem_glob = global_ref->object;
- bo_ref = &global_bo->ref;
+ dev_priv->bo_global_ref.mem_glob = dev_priv->mem_global_ref.object;
+ bo_ref = &dev_priv->bo_global_ref.ref;
bo_ref->global_type = DRM_GLOBAL_TTM_BO;
bo_ref->size = sizeof(struct ttm_bo_global);
bo_ref->init = &ttm_bo_global_init;
@@ -96,13 +93,6 @@ via_ttm_global_init(struct drm_global_reference *global_ref,
return rc;
}
- rc = ttm_bo_device_init(bdev, bo_ref->object, driver,
- dev->anon_inode->i_mapping,
- DRM_FILE_PAGE_OFFSET, dma32);
- if (rc) {
- DRM_ERROR("Error initialising bo driver: %d\n", rc);
- via_ttm_global_release(global_ref, global_bo, NULL);
- }
return rc;
}
@@ -564,16 +554,31 @@ static struct ttm_bo_driver via_bo_driver = {
.io_mem_free = via_ttm_io_mem_free,
};
-int via_ttm_init(struct drm_device *dev)
+int via_mm_init(struct via_device *dev_priv)
{
- struct via_device *dev_priv = dev->dev_private;
+ int ret;
+ struct drm_device *dev = dev_priv->dev;
+ struct ttm_bo_device *bdev = &dev_priv->bdev;
+
+ DRM_DEBUG("Entered via_mm_init.\n");
+
+ ret = via_ttm_global_init(dev_priv);
+ if (ret)
+ return ret;
+
+ dev_priv->bdev.dev_mapping = dev->anon_inode->i_mapping;
+
+ ret = ttm_bo_device_init(&dev_priv->bdev,
+ dev_priv->bo_global_ref.ref.object,
+ &via_bo_driver,
+ dev->anon_inode->i_mapping,
+ DRM_FILE_PAGE_OFFSET,
+ false);
+ if (ret) {
+ DRM_ERROR("Error initialising bo driver: %d\n", ret);
+ }
- int ret = via_ttm_global_init(&dev_priv->mem_global_ref,
- &dev_priv->bo_global_ref,
- &via_bo_driver, &dev_priv->bdev,
- dev_priv->dev, false);
- if (!ret)
- dev_priv->bdev.dev_mapping = dev_priv->dev->anon_inode->i_mapping;
+ DRM_DEBUG("Exiting via_mm_init.\n");
return ret;
}
commit 27b8b2a21bef4dff7e05291699ca3affa6890ced
Author: Kevin Brace <kevinbrace at gmx.com>
Date: Thu Jan 19 22:24:09 2017 -0600
Changed drm_via_private to via_device
This was done to have some code commonality with Matrox G200 DRM.
Signed-off-by: Kevin Brace <kevinbrace at gmx.com>
diff --git a/drivers/gpu/drm/via/ttm_gem.c b/drivers/gpu/drm/via/ttm_gem.c
index 5dc50a1..52dd2c9 100644
--- a/drivers/gpu/drm/via/ttm_gem.c
+++ b/drivers/gpu/drm/via/ttm_gem.c
@@ -69,7 +69,7 @@ ttm_gem_mapping(struct drm_gem_object *obj)
*/
int ttm_mmap(struct file *filp, struct vm_area_struct *vma)
{
- struct drm_via_private *dev_priv;
+ struct via_device *dev_priv;
struct drm_file *file_priv;
if (unlikely(vma->vm_pgoff < DRM_FILE_PAGE_OFFSET))
diff --git a/drivers/gpu/drm/via/via_analog.c b/drivers/gpu/drm/via/via_analog.c
index 03af596..8c150b4 100644
--- a/drivers/gpu/drm/via/via_analog.c
+++ b/drivers/gpu/drm/via/via_analog.c
@@ -36,7 +36,7 @@ static const struct drm_encoder_funcs via_dac_enc_funcs = {
static void
via_dac_dpms(struct drm_encoder *encoder, int mode)
{
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
u8 mask = 0;
switch (mode) {
diff --git a/drivers/gpu/drm/via/via_clocks.c b/drivers/gpu/drm/via/via_clocks.c
index 61cdb76..e693cbc 100644
--- a/drivers/gpu/drm/via/via_clocks.c
+++ b/drivers/gpu/drm/via/via_clocks.c
@@ -192,7 +192,7 @@ void
via_set_vclock(struct drm_crtc *crtc, u32 clk)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
struct drm_device *dev = crtc->dev;
unsigned long max_loop = 50, i = 0;
diff --git a/drivers/gpu/drm/via/via_crtc.c b/drivers/gpu/drm/via/via_crtc.c
index 39ab915..756d2c6 100644
--- a/drivers/gpu/drm/via/via_crtc.c
+++ b/drivers/gpu/drm/via/via_crtc.c
@@ -64,7 +64,7 @@ viaIGACommonInit(void __iomem *regs)
}
static void
-viaIGA1SetColorDepth(struct drm_via_private *dev_priv,
+viaIGA1SetColorDepth(struct via_device *dev_priv,
u8 depth)
{
u8 value;
@@ -128,7 +128,7 @@ viaIGA1InterlaceMode(void __iomem *regs, bool interlaceMode)
}
static void
-viaIGA2SetColorDepth(struct drm_via_private *dev_priv,
+viaIGA2SetColorDepth(struct via_device *dev_priv,
u8 depth)
{
u8 value;
@@ -191,7 +191,7 @@ static void
via_hide_cursor(struct drm_crtc *crtc)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
uint32_t temp;
if (iga->index) {
@@ -207,7 +207,7 @@ static void
via_show_cursor(struct drm_crtc *crtc)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
if (!iga->cursor_kmap.bo)
return;
@@ -282,7 +282,7 @@ static int
via_crtc_cursor_move(struct drm_crtc *crtc, int x, int y)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
unsigned char xoff = 0, yoff = 0;
int xpos = x, ypos = y;
@@ -310,7 +310,7 @@ static void
via_iga1_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
u16 *blue, uint32_t start, uint32_t size)
{
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
int end = (start + size > 256) ? 256 : start + size, i;
u8 val, sr1a = vga_rseq(VGABASE, 0x1A);
@@ -363,7 +363,7 @@ static void
via_iga2_gamma_set(struct drm_crtc *crtc, u16 *red, u16 *green,
u16 *blue, uint32_t start, uint32_t size)
{
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
int end = (start + size > 256) ? 256 : start + size, i;
u8 sr1a = vga_rseq(VGABASE, 0x1A);
@@ -470,7 +470,7 @@ static const struct drm_crtc_funcs via_iga2_funcs = {
};
static void
-via_load_vpit_regs(struct drm_via_private *dev_priv)
+via_load_vpit_regs(struct via_device *dev_priv)
{
u8 ar[] = {0x00, 0x01, 0x02, 0x03,
0x04, 0x05, 0x06, 0x07,
@@ -509,7 +509,7 @@ static void
via_load_fifo_regs(struct via_crtc *iga, struct drm_display_mode *mode)
{
u32 queue_expire_num = iga->display_queue_expire_num, reg_value;
- struct drm_via_private *dev_priv = iga->base.dev->dev_private;
+ struct via_device *dev_priv = iga->base.dev->dev_private;
int hor_active = mode->hdisplay, ver_active = mode->vdisplay;
struct drm_device *dev = iga->base.dev;
@@ -551,7 +551,7 @@ via_load_crtc_pixel_timing(struct drm_crtc *crtc,
struct drm_display_mode *mode)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
u32 reg_value = 0;
reg_value = IGA1_PIXELTIMING_HOR_TOTAL_FORMULA(mode->crtc_htotal);
@@ -629,7 +629,7 @@ via_load_crtc_pixel_timing(struct drm_crtc *crtc,
void
via_load_crtc_timing(struct via_crtc *iga, struct drm_display_mode *mode)
{
- struct drm_via_private *dev_priv = iga->base.dev->dev_private;
+ struct via_device *dev_priv = iga->base.dev->dev_private;
struct drm_device *dev = iga->base.dev;
u32 reg_value = 0;
@@ -726,7 +726,7 @@ void
via_set_scale_path(struct drm_crtc *crtc, u32 scale_type)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
u8 reg_cr_fd = vga_rcrt(VGABASE, 0xFD);
struct drm_device *dev = crtc->dev;
@@ -771,7 +771,7 @@ static void
via_disable_iga_scaling(struct drm_crtc *crtc)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
if (iga->index) {
/* IGA2 scalings disable */
@@ -817,7 +817,7 @@ bool
via_set_iga_scale_function(struct drm_crtc *crtc, u32 scale_type)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
if (!(scale_type & (VIA_SHRINK + VIA_EXPAND)))
return false;
@@ -901,7 +901,7 @@ via_set_iga_scale_function(struct drm_crtc *crtc, u32 scale_type)
* 3. enable H or V scale ( set CRA2 bit7 or bit3 )
*/
bool
-via_load_iga_scale_factor_regs(struct drm_via_private *dev_priv,
+via_load_iga_scale_factor_regs(struct via_device *dev_priv,
struct drm_display_mode *mode,
struct drm_display_mode *adjusted_mode,
u32 scale_type, u32 is_hor_or_ver)
@@ -1045,7 +1045,7 @@ static void
via_iga1_crtc_dpms(struct drm_crtc *crtc, int mode)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
DRM_DEBUG("Entered via_iga1_crtc_dpms.\n");
@@ -1144,7 +1144,7 @@ via_iga1_crtc_mode_set(struct drm_crtc *crtc,
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
struct drm_device *dev = crtc->dev;
u8 reg_value = 0;
int ret;
@@ -1286,7 +1286,7 @@ via_iga1_mode_set_base_atomic(struct drm_crtc *crtc,
{
u32 pitch = y * fb->pitches[0] + ((x * fb->bits_per_pixel) >> 3), addr;
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
struct drm_gem_object *obj = fb->helper_private;
struct ttm_buffer_object *bo = ttm_gem_mapping(obj);
@@ -1329,7 +1329,7 @@ static void
via_iga2_crtc_dpms(struct drm_crtc *crtc, int mode)
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
DRM_DEBUG("Entered via_iga2_crtc_dpms.\n");
@@ -1428,7 +1428,7 @@ via_iga2_crtc_mode_set(struct drm_crtc *crtc,
{
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
struct drm_crtc_helper_funcs *crtc_funcs = crtc->helper_private;
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
struct drm_device *dev = crtc->dev;
int ret;
@@ -1599,7 +1599,7 @@ via_iga2_mode_set_base_atomic(struct drm_crtc *crtc,
{
u32 pitch = y * fb->pitches[0] + ((x * fb->bits_per_pixel) >> 3), addr;
struct via_crtc *iga = container_of(crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = crtc->dev->dev_private;
+ struct via_device *dev_priv = crtc->dev->dev_private;
struct drm_gem_object *obj = fb->helper_private;
struct ttm_buffer_object *bo = ttm_gem_mapping(obj);
@@ -1666,7 +1666,7 @@ static const struct drm_crtc_helper_funcs via_iga2_helper_funcs = {
void
via_crtc_init(struct drm_device *dev, int index)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct via_crtc *iga = &dev_priv->iga[index];
struct drm_crtc *crtc = &iga->base;
int cursor_size = 64 * 64 * 4, i;
diff --git a/drivers/gpu/drm/via/via_display.c b/drivers/gpu/drm/via/via_display.c
index 27c6ebc..d0b9fad 100644
--- a/drivers/gpu/drm/via/via_display.c
+++ b/drivers/gpu/drm/via/via_display.c
@@ -36,7 +36,7 @@ via_encoder_commit(struct drm_encoder *encoder)
{
struct via_encoder *enc = container_of(encoder, struct via_encoder, base);
struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
struct drm_device *dev = encoder->dev;
struct via_crtc *iga = NULL;
u8 value = 0;
@@ -159,7 +159,7 @@ via_encoder_disable(struct drm_encoder *encoder)
{
struct drm_encoder_helper_funcs *encoder_funcs = encoder->helper_private;
struct via_encoder *enc = container_of(encoder, struct via_encoder, base);
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
/* First turn off the display */
encoder_funcs->dpms(encoder, DRM_MODE_DPMS_OFF);
@@ -214,7 +214,7 @@ via_set_sync_polarity(struct drm_encoder *encoder, struct drm_display_mode *mode
struct drm_display_mode *adjusted_mode)
{
struct via_encoder *enc = container_of(encoder, struct via_encoder, base);
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
u8 syncreg = 0;
if (adjusted_mode->flags & DRM_MODE_FLAG_NVSYNC)
@@ -370,7 +370,7 @@ static struct td_timer td_timer_regs[] = {
static void
via_init_td_timing_regs(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
unsigned int td_timer[4] = { 500, 50, 0, 510 }, i;
struct vga_registers timings;
u32 reg_value;
@@ -403,7 +403,7 @@ via_init_td_timing_regs(struct drm_device *dev)
}
static void
-via_i2c_reg_init(struct drm_via_private *dev_priv)
+via_i2c_reg_init(struct via_device *dev_priv)
{
vga_wseq(VGABASE, 0x31, 0x01);
svga_wseq_mask(VGABASE, 0x31, 0x30, 0x30);
@@ -416,7 +416,7 @@ via_i2c_reg_init(struct drm_via_private *dev_priv)
}
static void
-via_hwcursor_init(struct drm_via_private *dev_priv)
+via_hwcursor_init(struct via_device *dev_priv)
{
/* set 0 as transparent color key */
VIA_WRITE(PRIM_HI_TRANSCOLOR, 0);
@@ -438,7 +438,7 @@ via_hwcursor_init(struct drm_via_private *dev_priv)
static void
via_init_crtc_regs(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
via_unlock_crtc(VGABASE, dev->pdev->device);
@@ -476,7 +476,7 @@ via_init_crtc_regs(struct drm_device *dev)
static void
via_display_init(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
u8 index = 0x3D, value;
/* Check if spread spectrum is enabled */
@@ -509,7 +509,7 @@ via_display_init(struct drm_device *dev)
int
via_modeset_init(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
int i;
drm_mode_config_init(dev);
diff --git a/drivers/gpu/drm/via/via_drv.c b/drivers/gpu/drm/via/via_drv.c
index 3e51ee2..ed5229c 100644
--- a/drivers/gpu/drm/via/via_drv.c
+++ b/drivers/gpu/drm/via/via_drv.c
@@ -61,7 +61,7 @@ MODULE_DEVICE_TABLE(pci, via_pci_table);
static int
via_detect_agp(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct drm_agp_info agp_info;
struct drm_agp_mode mode;
int ret = 0;
@@ -104,7 +104,7 @@ out_err0:
return ret;
}
-static void via_agp_engine_init(struct drm_via_private *dev_priv)
+static void via_agp_engine_init(struct via_device *dev_priv)
{
VIA_WRITE(VIA_REG_TRANSET, 0x00100000);
VIA_WRITE(VIA_REG_TRANSPACE, 0x00000000);
@@ -124,7 +124,7 @@ static void via_agp_engine_init(struct drm_via_private *dev_priv)
static int
via_mmio_setup(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
int ret, len = pci_resource_len(dev->pdev, 1);
void __iomem *regs = ioport_map(0x3c0, 100);
struct ttm_buffer_object *bo;
@@ -169,7 +169,7 @@ err:
static void
chip_revision_info(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
u8 tmp;
switch (dev->pdev->device) {
@@ -211,7 +211,7 @@ chip_revision_info(struct drm_device *dev)
static int via_dumb_create(struct drm_file *filp, struct drm_device *dev,
struct drm_mode_create_dumb *args)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct drm_gem_object *obj;
int ret;
@@ -257,7 +257,7 @@ static int gem_dumb_destroy(struct drm_file *filp, struct drm_device *dev,
static int via_driver_unload(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct ttm_buffer_object *bo;
int ret = 0;
@@ -312,12 +312,12 @@ static int via_driver_unload(struct drm_device *dev)
static int
via_driver_load(struct drm_device *dev, unsigned long chipset)
{
- struct drm_via_private *dev_priv;
+ struct via_device *dev_priv;
int ret = 0;
DRM_INFO("Entered via_driver_load.\n");
- dev_priv = kzalloc(sizeof(struct drm_via_private), GFP_KERNEL);
+ dev_priv = kzalloc(sizeof(struct via_device), GFP_KERNEL);
if (!dev_priv) {
ret = -ENOMEM;
DRM_ERROR("Failed to allocate private storage memory.\n");
diff --git a/drivers/gpu/drm/via/via_drv.h b/drivers/gpu/drm/via/via_drv.h
index 0ac0c2c..60375d6 100644
--- a/drivers/gpu/drm/via/via_drv.h
+++ b/drivers/gpu/drm/via/via_drv.h
@@ -111,7 +111,7 @@ enum via_engine {
VIA_ENG_H6S2
};
-struct drm_via_private {
+struct via_device {
struct drm_global_reference mem_global_ref;
struct ttm_bo_global_ref bo_global_ref;
struct ttm_bo_device bdev;
@@ -207,7 +207,7 @@ extern int via_cmdbuffer(struct drm_device *dev, void *data, struct drm_file *fi
extern int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file *file_priv);
extern int via_pci_cmdbuffer(struct drm_device *dev, void *data, struct drm_file *file_priv);
extern int via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv);
-extern int via_wait_idle(struct drm_via_private *dev_priv);
+extern int via_wait_idle(struct via_device *dev_priv);
extern int via_detect_vram(struct drm_device *dev);
diff --git a/drivers/gpu/drm/via/via_fb.c b/drivers/gpu/drm/via/via_fb.c
index e819450..0681330 100644
--- a/drivers/gpu/drm/via/via_fb.c
+++ b/drivers/gpu/drm/via/via_fb.c
@@ -31,7 +31,7 @@ struct ttm_fb_helper {
};
static int
-cle266_mem_type(struct drm_via_private *dev_priv, struct pci_dev *bridge)
+cle266_mem_type(struct via_device *dev_priv, struct pci_dev *bridge)
{
u8 type, fsb, freq;
int ret;
@@ -129,7 +129,7 @@ cle266_mem_type(struct drm_via_private *dev_priv, struct pci_dev *bridge)
}
static int
-km400_mem_type(struct drm_via_private *dev_priv, struct pci_dev *bridge)
+km400_mem_type(struct via_device *dev_priv, struct pci_dev *bridge)
{
u8 fsb, freq, rev;
int ret;
@@ -281,7 +281,7 @@ km400_mem_type(struct drm_via_private *dev_priv, struct pci_dev *bridge)
}
static int
-p4m800_mem_type(struct drm_via_private *dev_priv, struct pci_bus *bus,
+p4m800_mem_type(struct via_device *dev_priv, struct pci_bus *bus,
struct pci_dev *fn3)
{
struct pci_dev *fn4 = pci_get_slot(bus, PCI_DEVFN(0, 4));
@@ -347,7 +347,7 @@ p4m800_mem_type(struct drm_via_private *dev_priv, struct pci_bus *bus,
}
static int
-km8xx_mem_type(struct drm_via_private *dev_priv)
+km8xx_mem_type(struct via_device *dev_priv)
{
struct pci_dev *dram, *misc = NULL;
int ret = -ENXIO;
@@ -473,7 +473,7 @@ km8xx_mem_type(struct drm_via_private *dev_priv)
}
static int
-cn400_mem_type(struct drm_via_private *dev_priv, struct pci_bus *bus,
+cn400_mem_type(struct via_device *dev_priv, struct pci_bus *bus,
struct pci_dev *fn3)
{
struct pci_dev *fn2 = pci_get_slot(bus, PCI_DEVFN(0, 2));
@@ -535,7 +535,7 @@ cn400_mem_type(struct drm_via_private *dev_priv, struct pci_bus *bus,
}
static int
-cn700_mem_type(struct drm_via_private *dev_priv, struct pci_dev *fn3)
+cn700_mem_type(struct via_device *dev_priv, struct pci_dev *fn3)
{
int ret;
u8 tmp;
@@ -568,7 +568,7 @@ cn700_mem_type(struct drm_via_private *dev_priv, struct pci_dev *fn3)
}
static int
-cx700_mem_type(struct drm_via_private *dev_priv, struct pci_dev *fn3)
+cx700_mem_type(struct via_device *dev_priv, struct pci_dev *fn3)
{
u8 type, clock;
int ret;
@@ -624,7 +624,7 @@ cx700_mem_type(struct drm_via_private *dev_priv, struct pci_dev *fn3)
}
static int
-vx900_mem_type(struct drm_via_private *dev_priv, struct pci_dev *fn3)
+vx900_mem_type(struct via_device *dev_priv, struct pci_dev *fn3)
{
int ret;
u8 clock, type, volt;
@@ -694,7 +694,7 @@ vx900_mem_type(struct drm_via_private *dev_priv, struct pci_dev *fn3)
int via_detect_vram(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct pci_dev *bridge = NULL, *fn3 = NULL;
unsigned long long vram_start;
int vram_size = 0, ret = 0;
@@ -948,7 +948,7 @@ static const struct drm_framebuffer_funcs via_fb_funcs = {
static void
via_output_poll_changed(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
drm_fb_helper_hotplug_event(dev_priv->helper);
}
@@ -994,7 +994,7 @@ via_fb_probe(struct drm_fb_helper *helper,
struct drm_fb_helper_surface_size *sizes)
{
struct ttm_fb_helper *ttmfb = container_of(helper, struct ttm_fb_helper, base);
- struct drm_via_private *dev_priv = helper->dev->dev_private;
+ struct via_device *dev_priv = helper->dev->dev_private;
struct ttm_bo_kmap_obj *kmap = &ttmfb->kmap;
struct fb_info *info = helper->fbdev;
struct drm_framebuffer *fb = NULL;
@@ -1226,7 +1226,7 @@ out_err:
void
via_framebuffer_fini(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct drm_fb_helper *helper = dev_priv->helper;
struct ttm_fb_helper *ttmfb;
struct drm_gem_object *obj;
diff --git a/drivers/gpu/drm/via/via_fence.c b/drivers/gpu/drm/via/via_fence.c
index 98489d5..af8258f 100644
--- a/drivers/gpu/drm/via/via_fence.c
+++ b/drivers/gpu/drm/via/via_fence.c
@@ -191,7 +191,7 @@ struct via_fence_pool *
via_fence_pool_init(struct drm_device *dev, char *name, int domain,
int num_engines)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct via_fence_pool *pool = NULL;
int ret = 0, size, i;
void *par = NULL;
diff --git a/drivers/gpu/drm/via/via_fp.c b/drivers/gpu/drm/via/via_fp.c
index 39158d6..92e7dc5 100644
--- a/drivers/gpu/drm/via/via_fp.c
+++ b/drivers/gpu/drm/via/via_fp.c
@@ -69,7 +69,7 @@ static void
via_enable_internal_lvds(struct drm_encoder *encoder)
{
struct via_encoder *enc = container_of(encoder, struct via_encoder, base);
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
struct drm_device *dev = encoder->dev;
/* Turn on LCD panel */
@@ -155,7 +155,7 @@ static void
via_disable_internal_lvds(struct drm_encoder *encoder)
{
struct via_encoder *enc = container_of(encoder, struct via_encoder, base);
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
struct drm_device *dev = encoder->dev;
/* Turn off LCD panel */
@@ -230,7 +230,7 @@ via_disable_internal_lvds(struct drm_encoder *encoder)
static void
via_lvds_dpms(struct drm_encoder *encoder, int mode)
{
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
struct drm_device *dev = encoder->dev;
struct via_crtc *iga = NULL;
@@ -360,7 +360,7 @@ via_lcd_detect(struct drm_connector *connector, bool force)
kfree(edid);
ret = connector_status_connected;
} else {
- struct drm_via_private *dev_priv = connector->dev->dev_private;
+ struct via_device *dev_priv = connector->dev->dev_private;
u8 mask = BIT(1);
if (connector->dev->pdev->device == PCI_DEVICE_ID_VIA_CLE266)
@@ -387,7 +387,7 @@ via_lcd_set_property(struct drm_connector *connector,
struct drm_property *property, uint64_t value)
{
struct via_connector *con = container_of(connector, struct via_connector, base);
- struct drm_via_private *dev_priv = connector->dev->dev_private;
+ struct via_device *dev_priv = connector->dev->dev_private;
struct drm_device *dev = connector->dev;
struct drm_property *prop;
uint64_t orig;
@@ -475,7 +475,7 @@ via_lcd_get_modes(struct drm_connector *connector)
native_mode->vrefresh = 50;
native_mode->hsync = 0;
} else {
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
u8 reg_value = (vga_rcrt(VGABASE, 0x3F) & 0x0F);
int hdisplay = 0, vdisplay = 0;
@@ -663,7 +663,7 @@ static const struct dmi_system_id via_ttl_lvds[] = {
void
via_lvds_init(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
bool dual_channel = false, is_msb = false;
uint64_t dither = DRM_MODE_DITHERING_OFF;
struct drm_property *dithering;
diff --git a/drivers/gpu/drm/via/via_h1_cmdbuf.c b/drivers/gpu/drm/via/via_h1_cmdbuf.c
index efcb830..43cd4b9 100644
--- a/drivers/gpu/drm/via/via_h1_cmdbuf.c
+++ b/drivers/gpu/drm/via/via_h1_cmdbuf.c
@@ -41,17 +41,17 @@
#define CMDBUF_ALIGNMENT_SIZE (0x100)
#define CMDBUF_ALIGNMENT_MASK (0x0ff)
-static void via_cmdbuf_start(struct drm_via_private *dev_priv);
-static void via_cmdbuf_pause(struct drm_via_private *dev_priv);
-static void via_cmdbuf_reset(struct drm_via_private *dev_priv);
-static void via_cmdbuf_rewind(struct drm_via_private *dev_priv);
-static void via_pad_cache(struct drm_via_private *dev_priv, int qwords);
+static void via_cmdbuf_start(struct via_device *dev_priv);
+static void via_cmdbuf_pause(struct via_device *dev_priv);
+static void via_cmdbuf_reset(struct via_device *dev_priv);
+static void via_cmdbuf_rewind(struct via_device *dev_priv);
+static void via_pad_cache(struct via_device *dev_priv, int qwords);
/*
* Free space in command buffer.
*/
-static uint32_t via_cmdbuf_space(struct drm_via_private *dev_priv)
+static uint32_t via_cmdbuf_space(struct via_device *dev_priv)
{
uint32_t gart_base = dev_priv->dma_offset;
uint32_t hw_addr = ioread32(dev_priv->hw_addr_ptr) - gart_base;
@@ -65,7 +65,7 @@ static uint32_t via_cmdbuf_space(struct drm_via_private *dev_priv)
* How much does the command regulator lag behind?
*/
-static uint32_t via_cmdbuf_lag(struct drm_via_private *dev_priv)
+static uint32_t via_cmdbuf_lag(struct via_device *dev_priv)
{
uint32_t gart_base = dev_priv->dma_offset;
uint32_t hw_addr = ioread32(dev_priv->hw_addr_ptr) - gart_base;
@@ -80,7 +80,7 @@ static uint32_t via_cmdbuf_lag(struct drm_via_private *dev_priv)
*/
static inline int
-via_cmdbuf_wait(struct drm_via_private *dev_priv, unsigned int size)
+via_cmdbuf_wait(struct via_device *dev_priv, unsigned int size)
{
uint32_t gart_base = dev_priv->dma_offset;
uint32_t cur_addr, hw_addr, next_addr;
@@ -111,7 +111,7 @@ via_cmdbuf_wait(struct drm_via_private *dev_priv, unsigned int size)
* Returns virtual pointer to ring buffer.
*/
-static inline uint32_t *via_check_dma(struct drm_via_private *dev_priv,
+static inline uint32_t *via_check_dma(struct via_device *dev_priv,
unsigned int size)
{
if ((dev_priv->dma_low + size + 4 * CMDBUF_ALIGNMENT_SIZE) >
@@ -127,7 +127,7 @@ static inline uint32_t *via_check_dma(struct drm_via_private *dev_priv,
int via_dma_cleanup(struct drm_device *dev)
{
if (dev->dev_private) {
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
if (dev_priv->dmabuf.virtual) {
struct ttm_buffer_object *bo = dev_priv->dmabuf.bo;
@@ -143,7 +143,7 @@ int via_dma_cleanup(struct drm_device *dev)
}
static int via_initialize(struct drm_device *dev,
- struct drm_via_private *dev_priv,
+ struct via_device *dev_priv,
drm_via_dma_init_t *init)
{
struct ttm_buffer_object *bo;
@@ -185,7 +185,7 @@ out_err:
int via_dma_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
drm_via_dma_init_t *init = data;
int retcode = 0;
@@ -216,7 +216,7 @@ int via_dma_init(struct drm_device *dev, void *data, struct drm_file *file_priv)
int via_dispatch_cmdbuffer(struct drm_device *dev, drm_via_cmdbuffer_t *cmd)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
uint32_t *vb;
int ret;
@@ -263,7 +263,7 @@ int via_dispatch_cmdbuffer(struct drm_device *dev, drm_via_cmdbuffer_t *cmd)
int via_driver_dma_quiescent(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
if (!via_wait_idle(dev_priv))
return -EBUSY;
@@ -294,7 +294,7 @@ int via_cmdbuffer(struct drm_device *dev, void *data, struct drm_file *file_priv
static int via_dispatch_pci_cmdbuffer(struct drm_device *dev,
drm_via_cmdbuffer_t *cmd)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
int ret;
if (cmd->size > VIA_PCI_BUF_SIZE)
@@ -326,7 +326,7 @@ int via_pci_cmdbuffer(struct drm_device *dev, void *data, struct drm_file *file_
return ret;
}
-static inline uint32_t *via_align_buffer(struct drm_via_private *dev_priv,
+static inline uint32_t *via_align_buffer(struct via_device *dev_priv,
uint32_t *vb, int qw_count)
{
for (; qw_count > 0; --qw_count)
@@ -339,7 +339,7 @@ static inline uint32_t *via_align_buffer(struct drm_via_private *dev_priv,
*
* Returns virtual pointer to ring buffer.
*/
-static inline uint32_t *via_get_dma(struct drm_via_private *dev_priv)
+static inline uint32_t *via_get_dma(struct via_device *dev_priv)
{
return (uint32_t *) (dev_priv->dmabuf.virtual + dev_priv->dma_low);
}
@@ -349,7 +349,7 @@ static inline uint32_t *via_get_dma(struct drm_via_private *dev_priv)
* modifying the pause address stored in the buffer itself. If
* the regulator has already paused, restart it.
*/
-static int via_hook_segment(struct drm_via_private *dev_priv,
+static int via_hook_segment(struct via_device *dev_priv,
uint32_t pause_addr_hi, uint32_t pause_addr_lo,
int no_pci_fire)
{
@@ -415,7 +415,7 @@ static int via_hook_segment(struct drm_via_private *dev_priv,
return paused;
}
-int via_wait_idle(struct drm_via_private *dev_priv)
+int via_wait_idle(struct via_device *dev_priv)
{
int count = 10000000;
@@ -429,7 +429,7 @@ int via_wait_idle(struct drm_via_private *dev_priv)
return count;
}
-static uint32_t *via_align_cmd(struct drm_via_private *dev_priv, uint32_t cmd_type,
+static uint32_t *via_align_cmd(struct via_device *dev_priv, uint32_t cmd_type,
uint32_t addr, uint32_t *cmd_addr_hi,
uint32_t *cmd_addr_lo, int skip_wait)
{
@@ -460,7 +460,7 @@ static uint32_t *via_align_cmd(struct drm_via_private *dev_priv, uint32_t cmd_ty
return vb;
}
-static void via_cmdbuf_start(struct drm_via_private *dev_priv)
+static void via_cmdbuf_start(struct via_device *dev_priv)
{
uint32_t pause_addr_lo, pause_addr_hi;
uint32_t start_addr, start_addr_lo;
@@ -519,7 +519,7 @@ static void via_cmdbuf_start(struct drm_via_private *dev_priv)
dev_priv->dma_diff = ptr - reader;
}
-static void via_pad_cache(struct drm_via_private *dev_priv, int qwords)
+static void via_pad_cache(struct via_device *dev_priv, int qwords)
{
uint32_t *vb;
@@ -529,7 +529,7 @@ static void via_pad_cache(struct drm_via_private *dev_priv, int qwords)
via_align_buffer(dev_priv, vb, qwords);
}
-static inline void via_dummy_bitblt(struct drm_via_private *dev_priv)
+static inline void via_dummy_bitblt(struct via_device *dev_priv)
{
uint32_t *vb = via_get_dma(dev_priv);
VIA_OUT_RING_H1(0x0C, (0 | (0 << 16)));
@@ -537,7 +537,7 @@ static inline void via_dummy_bitblt(struct drm_via_private *dev_priv)
VIA_OUT_RING_H1(0x0, 0x1 | 0x2000 | 0xAA000000);
}
-static void via_cmdbuf_rewind(struct drm_via_private *dev_priv)
+static void via_cmdbuf_rewind(struct via_device *dev_priv)
{
uint32_t pause_addr_lo, pause_addr_hi;
uint32_t jump_addr_lo, jump_addr_hi;
@@ -592,7 +592,7 @@ static void via_cmdbuf_rewind(struct drm_via_private *dev_priv)
via_hook_segment(dev_priv, pause_addr_hi, pause_addr_lo, 0);
}
-static void via_cmdbuf_flush(struct drm_via_private *dev_priv, uint32_t cmd_type)
+static void via_cmdbuf_flush(struct via_device *dev_priv, uint32_t cmd_type)
{
uint32_t pause_addr_lo, pause_addr_hi;
@@ -600,12 +600,12 @@ static void via_cmdbuf_flush(struct drm_via_private *dev_priv, uint32_t cmd_type
via_hook_segment(dev_priv, pause_addr_hi, pause_addr_lo, 0);
}
-static void via_cmdbuf_pause(struct drm_via_private *dev_priv)
+static void via_cmdbuf_pause(struct via_device *dev_priv)
{
via_cmdbuf_flush(dev_priv, HC_HAGPBpID_PAUSE);
}
-static void via_cmdbuf_reset(struct drm_via_private *dev_priv)
+static void via_cmdbuf_reset(struct via_device *dev_priv)
{
via_cmdbuf_flush(dev_priv, HC_HAGPBpID_STOP);
via_wait_idle(dev_priv);
@@ -617,7 +617,7 @@ static void via_cmdbuf_reset(struct drm_via_private *dev_priv)
int via_cmdbuf_size(struct drm_device *dev, void *data, struct drm_file *file_priv)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
drm_via_cmdbuf_size_t *d_siz = data;
int ret = 0;
uint32_t tmp_size, count;
diff --git a/drivers/gpu/drm/via/via_h1_dma.c b/drivers/gpu/drm/via/via_h1_dma.c
index 162dcfa..1075fee 100644
--- a/drivers/gpu/drm/via/via_h1_dma.c
+++ b/drivers/gpu/drm/via/via_h1_dma.c
@@ -35,7 +35,7 @@
static void
via_h1_fire_dmablit(struct drm_device *dev, struct drm_via_sg_info *vsg, int engine)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
VIA_WRITE(VIA_PCI_DMA_MAR0 + engine * 0x10, 0);
VIA_WRITE(VIA_PCI_DMA_DAR0 + engine * 0x10, 0);
@@ -53,7 +53,7 @@ via_h1_fire_dmablit(struct drm_device *dev, struct drm_via_sg_info *vsg, int eng
static void
via_abort_dmablit(struct drm_device *dev, int engine)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
VIA_WRITE(VIA_PCI_DMA_CSR0 + engine * 0x04, VIA_DMA_CSR_TA);
}
@@ -61,7 +61,7 @@ via_abort_dmablit(struct drm_device *dev, int engine)
static void
via_dmablit_engine_off(struct drm_device *dev, int engine)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
VIA_WRITE(VIA_PCI_DMA_CSR0 + engine * 0x04, VIA_DMA_CSR_TD | VIA_DMA_CSR_DD);
}
@@ -70,7 +70,7 @@ via_dmablit_engine_off(struct drm_device *dev, int engine)
static void
via_dmablit_done(struct drm_device *dev, int engine)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
/* Clear transfer done flag. */
VIA_WRITE(VIA_PCI_DMA_CSR0 + engine * 0x04, VIA_DMA_CSR_TD);
@@ -82,7 +82,7 @@ via_dmablit_done(struct drm_device *dev, int engine)
static void
via_unmap_from_device(struct drm_device *dev, struct drm_via_sg_info *vsg)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
int num_desc = vsg->num_desc;
unsigned cur_descriptor_page = num_desc / vsg->descriptors_per_page;
unsigned descriptor_this_page = num_desc % vsg->descriptors_per_page;
@@ -212,7 +212,7 @@ via_h1_dma_emit(struct via_fence *fence)
int
via_dmablit_init(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct via_fence_pool *pool;
pci_set_master(dev->pdev);
diff --git a/drivers/gpu/drm/via/via_hdmi.c b/drivers/gpu/drm/via/via_hdmi.c
index a40e927..73e387b 100644
--- a/drivers/gpu/drm/via/via_hdmi.c
+++ b/drivers/gpu/drm/via/via_hdmi.c
@@ -38,7 +38,7 @@ static const struct drm_encoder_funcs via_hdmi_enc_funcs = {
static void
via_hdmi_enc_dpms(struct drm_encoder *encoder, int mode)
{
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
switch (mode) {
case DRM_MODE_DPMS_SUSPEND:
@@ -147,7 +147,7 @@ static void
via_hdmi_native_mode_set(struct via_crtc *iga, struct drm_display_mode *mode,
bool audio_off)
{
- struct drm_via_private *dev_priv = iga->base.dev->dev_private;
+ struct via_device *dev_priv = iga->base.dev->dev_private;
u32 reg_c280, reg_c284;
int max_packet, delay;
u8 value = BIT(0);
@@ -234,7 +234,7 @@ via_hdmi_enc_mode_set(struct drm_encoder *encoder,
{
struct via_encoder *enc = container_of(encoder, struct via_encoder, base);
struct via_crtc *iga = container_of(encoder->crtc, struct via_crtc, base);
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
struct drm_connector *connector = NULL, *con;
struct drm_device *dev = encoder->dev;
@@ -380,7 +380,7 @@ static const struct drm_encoder_helper_funcs via_hdmi_enc_helper_funcs = {
};
static unsigned int
-via_check_hdmi_i2c_status(struct drm_via_private *dev_priv,
+via_check_hdmi_i2c_status(struct via_device *dev_priv,
unsigned int check_bits, unsigned int condition)
{
unsigned int status = true, max = 50, loop = 0;
@@ -406,7 +406,7 @@ via_check_hdmi_i2c_status(struct drm_via_private *dev_priv,
}
unsigned int
-via_ddc_read_bytes_by_hdmi(struct drm_via_private *dev_priv, unsigned int offset,
+via_ddc_read_bytes_by_hdmi(struct via_device *dev_priv, unsigned int offset,
unsigned char *block)
{
unsigned int status = true, temp = 0, i;
@@ -481,7 +481,7 @@ struct edid *
via_hdmi_get_edid(struct drm_connector *connector)
{
bool print_bad_edid = !connector->bad_edid_counter || (drm_debug & DRM_UT_KMS);
- struct drm_via_private *dev_priv = connector->dev->dev_private;
+ struct via_device *dev_priv = connector->dev->dev_private;
struct edid *edid = NULL;
int i, j = 0;
u8 *block;
@@ -569,7 +569,7 @@ out:
static enum drm_connector_status
via_hdmi_detect(struct drm_connector *connector, bool force)
{
- struct drm_via_private *dev_priv = connector->dev->dev_private;
+ struct via_device *dev_priv = connector->dev->dev_private;
enum drm_connector_status ret = connector_status_disconnected;
u32 mm_c730 = VIA_READ(0xc730) & 0xC0000000;
struct edid *edid = NULL;
diff --git a/drivers/gpu/drm/via/via_i2c.c b/drivers/gpu/drm/via/via_i2c.c
index 129b307..96114f4 100644
--- a/drivers/gpu/drm/via/via_i2c.c
+++ b/drivers/gpu/drm/via/via_i2c.c
@@ -30,7 +30,7 @@ static void via_i2c_setscl(void *data, int state)
{
struct via_i2c_stuff *i2c = data;
struct drm_device *dev = i2c_get_adapdata(&i2c->adapter);
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
u8 value, mask;
if (i2c->is_active == GPIO) {
@@ -47,7 +47,7 @@ static int via_i2c_getscl(void *data)
{
struct via_i2c_stuff *i2c = data;
struct drm_device *dev = i2c_get_adapdata(&i2c->adapter);
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
return vga_rseq(VGABASE, i2c->i2c_port) & BIT(3);
}
@@ -56,7 +56,7 @@ static int via_i2c_getsda(void *data)
{
struct via_i2c_stuff *i2c = data;
struct drm_device *dev = i2c_get_adapdata(&i2c->adapter);
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
return vga_rseq(VGABASE, i2c->i2c_port) & BIT(2);
}
@@ -65,7 +65,7 @@ static void via_i2c_setsda(void *data, int state)
{
struct via_i2c_stuff *i2c = data;
struct drm_device *dev = i2c_get_adapdata(&i2c->adapter);
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
u8 value, mask;
if (i2c->is_active == GPIO) {
diff --git a/drivers/gpu/drm/via/via_ioc32.c b/drivers/gpu/drm/via/via_ioc32.c
index 7d76aab..8b44bd4 100644
--- a/drivers/gpu/drm/via/via_ioc32.c
+++ b/drivers/gpu/drm/via/via_ioc32.c
@@ -31,7 +31,7 @@ static int
via_getparam(struct drm_device *dev, void *data,
struct drm_file *filp)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct drm_via_param *args = data;
int ret = 0;
@@ -61,7 +61,7 @@ static int
via_gem_alloc(struct drm_device *dev, void *data,
struct drm_file *filp)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct drm_via_gem_object *args = data;
struct drm_gem_object *obj;
int ret = -ENOMEM;
diff --git a/drivers/gpu/drm/via/via_irq.c b/drivers/gpu/drm/via/via_irq.c
index 8a4ef0d..5fc6e59 100644
--- a/drivers/gpu/drm/via/via_irq.c
+++ b/drivers/gpu/drm/via/via_irq.c
@@ -138,7 +138,7 @@ static int via_num_pro_group_a = ARRAY_SIZE(via_pro_group_a_irqs);
static int via_irqmap_pro_group_a[] = {0, 1, -1, 2, -1, 3};
static irqreturn_t
-via_hpd_irq_process(struct drm_via_private *dev_priv)
+via_hpd_irq_process(struct via_device *dev_priv)
{
uint32_t mm_1280 = VIA_READ(0x1280);
uint32_t mm_c730, mm_c7b0;
@@ -224,7 +224,7 @@ via_hpd_irq_process(struct drm_via_private *dev_priv)
irqreturn_t via_driver_irq_handler(int irq, void *arg)
{
struct drm_device *dev = (struct drm_device *) arg;
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
drm_via_irq_t *cur_irq = dev_priv->via_irqs;
u32 status = VIA_READ(INTERRUPT_CTRL_REG1);
irqreturn_t ret = IRQ_NONE;
@@ -271,7 +271,7 @@ irqreturn_t via_driver_irq_handler(int irq, void *arg)
int
via_enable_vblank(struct drm_device *dev, int crtc)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
u32 status;
if (crtc < 0 || crtc >= dev->num_crtcs) {
@@ -295,7 +295,7 @@ via_enable_vblank(struct drm_device *dev, int crtc)
void
via_disable_vblank(struct drm_device *dev, int crtc)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
u32 status;
if (crtc < 0 || crtc >= dev->num_crtcs) {
@@ -319,7 +319,7 @@ via_disable_vblank(struct drm_device *dev, int crtc)
* bit when enable irq mask.
*/
void
-via_hpd_irq_state(struct drm_via_private *dev_priv, bool enable)
+via_hpd_irq_state(struct via_device *dev_priv, bool enable)
{
uint32_t mask = BIT(7) | BIT(5) | BIT(3) | BIT(1);
uint32_t value = (enable ? mask : 0);
@@ -370,8 +370,8 @@ via_hpd_irq_state(struct drm_via_private *dev_priv, bool enable)
static void
via_hotplug_work_func(struct work_struct *work)
{
- struct drm_via_private *dev_priv = container_of(work,
- struct drm_via_private, hotplug_work);
+ struct via_device *dev_priv = container_of(work,
+ struct via_device, hotplug_work);
struct drm_device *dev = dev_priv->dev;
DRM_DEBUG("Sending Hotplug event\n");
@@ -383,7 +383,7 @@ via_hotplug_work_func(struct work_struct *work)
void
via_driver_irq_preinstall(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
drm_via_irq_t *cur_irq;
u32 status;
int i;
@@ -440,7 +440,7 @@ via_driver_irq_preinstall(struct drm_device *dev)
int
via_driver_irq_postinstall(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
u32 status = VIA_READ(INTERRUPT_CTRL_REG1);
VIA_WRITE(INTERRUPT_CTRL_REG1, status | VIA_IRQ_ALL_ENABLE |
@@ -451,7 +451,7 @@ via_driver_irq_postinstall(struct drm_device *dev)
void
via_driver_irq_uninstall(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
u32 status;
/* Some more magic, oh for some data sheets ! */
@@ -470,7 +470,7 @@ static int
via_driver_irq_wait(struct drm_device *dev, unsigned int irq, int force_sequence,
unsigned int *sequence)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
unsigned int cur_irq_sequence;
drm_via_irq_t *cur_irq;
int ret = 0;
@@ -519,7 +519,7 @@ via_wait_irq(struct drm_device *dev, void *data, struct drm_file *file_priv)
drm_via_irqwait_t *irqwait = data;
struct timeval now;
int ret = 0;
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
drm_via_irq_t *cur_irq = dev_priv->via_irqs;
int force_sequence;
diff --git a/drivers/gpu/drm/via/via_pm.c b/drivers/gpu/drm/via/via_pm.c
index a0b88ec..8dcffdf 100644
--- a/drivers/gpu/drm/via/via_pm.c
+++ b/drivers/gpu/drm/via/via_pm.c
@@ -25,7 +25,7 @@
#include "via_drv.h"
static void
-via_init_2d(struct drm_via_private *dev_priv, int pci_device)
+via_init_2d(struct via_device *dev_priv, int pci_device)
{
int i;
@@ -38,7 +38,7 @@ via_init_2d(struct drm_via_private *dev_priv, int pci_device)
}
static void
-via_init_3d(struct drm_via_private *dev_priv)
+via_init_3d(struct via_device *dev_priv)
{
unsigned long texture_stage;
int i;
@@ -170,7 +170,7 @@ via_init_3d(struct drm_via_private *dev_priv)
}
static void
-via_init_vq(struct drm_via_private *dev_priv)
+via_init_vq(struct via_device *dev_priv)
{
unsigned long vq_start_addr, vq_end_addr, vqlen;
unsigned long vqstartl, vqendl, vqstart_endh;
@@ -197,7 +197,7 @@ via_init_vq(struct drm_via_private *dev_priv)
}
static void
-via_init_pcie_gart_table(struct drm_via_private *dev_priv,
+via_init_pcie_gart_table(struct via_device *dev_priv,
struct pci_dev *pdev)
{
struct ttm_buffer_object *bo = dev_priv->gart.bo;
@@ -235,7 +235,7 @@ via_init_pcie_gart_table(struct drm_via_private *dev_priv,
void
via_engine_init(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
/* initial engines */
via_init_2d(dev_priv, dev->pdev->device);
diff --git a/drivers/gpu/drm/via/via_sgdma.c b/drivers/gpu/drm/via/via_sgdma.c
index 0dfd1a6..e040109 100644
--- a/drivers/gpu/drm/via/via_sgdma.c
+++ b/drivers/gpu/drm/via/via_sgdma.c
@@ -30,8 +30,8 @@ via_pcie_sgdma_bind(struct ttm_tt *ttm, struct ttm_mem_reg *mem)
{
struct sgdma_tt *dma_tt = (struct sgdma_tt *) ttm;
struct ttm_bo_device *bdev = dma_tt->sgdma.ttm.bdev;
- struct drm_via_private *dev_priv =
- container_of(bdev, struct drm_via_private, bdev);
+ struct via_device *dev_priv =
+ container_of(bdev, struct via_device, bdev);
int i;
/* Disable gart table HW protect */
@@ -57,8 +57,8 @@ via_pcie_sgdma_unbind(struct ttm_tt *ttm)
{
struct sgdma_tt *dma_tt = (struct sgdma_tt *) ttm;
struct ttm_bo_device *bdev = dma_tt->sgdma.ttm.bdev;
- struct drm_via_private *dev_priv =
- container_of(bdev, struct drm_via_private, bdev);
+ struct via_device *dev_priv =
+ container_of(bdev, struct via_device, bdev);
int i;
if (ttm->state != tt_bound)
diff --git a/drivers/gpu/drm/via/via_tmds.c b/drivers/gpu/drm/via/via_tmds.c
index 3fee73c..ec8d414 100644
--- a/drivers/gpu/drm/via/via_tmds.c
+++ b/drivers/gpu/drm/via/via_tmds.c
@@ -36,7 +36,7 @@ static const struct drm_encoder_funcs via_tmds_enc_funcs = {
static void
via_tmds_dpms(struct drm_encoder *encoder, int mode)
{
- struct drm_via_private *dev_priv = encoder->dev->dev_private;
+ struct via_device *dev_priv = encoder->dev->dev_private;
switch (mode) {
case DRM_MODE_DPMS_SUSPEND:
@@ -123,7 +123,7 @@ static const struct drm_connector_helper_funcs via_dvi_connector_helper_funcs =
int
via_tmds_init(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct via_connector *con;
struct via_encoder *enc;
int i2c_port = 0x3D;
diff --git a/drivers/gpu/drm/via/via_ttm.c b/drivers/gpu/drm/via/via_ttm.c
index 6d55ae3..72d246b 100644
--- a/drivers/gpu/drm/via/via_ttm.c
+++ b/drivers/gpu/drm/via/via_ttm.c
@@ -120,8 +120,8 @@ via_ttm_tt_create(struct ttm_bo_device *bdev, unsigned long size,
uint32_t page_flags, struct page *dummy_read_page)
{
#if __OS_HAS_AGP
- struct drm_via_private *dev_priv =
- container_of(bdev, struct drm_via_private, bdev);
+ struct via_device *dev_priv =
+ container_of(bdev, struct via_device, bdev);
if (drm_pci_device_is_agp(dev_priv->dev))
return ttm_agp_tt_create(bdev, dev_priv->dev->agp->bridge,
@@ -136,8 +136,8 @@ via_ttm_tt_populate(struct ttm_tt *ttm)
struct sgdma_tt *dma_tt = (struct sgdma_tt *) ttm;
struct ttm_dma_tt *sgdma = &dma_tt->sgdma;
struct ttm_bo_device *bdev = ttm->bdev;
- struct drm_via_private *dev_priv =
- container_of(bdev, struct drm_via_private, bdev);
+ struct via_device *dev_priv =
+ container_of(bdev, struct via_device, bdev);
struct drm_device *dev = dev_priv->dev;
unsigned int i;
int ret = 0;
@@ -182,8 +182,8 @@ via_ttm_tt_unpopulate(struct ttm_tt *ttm)
struct sgdma_tt *dma_tt = (struct sgdma_tt *) ttm;
struct ttm_dma_tt *sgdma = &dma_tt->sgdma;
struct ttm_bo_device *bdev = ttm->bdev;
- struct drm_via_private *dev_priv =
- container_of(bdev, struct drm_via_private, bdev);
+ struct via_device *dev_priv =
+ container_of(bdev, struct via_device, bdev);
struct drm_device *dev = dev_priv->dev;
unsigned int i;
@@ -225,8 +225,8 @@ via_init_mem_type(struct ttm_bo_device *bdev, uint32_t type,
struct ttm_mem_type_manager *man)
{
#if __OS_HAS_AGP
- struct drm_via_private *dev_priv =
- container_of(bdev, struct drm_via_private, bdev);
+ struct via_device *dev_priv =
+ container_of(bdev, struct via_device, bdev);
struct drm_device *dev = dev_priv->dev;
#endif
@@ -309,7 +309,7 @@ via_alloc_desc_pages(struct ttm_tt *ttm, struct drm_device *dev,
unsigned long dev_start, enum dma_data_direction direction)
{
struct drm_via_sg_info *vsg = kzalloc(sizeof(*vsg), GFP_KERNEL);
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
int desc_size = dev_priv->desc_size, i;
vsg->ttm = ttm;
@@ -341,8 +341,8 @@ static int
via_move_blit(struct ttm_buffer_object *bo, bool evict, bool no_wait_gpu,
struct ttm_mem_reg *new_mem, struct ttm_mem_reg *old_mem)
{
- struct drm_via_private *dev_priv =
- container_of(bo->bdev, struct drm_via_private, bdev);
+ struct via_device *dev_priv =
+ container_of(bo->bdev, struct via_device, bdev);
enum dma_data_direction direction = DMA_TO_DEVICE;
unsigned long old_start, new_start, dev_addr = 0;
struct drm_via_sg_info *vsg;
@@ -496,8 +496,8 @@ via_bo_move(struct ttm_buffer_object *bo, bool evict, bool interruptible,
static int
via_ttm_io_mem_reserve(struct ttm_bo_device *bdev, struct ttm_mem_reg *mem)
{
- struct drm_via_private *dev_priv =
- container_of(bdev, struct drm_via_private, bdev);
+ struct via_device *dev_priv =
+ container_of(bdev, struct via_device, bdev);
struct ttm_mem_type_manager *man = &bdev->man[mem->mem_type];
struct drm_device *dev = dev_priv->dev;
@@ -566,7 +566,7 @@ static struct ttm_bo_driver via_bo_driver = {
int via_ttm_init(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
int ret = via_ttm_global_init(&dev_priv->mem_global_ref,
&dev_priv->bo_global_ref,
@@ -579,7 +579,7 @@ int via_ttm_init(struct drm_device *dev)
void via_mm_fini(struct drm_device *dev)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
DRM_DEBUG("Entered via_mm_fini.\n");
diff --git a/drivers/gpu/drm/via/via_verifier.c b/drivers/gpu/drm/via/via_verifier.c
index c638fc7..1b527b5 100644
--- a/drivers/gpu/drm/via/via_verifier.c
+++ b/drivers/gpu/drm/via/via_verifier.c
@@ -528,8 +528,8 @@ static inline int
via_check_prim_list(uint32_t const **buffer, const uint32_t * buf_end,
struct drm_via_state *cur_seq)
{
- struct drm_via_private *dev_priv =
- (struct drm_via_private *) cur_seq->dev->dev_private;
+ struct via_device *dev_priv =
+ (struct via_device *) cur_seq->dev->dev_private;
uint32_t a_fire, bcmd, dw_count;
int ret = 0;
int have_fire;
@@ -721,7 +721,7 @@ via_check_header2(uint32_t const **buffer, const uint32_t *buf_end,
}
static inline enum verifier_state
-via_parse_header2(struct drm_via_private *dev_priv, uint32_t const **buffer,
+via_parse_header2(struct via_device *dev_priv, uint32_t const **buffer,
const uint32_t *buf_end, int *fire_count)
{
uint32_t cmd;
@@ -853,7 +853,7 @@ via_check_header1(uint32_t const **buffer, const uint32_t * buf_end)
}
static inline enum verifier_state
-via_parse_header1(struct drm_via_private *dev_priv, uint32_t const **buffer,
+via_parse_header1(struct via_device *dev_priv, uint32_t const **buffer,
const uint32_t *buf_end)
{
register uint32_t cmd = VIA_REG_GECMD;
@@ -915,7 +915,7 @@ via_check_vheader5(uint32_t const **buffer, const uint32_t *buf_end)
}
static inline enum verifier_state
-via_parse_vheader5(struct drm_via_private *dev_priv, uint32_t const **buffer,
+via_parse_vheader5(struct via_device *dev_priv, uint32_t const **buffer,
const uint32_t *buf_end)
{
uint32_t addr, count, i;
@@ -970,7 +970,7 @@ via_check_vheader6(uint32_t const **buffer, const uint32_t * buf_end)
}
static inline enum verifier_state
-via_parse_vheader6(struct drm_via_private *dev_priv, uint32_t const **buffer,
+via_parse_vheader6(struct via_device *dev_priv, uint32_t const **buffer,
const uint32_t *buf_end)
{
@@ -995,7 +995,7 @@ via_verify_command_stream(const uint32_t * buf, unsigned int size,
struct drm_device * dev, int agp)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
struct drm_via_state *hc_state = &dev_priv->hc_state;
struct drm_via_state saved_state = *hc_state;
uint32_t cmd;
@@ -1068,7 +1068,7 @@ via_parse_command_stream(struct drm_device *dev, const uint32_t *buf,
unsigned int size)
{
- struct drm_via_private *dev_priv = dev->dev_private;
+ struct via_device *dev_priv = dev->dev_private;
const uint32_t *buf_end = buf + (size >> 2);
enum verifier_state state = state_command;
int fire_count = 0;
More information about the Openchrome-devel
mailing list