[GIT PULL] omapdrm changes for v4.17, try 2