[Intel-gfx] linux-next: Tree for Oct 20 (gpu/drm/i915)

2016-10-21 Thread Zhenyu Wang
On 2016.10.20 21:25:03 +0300, Jani Nikula wrote:
> On Thu, 20 Oct 2016, Daniel Vetter  wrote:
> > On Thu, Oct 20, 2016 at 7:37 PM, Randy Dunlap  
> > wrote:
> >> On 10/19/16 20:20, Stephen Rothwell wrote:
> >>> Hi all,
> >>>
> >>> Changes since 20161019:
> >>>
> >>
> >> on i386: when CONFIG_ACPI is not enabled:
> >
> > Adding Zhenyu. Might be good to have a fix just for this that I
> > directly pick up, since I want to tag the first 4.10 pull for Dave
> > Airlie this w/e.
> 
> How about just this?
>

I'd like to not depend on acpi function any more, so just change that
for memremap. GVT-g driver currently only supports 64BIT kernel so will
fix that dependence. I'll send fix pull for Daniel later.

thanks

> diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
> index 6aedc96aa412..94914381e8ef 100644
> --- a/drivers/gpu/drm/i915/Kconfig
> +++ b/drivers/gpu/drm/i915/Kconfig
> @@ -85,7 +85,7 @@ config DRM_I915_USERPTR
>  
>  config DRM_I915_GVT
>  bool "Enable Intel GVT-g graphics virtualization host support"
> -depends on DRM_I915
> +depends on DRM_I915 && ACPI
>  default n
>  help
> Choose this option if you want to enable Intel GVT-g graphics
> 
> 
> 
> > -Daniel
> >
> >> ../drivers/gpu/drm/i915/gvt/opregion.c: In function 
> >> 'intel_gvt_init_opregion':
> >> ../drivers/gpu/drm/i915/gvt/opregion.c:183:2: error: implicit declaration 
> >> of function 'acpi_os_ioremap' [-Werror=implicit-function-declaration]
> >>   gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa,
> >>   ^
> >> ../drivers/gpu/drm/i915/gvt/opregion.c:183:28: warning: assignment makes 
> >> pointer from integer without a cast [enabled by default]
> >>   gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa,
> >> ^
> >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'read_pte64':
> >> ../drivers/gpu/drm/i915/gvt/gtt.c:277:2: warning: left shift count >= 
> >> width of type [enabled by default]
> >>   pte |= ioread32(addr + 4) << 32;
> >>   ^
> >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_get_pfn':
> >> ../drivers/gpu/drm/i915/gvt/gtt.c:360:3: warning: left shift count >= 
> >> width of type [enabled by default]
> >>pfn = (e->val64 & ADDR_4K_MASK) >> 12;
> >>^
> >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_set_pfn':
> >> ../drivers/gpu/drm/i915/gvt/gtt.c:373:3: warning: left shift count >= 
> >> width of type [enabled by default]
> >>e->val64 &= ~ADDR_4K_MASK;
> >>^
> >> ../drivers/gpu/drm/i915/gvt/gtt.c:374:3: warning: left shift count >= 
> >> width of type [enabled by default]
> >>pfn &= (ADDR_4K_MASK >> 12);
> >>^
> >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gma_to_pml4_index':
> >> ../drivers/gpu/drm/i915/gvt/gtt.c:436:1: warning: right shift count >= 
> >> width of type [enabled by default]
> >>  DEFINE_PPGTT_GMA_TO_INDEX(gen8, pml4, (gma >> 39 & 0x1ff));
> >>  ^
> >>   CC  drivers/gpu/drm/radeon/si_smc.o
> >> In file included from ../drivers/gpu/drm/i915/i915_drv.h:46:0,
> >>  from ../drivers/gpu/drm/i915/gvt/gtt.c:36:
> >> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 
> >> 'intel_gvt_create_scratch_page':
> >> ../drivers/gpu/drm/i915/gvt/gtt.c:1945:47: warning: cast from pointer to 
> >> integer of different size [-Wpointer-to-int-cast]
> >>gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr);
> >>^
> >> ../include/drm/drmP.h:201:43: note: in definition of macro 'DRM_ERROR'
> >>   drm_printk(KERN_ERR, DRM_UT_NONE, fmt, ##__VA_ARGS__)
> >>^
> >> ../drivers/gpu/drm/i915/gvt/gtt.c:1945:3: note: in expansion of macro 
> >> 'gvt_err'
> >>gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr);
> >>^
> >>
> >>
> >>
> >> --
> >> ~Randy
> >> ___
> >> Intel-gfx mailing list
> >> Intel-gfx at lists.freedesktop.org
> >> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
> 
> -- 
> Jani Nikula, Intel Open Source Technology Center

-- 
Open Source Technology Center, Intel ltd.

$gpg --keyserver wwwkeys.pgp.net --recv-keys 4D781827
-- next part --
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 163 bytes
Desc: not available
URL: 



[Intel-gfx] linux-next: Tree for Oct 20 (gpu/drm/i915)

2016-10-20 Thread Jani Nikula
On Thu, 20 Oct 2016, Daniel Vetter  wrote:
> On Thu, Oct 20, 2016 at 7:37 PM, Randy Dunlap  
> wrote:
>> On 10/19/16 20:20, Stephen Rothwell wrote:
>>> Hi all,
>>>
>>> Changes since 20161019:
>>>
>>
>> on i386: when CONFIG_ACPI is not enabled:
>
> Adding Zhenyu. Might be good to have a fix just for this that I
> directly pick up, since I want to tag the first 4.10 pull for Dave
> Airlie this w/e.

How about just this?

diff --git a/drivers/gpu/drm/i915/Kconfig b/drivers/gpu/drm/i915/Kconfig
index 6aedc96aa412..94914381e8ef 100644
--- a/drivers/gpu/drm/i915/Kconfig
+++ b/drivers/gpu/drm/i915/Kconfig
@@ -85,7 +85,7 @@ config DRM_I915_USERPTR

 config DRM_I915_GVT
 bool "Enable Intel GVT-g graphics virtualization host support"
-depends on DRM_I915
+depends on DRM_I915 && ACPI
 default n
 help
  Choose this option if you want to enable Intel GVT-g graphics



> -Daniel
>
>> ../drivers/gpu/drm/i915/gvt/opregion.c: In function 
>> 'intel_gvt_init_opregion':
>> ../drivers/gpu/drm/i915/gvt/opregion.c:183:2: error: implicit declaration of 
>> function 'acpi_os_ioremap' [-Werror=implicit-function-declaration]
>>   gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa,
>>   ^
>> ../drivers/gpu/drm/i915/gvt/opregion.c:183:28: warning: assignment makes 
>> pointer from integer without a cast [enabled by default]
>>   gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa,
>> ^
>> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'read_pte64':
>> ../drivers/gpu/drm/i915/gvt/gtt.c:277:2: warning: left shift count >= width 
>> of type [enabled by default]
>>   pte |= ioread32(addr + 4) << 32;
>>   ^
>> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_get_pfn':
>> ../drivers/gpu/drm/i915/gvt/gtt.c:360:3: warning: left shift count >= width 
>> of type [enabled by default]
>>pfn = (e->val64 & ADDR_4K_MASK) >> 12;
>>^
>> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_set_pfn':
>> ../drivers/gpu/drm/i915/gvt/gtt.c:373:3: warning: left shift count >= width 
>> of type [enabled by default]
>>e->val64 &= ~ADDR_4K_MASK;
>>^
>> ../drivers/gpu/drm/i915/gvt/gtt.c:374:3: warning: left shift count >= width 
>> of type [enabled by default]
>>pfn &= (ADDR_4K_MASK >> 12);
>>^
>> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gma_to_pml4_index':
>> ../drivers/gpu/drm/i915/gvt/gtt.c:436:1: warning: right shift count >= width 
>> of type [enabled by default]
>>  DEFINE_PPGTT_GMA_TO_INDEX(gen8, pml4, (gma >> 39 & 0x1ff));
>>  ^
>>   CC  drivers/gpu/drm/radeon/si_smc.o
>> In file included from ../drivers/gpu/drm/i915/i915_drv.h:46:0,
>>  from ../drivers/gpu/drm/i915/gvt/gtt.c:36:
>> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 
>> 'intel_gvt_create_scratch_page':
>> ../drivers/gpu/drm/i915/gvt/gtt.c:1945:47: warning: cast from pointer to 
>> integer of different size [-Wpointer-to-int-cast]
>>gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr);
>>^
>> ../include/drm/drmP.h:201:43: note: in definition of macro 'DRM_ERROR'
>>   drm_printk(KERN_ERR, DRM_UT_NONE, fmt, ##__VA_ARGS__)
>>^
>> ../drivers/gpu/drm/i915/gvt/gtt.c:1945:3: note: in expansion of macro 
>> 'gvt_err'
>>gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr);
>>^
>>
>>
>>
>> --
>> ~Randy
>> ___
>> Intel-gfx mailing list
>> Intel-gfx at lists.freedesktop.org
>> https://lists.freedesktop.org/mailman/listinfo/intel-gfx

-- 
Jani Nikula, Intel Open Source Technology Center


[Intel-gfx] linux-next: Tree for Oct 20 (gpu/drm/i915)

2016-10-20 Thread Daniel Vetter
On Thu, Oct 20, 2016 at 7:37 PM, Randy Dunlap  wrote:
> On 10/19/16 20:20, Stephen Rothwell wrote:
>> Hi all,
>>
>> Changes since 20161019:
>>
>
> on i386: when CONFIG_ACPI is not enabled:

Adding Zhenyu. Might be good to have a fix just for this that I
directly pick up, since I want to tag the first 4.10 pull for Dave
Airlie this w/e.
-Daniel

> ../drivers/gpu/drm/i915/gvt/opregion.c: In function 'intel_gvt_init_opregion':
> ../drivers/gpu/drm/i915/gvt/opregion.c:183:2: error: implicit declaration of 
> function 'acpi_os_ioremap' [-Werror=implicit-function-declaration]
>   gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa,
>   ^
> ../drivers/gpu/drm/i915/gvt/opregion.c:183:28: warning: assignment makes 
> pointer from integer without a cast [enabled by default]
>   gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa,
> ^
> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'read_pte64':
> ../drivers/gpu/drm/i915/gvt/gtt.c:277:2: warning: left shift count >= width 
> of type [enabled by default]
>   pte |= ioread32(addr + 4) << 32;
>   ^
> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_get_pfn':
> ../drivers/gpu/drm/i915/gvt/gtt.c:360:3: warning: left shift count >= width 
> of type [enabled by default]
>pfn = (e->val64 & ADDR_4K_MASK) >> 12;
>^
> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_set_pfn':
> ../drivers/gpu/drm/i915/gvt/gtt.c:373:3: warning: left shift count >= width 
> of type [enabled by default]
>e->val64 &= ~ADDR_4K_MASK;
>^
> ../drivers/gpu/drm/i915/gvt/gtt.c:374:3: warning: left shift count >= width 
> of type [enabled by default]
>pfn &= (ADDR_4K_MASK >> 12);
>^
> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gma_to_pml4_index':
> ../drivers/gpu/drm/i915/gvt/gtt.c:436:1: warning: right shift count >= width 
> of type [enabled by default]
>  DEFINE_PPGTT_GMA_TO_INDEX(gen8, pml4, (gma >> 39 & 0x1ff));
>  ^
>   CC  drivers/gpu/drm/radeon/si_smc.o
> In file included from ../drivers/gpu/drm/i915/i915_drv.h:46:0,
>  from ../drivers/gpu/drm/i915/gvt/gtt.c:36:
> ../drivers/gpu/drm/i915/gvt/gtt.c: In function 
> 'intel_gvt_create_scratch_page':
> ../drivers/gpu/drm/i915/gvt/gtt.c:1945:47: warning: cast from pointer to 
> integer of different size [-Wpointer-to-int-cast]
>gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr);
>^
> ../include/drm/drmP.h:201:43: note: in definition of macro 'DRM_ERROR'
>   drm_printk(KERN_ERR, DRM_UT_NONE, fmt, ##__VA_ARGS__)
>^
> ../drivers/gpu/drm/i915/gvt/gtt.c:1945:3: note: in expansion of macro 
> 'gvt_err'
>gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr);
>^
>
>
>
> --
> ~Randy
> ___
> Intel-gfx mailing list
> Intel-gfx at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx



-- 
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch


linux-next: Tree for Oct 20 (gpu/drm/i915)

2016-10-20 Thread Randy Dunlap
On 10/19/16 20:20, Stephen Rothwell wrote:
> Hi all,
> 
> Changes since 20161019:
> 

on i386: when CONFIG_ACPI is not enabled:

../drivers/gpu/drm/i915/gvt/opregion.c: In function 'intel_gvt_init_opregion':
../drivers/gpu/drm/i915/gvt/opregion.c:183:2: error: implicit declaration of 
function 'acpi_os_ioremap' [-Werror=implicit-function-declaration]
  gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa,
  ^
../drivers/gpu/drm/i915/gvt/opregion.c:183:28: warning: assignment makes 
pointer from integer without a cast [enabled by default]
  gvt->opregion.opregion_va = acpi_os_ioremap(gvt->opregion.opregion_pa,
^
../drivers/gpu/drm/i915/gvt/gtt.c: In function 'read_pte64':
../drivers/gpu/drm/i915/gvt/gtt.c:277:2: warning: left shift count >= width of 
type [enabled by default]
  pte |= ioread32(addr + 4) << 32;
  ^
../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_get_pfn':
../drivers/gpu/drm/i915/gvt/gtt.c:360:3: warning: left shift count >= width of 
type [enabled by default]
   pfn = (e->val64 & ADDR_4K_MASK) >> 12;
   ^
../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gtt_set_pfn':
../drivers/gpu/drm/i915/gvt/gtt.c:373:3: warning: left shift count >= width of 
type [enabled by default]
   e->val64 &= ~ADDR_4K_MASK;
   ^
../drivers/gpu/drm/i915/gvt/gtt.c:374:3: warning: left shift count >= width of 
type [enabled by default]
   pfn &= (ADDR_4K_MASK >> 12);
   ^
../drivers/gpu/drm/i915/gvt/gtt.c: In function 'gen8_gma_to_pml4_index':
../drivers/gpu/drm/i915/gvt/gtt.c:436:1: warning: right shift count >= width of 
type [enabled by default]
 DEFINE_PPGTT_GMA_TO_INDEX(gen8, pml4, (gma >> 39 & 0x1ff));
 ^
  CC  drivers/gpu/drm/radeon/si_smc.o
In file included from ../drivers/gpu/drm/i915/i915_drv.h:46:0,
 from ../drivers/gpu/drm/i915/gvt/gtt.c:36:
../drivers/gpu/drm/i915/gvt/gtt.c: In function 'intel_gvt_create_scratch_page':
../drivers/gpu/drm/i915/gvt/gtt.c:1945:47: warning: cast from pointer to 
integer of different size [-Wpointer-to-int-cast]
   gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr);
   ^
../include/drm/drmP.h:201:43: note: in definition of macro 'DRM_ERROR'
  drm_printk(KERN_ERR, DRM_UT_NONE, fmt, ##__VA_ARGS__)
   ^
../drivers/gpu/drm/i915/gvt/gtt.c:1945:3: note: in expansion of macro 'gvt_err'
   gvt_err("fail to translate vaddr:0x%llx\n", (u64)vaddr);
   ^



-- 
~Randy