Merge changes I3d802b7c,I2b11caa0 into mnc-dr-dev

* changes:
  libdrm: nouveau: Add GEM_SET_INFO ioctl
  Revert "libdrm: Add coherent flag to set_tiling"