From 5182c0c9a1486c1c80998d62b1d2e90db40ec631 Mon Sep 17 00:00:00 2001 From: Loren Huang Date: Fri, 15 Feb 2013 23:34:51 +0800 Subject: ENGR00251005 [gpu]4.6.9p11 kernel code integration -4.6.9p11 kernel code integration -Additionally release runtime pm and regulator when destory gpu driver to avoid reference count mismatch. Signed-off-by: Loren Huang Acked-by: Lily Zhang --- drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h') diff --git a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h index f990adf9c2fd..460f022933ac 100644 --- a/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h +++ b/drivers/mxc/gpu-viv/hal/os/linux/kernel/gc_hal_kernel_device.h @@ -1,6 +1,6 @@ /**************************************************************************** * -* Copyright (C) 2005 - 2012 by Vivante Corp. +* Copyright (C) 2005 - 2013 by Vivante Corp. * * 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 @@ -19,8 +19,6 @@ *****************************************************************************/ - - #ifndef __gc_hal_kernel_device_h_ #define __gc_hal_kernel_device_h_ @@ -37,15 +35,18 @@ typedef struct _gckGALDEVICE /* Attributes. */ gctSIZE_T internalSize; gctPHYS_ADDR internalPhysical; + gctUINT32 internalPhysicalName; gctPOINTER internalLogical; gckVIDMEM internalVidMem; gctSIZE_T externalSize; gctPHYS_ADDR externalPhysical; + gctUINT32 externalPhysicalName; gctPOINTER externalLogical; gckVIDMEM externalVidMem; gckVIDMEM contiguousVidMem; gctPOINTER contiguousBase; gctPHYS_ADDR contiguousPhysical; + gctUINT32 contiguousPhysicalName; gctSIZE_T contiguousSize; gctBOOL contiguousMapped; gctPOINTER contiguousMappedUser; -- cgit v1.2.3