Commit 126d0a94 authored by Jani Nikula's avatar Jani Nikula

drm/i915: stick to kernel fixed size types

We no longer allow mixed C99 and kernel types, and the preference is to
use kernel types exclusively. Fix the C99 types that have crept in since
the mass conversion. No functional changes.

Cc: Juha-Pekka Heikkila <juhapekka.heikkila@gmail.com>
Cc: Kevin Strasser <kevin.strasser@intel.com>
Cc: Ramalingam C <ramalingam.c@intel.com>
Cc: Swati Sharma <swati2.sharma@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: default avatarVille Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: default avatarJani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190318160019.9309-1-jani.nikula@intel.com
parent 65baf0ef
...@@ -1492,7 +1492,7 @@ static struct hdcp2_hdmi_msg_data { ...@@ -1492,7 +1492,7 @@ static struct hdcp2_hdmi_msg_data {
static static
int intel_hdmi_hdcp2_read_rx_status(struct intel_digital_port *intel_dig_port, int intel_hdmi_hdcp2_read_rx_status(struct intel_digital_port *intel_dig_port,
uint8_t *rx_status) u8 *rx_status)
{ {
return intel_hdmi_hdcp_read(intel_dig_port, return intel_hdmi_hdcp_read(intel_dig_port,
HDCP_2_2_HDMI_REG_RXSTATUS_OFFSET, HDCP_2_2_HDMI_REG_RXSTATUS_OFFSET,
......
...@@ -363,7 +363,7 @@ static int ivb_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv, ...@@ -363,7 +363,7 @@ static int ivb_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv,
static int skl_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv, static int skl_pipe_crc_ctl_reg(struct drm_i915_private *dev_priv,
enum pipe pipe, enum pipe pipe,
enum intel_pipe_crc_source *source, enum intel_pipe_crc_source *source,
uint32_t *val) u32 *val)
{ {
if (*source == INTEL_PIPE_CRC_SOURCE_AUTO) if (*source == INTEL_PIPE_CRC_SOURCE_AUTO)
*source = INTEL_PIPE_CRC_SOURCE_PIPE; *source = INTEL_PIPE_CRC_SOURCE_PIPE;
......
...@@ -1821,7 +1821,7 @@ static const u32 skl_plane_formats[] = { ...@@ -1821,7 +1821,7 @@ static const u32 skl_plane_formats[] = {
DRM_FORMAT_VYUY, DRM_FORMAT_VYUY,
}; };
static const uint32_t icl_plane_formats[] = { static const u32 icl_plane_formats[] = {
DRM_FORMAT_C8, DRM_FORMAT_C8,
DRM_FORMAT_RGB565, DRM_FORMAT_RGB565,
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
...@@ -1842,7 +1842,7 @@ static const uint32_t icl_plane_formats[] = { ...@@ -1842,7 +1842,7 @@ static const uint32_t icl_plane_formats[] = {
DRM_FORMAT_Y416, DRM_FORMAT_Y416,
}; };
static const uint32_t icl_hdr_plane_formats[] = { static const u32 icl_hdr_plane_formats[] = {
DRM_FORMAT_C8, DRM_FORMAT_C8,
DRM_FORMAT_RGB565, DRM_FORMAT_RGB565,
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
...@@ -1883,7 +1883,7 @@ static const u32 skl_planar_formats[] = { ...@@ -1883,7 +1883,7 @@ static const u32 skl_planar_formats[] = {
DRM_FORMAT_NV12, DRM_FORMAT_NV12,
}; };
static const uint32_t glk_planar_formats[] = { static const u32 glk_planar_formats[] = {
DRM_FORMAT_C8, DRM_FORMAT_C8,
DRM_FORMAT_RGB565, DRM_FORMAT_RGB565,
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
...@@ -1902,7 +1902,7 @@ static const uint32_t glk_planar_formats[] = { ...@@ -1902,7 +1902,7 @@ static const uint32_t glk_planar_formats[] = {
DRM_FORMAT_P016, DRM_FORMAT_P016,
}; };
static const uint32_t icl_planar_formats[] = { static const u32 icl_planar_formats[] = {
DRM_FORMAT_C8, DRM_FORMAT_C8,
DRM_FORMAT_RGB565, DRM_FORMAT_RGB565,
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
...@@ -1927,7 +1927,7 @@ static const uint32_t icl_planar_formats[] = { ...@@ -1927,7 +1927,7 @@ static const uint32_t icl_planar_formats[] = {
DRM_FORMAT_Y416, DRM_FORMAT_Y416,
}; };
static const uint32_t icl_hdr_planar_formats[] = { static const u32 icl_hdr_planar_formats[] = {
DRM_FORMAT_C8, DRM_FORMAT_C8,
DRM_FORMAT_RGB565, DRM_FORMAT_RGB565,
DRM_FORMAT_XRGB8888, DRM_FORMAT_XRGB8888,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment