Re: CVS commit: xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting

[Joerg Sonnenberger]

On Wed, Apr 04, 2018 at 10:59:18AM +1000, matthew green wrote:
> Christos Zoulas writes:
> > In article <21473.1522789...@splode.eterna.com.au>,
> > matthew green   wrote:
> > >"Ryo Shimizu" writes:
> > >> Module Name: xsrc
> > >> Committed By:ryo
> > >> Date:Tue Apr  3 19:53:57 UTC 2018
> > >> 
> > >> Modified Files:
> > >>  xsrc/external/mit/xorg-server/dist/hw/xfree86/drivers/modesetting:
> > >>  driver.h present.c vblank.c
> > >> 
> > >> Log Message:
> > >> Fix compile error on evbarm-aarch64. (incompatible pointer types
> > >initializing 'present_get_ust_msc_ptr')
> > >
> > >sounds like this is a different error.  why isn't CARD64 a
> > >uint64_t or similarly compatible for arm64?  this sounds
> > >like a problem with the environemnt, and not something to
> > >work around here.
> > >
> > >is _XSERVER64 not defined, or whatever it is?
> > >
> > >thanks.
> > 
> > Yes, the problem is the compiler but this is an X bug.
> > 
> > uint64_t is defined to be unsigned long long and CARD64 is unsigned long.
> > They are simply not exchangeable and the compiler has the right to define
> > things this way. Well, I've complained to joerg to normalize it and make
> > it like all other _LP64 platforms, but there is an embargo committing to
> > llvm.
> 
> can we have a hack in the Makefile for arm64 and not
> touch the sources (for everyone)?

We can just make the warning non-fatal for now. Like the attached patch.

Joerg
diff -r 22ec71aea77a 
external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile
--- 
a/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile  
Wed Apr 04 06:30:09 2018 +
+++ 
b/external/mit/xorg/server/xorg-server/hw/xfree86/drivers/modesetting/Makefile  
Thu Apr 05 00:36:55 2018 +0200
@@ -29,3 +29,7 @@
 DRIVER_NO_FAKE_INCLUDE=# defined
 
 .include "../../../../../drivers/Makefile.xf86-driver"
+
+.if ${MACHINE_ARCH:Maarch64*}
+CWARNFLAGS.clang+= -Wno-error=incompatible-pointer-types
+.endif

Re: CVS commit: src/sys/dev/pci/ixgbe

[Masanobu SAITOH]

On 2018/04/04 17:13, SAITOH Masanobu wrote:

Module Name:src
Committed By:   msaitoh
Date:   Wed Apr  4 08:13:07 UTC 2018

Modified Files:
src/sys/dev/pci/ixgbe: if_bypass.c if_fdir.c if_sriov.c ix_txrx.c
ixgbe.c ixgbe.h ixgbe_82598.c ixgbe_82598.h ixgbe_82599.c
ixgbe_82599.h ixgbe_api.c ixgbe_api.h ixgbe_common.c ixgbe_common.h
ixgbe_dcb.c ixgbe_dcb.h ixgbe_dcb_82598.c ixgbe_dcb_82598.h
ixgbe_dcb_82599.c ixgbe_dcb_82599.h ixgbe_fdir.h ixgbe_mbx.c
ixgbe_mbx.h ixgbe_osdep.c ixgbe_osdep.h ixgbe_phy.c ixgbe_phy.h
ixgbe_rss.h ixgbe_sriov.h ixgbe_type.h ixgbe_vf.c ixgbe_vf.h
ixgbe_x540.c ixgbe_x540.h ixv.c

Log Message:
Sync with the remaining part of FreeBSD r328265 except sfp_reinit stuff:
  - Always schedule module intterrupt in ixgbe_config_link() when a device is
SFP+ based.
  - Use not loop index but txr->me in ixv_initialize_{transmit,receive}_units().
It's required for VMDQ but NetBSD doesn't use it, so it's not a bug in
NetBSD.
  - Simplify ixgbe_bp_wd_set(). No functional change.
  - Whitespace.


+ Call ixgbe_set_phy_power() in ixgbe_init_locked() to
make sure we are not in power save mode.


--
---
SAITOH Masanobu (msai...@execsw.org
 msai...@netbsd.org)