xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

drm/i915/cdclk: switch to kernel types

Browse Source 
Mixed C99 and kernel types use is getting ugly.	Prefer kernel types.

sed -i 's/\buint\(8\|16\|32\|64\)_t\b/u\1/g'

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Reviewed-by: José Roberto de Souza <jose.souza@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/b56d250007a5d85d15038962548abb3e1818480a.1547629303.git.jani.nikula@intel.com
This commit is contained in:
Jani Nikula
2019-01-16 11:15:25 +02:00
parent a9c287c94e
commit cbe974fb96
1 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
drivers/gpu/drm/i915/intel_cdclk.c
View File

@@ -218,7 +218,7 @@ static unsigned int intel_hpll_vco(struct drm_i915_private *dev_priv)
}; };
const unsigned int *vco_table; const unsigned int *vco_table;
unsigned int vco; unsigned int vco;
uint8_t tmp = 0; u8 tmp = 0;
/* FIXME other chipsets? */ /* FIXME other chipsets? */
if (IS_GM45(dev_priv)) if (IS_GM45(dev_priv))
@@ -249,13 +249,13 @@ static void g33_get_cdclk(struct drm_i915_private *dev_priv,
struct intel_cdclk_state *cdclk_state) struct intel_cdclk_state *cdclk_state)
{ {
struct pci_dev *pdev = dev_priv->drm.pdev; struct pci_dev *pdev = dev_priv->drm.pdev;
static const uint8_t div_3200[] = { 12, 10, 8, 7, 5, 16 }; static const u8 div_3200[] = { 12, 10, 8, 7, 5, 16 };
static const uint8_t div_4000[] = { 14, 12, 10, 8, 6, 20 }; static const u8 div_4000[] = { 14, 12, 10, 8, 6, 20 };
static const uint8_t div_4800[] = { 20, 14, 12, 10, 8, 24 }; static const u8 div_4800[] = { 20, 14, 12, 10, 8, 24 };
static const uint8_t div_5333[] = { 20, 16, 12, 12, 8, 28 }; static const u8 div_5333[] = { 20, 16, 12, 12, 8, 28 };
const uint8_t *div_table; const u8 *div_table;
unsigned int cdclk_sel; unsigned int cdclk_sel;
uint16_t tmp = 0; u16 tmp = 0;
cdclk_state->vco = intel_hpll_vco(dev_priv); cdclk_state->vco = intel_hpll_vco(dev_priv);
@@ -330,12 +330,12 @@ static void i965gm_get_cdclk(struct drm_i915_private *dev_priv,
struct intel_cdclk_state *cdclk_state) struct intel_cdclk_state *cdclk_state)
{ {
struct pci_dev *pdev = dev_priv->drm.pdev; struct pci_dev *pdev = dev_priv->drm.pdev;
static const uint8_t div_3200[] = { 16, 10, 8 }; static const u8 div_3200[] = { 16, 10, 8 };
static const uint8_t div_4000[] = { 20, 12, 10 }; static const u8 div_4000[] = { 20, 12, 10 };
static const uint8_t div_5333[] = { 24, 16, 14 }; static const u8 div_5333[] = { 24, 16, 14 };
const uint8_t *div_table; const u8 *div_table;
unsigned int cdclk_sel; unsigned int cdclk_sel;
uint16_t tmp = 0; u16 tmp = 0;
cdclk_state->vco = intel_hpll_vco(dev_priv); cdclk_state->vco = intel_hpll_vco(dev_priv);
@@ -375,7 +375,7 @@ static void gm45_get_cdclk(struct drm_i915_private *dev_priv,
{ {
struct pci_dev *pdev = dev_priv->drm.pdev; struct pci_dev *pdev = dev_priv->drm.pdev;
unsigned int cdclk_sel; unsigned int cdclk_sel;
uint16_t tmp = 0; u16 tmp = 0;
cdclk_state->vco = intel_hpll_vco(dev_priv); cdclk_state->vco = intel_hpll_vco(dev_priv);
@@ -403,8 +403,8 @@ static void gm45_get_cdclk(struct drm_i915_private *dev_priv,
static void hsw_get_cdclk(struct drm_i915_private *dev_priv, static void hsw_get_cdclk(struct drm_i915_private *dev_priv,
struct intel_cdclk_state *cdclk_state) struct intel_cdclk_state *cdclk_state)
{ {
uint32_t lcpll = I915_READ(LCPLL_CTL); u32 lcpll = I915_READ(LCPLL_CTL);
uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK; u32 freq = lcpll & LCPLL_CLK_FREQ_MASK;
if (lcpll & LCPLL_CD_SOURCE_FCLK) if (lcpll & LCPLL_CD_SOURCE_FCLK)
cdclk_state->cdclk = 800000; cdclk_state->cdclk = 800000;
@@ -672,8 +672,8 @@ static u8 bdw_calc_voltage_level(int cdclk)
static void bdw_get_cdclk(struct drm_i915_private *dev_priv, static void bdw_get_cdclk(struct drm_i915_private *dev_priv,
struct intel_cdclk_state *cdclk_state) struct intel_cdclk_state *cdclk_state)
{ {
uint32_t lcpll = I915_READ(LCPLL_CTL); u32 lcpll = I915_READ(LCPLL_CTL);
uint32_t freq = lcpll & LCPLL_CLK_FREQ_MASK; u32 freq = lcpll & LCPLL_CLK_FREQ_MASK;
if (lcpll & LCPLL_CD_SOURCE_FCLK) if (lcpll & LCPLL_CD_SOURCE_FCLK)
cdclk_state->cdclk = 800000; cdclk_state->cdclk = 800000;
@@ -700,7 +700,7 @@ static void bdw_set_cdclk(struct drm_i915_private *dev_priv,
const struct intel_cdclk_state *cdclk_state) const struct intel_cdclk_state *cdclk_state)
{ {
int cdclk = cdclk_state->cdclk; int cdclk = cdclk_state->cdclk;
uint32_t val; u32 val;
int ret; int ret;
if (WARN((I915_READ(LCPLL_CTL) & if (WARN((I915_READ(LCPLL_CTL) &
@@ -1083,7 +1083,7 @@ static void skl_set_cdclk(struct drm_i915_private *dev_priv,
static void skl_sanitize_cdclk(struct drm_i915_private *dev_priv) static void skl_sanitize_cdclk(struct drm_i915_private *dev_priv)
{ {
uint32_t cdctl, expected; u32 cdctl, expected;
/* /*
* check if the pre-os initialized the display * check if the pre-os initialized the display
@@ -2690,7 +2690,7 @@ static int vlv_hrawclk(struct drm_i915_private *dev_priv)
static int g4x_hrawclk(struct drm_i915_private *dev_priv) static int g4x_hrawclk(struct drm_i915_private *dev_priv)
{ {
uint32_t clkcfg; u32 clkcfg;
/* hrawclock is 1/4 the FSB frequency */ /* hrawclock is 1/4 the FSB frequency */
clkcfg = I915_READ(CLKCFG); clkcfg = I915_READ(CLKCFG);