match RFC v4 kernel/libdrm changes

Signed-off-by: Yao Cheng <yao.cheng@intel.com>