Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f4a2596c authored by Alex Deucher's avatar Alex Deucher
Browse files

drm/radeon: fix endian bugs in radeon_atom_get_clock_dividers() (v3) 



v2: fix copy paste typo.
v3: clarify new union member

Reported-by: default avatarDan Carpenter <dan.carpenter@oracle.com>
Reviewed-by: default avatarMichel Dänzer <michel.daenzer@amd.com>
Signed-off-by: default avatarAlex Deucher <alexander.deucher@amd.com>
parent 1586505a

drivers/gpu/drm/radeon/atombios.h

+2 −0
Original line number Diff line number Diff line
@@ -458,6 +458,7 @@ typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V3 
  union

  {

    ATOM_COMPUTE_CLOCK_FREQ  ulClock;         //Input Parameter

    ULONG ulClockParams;                      //ULONG access for BE

    ATOM_S_MPLL_FB_DIVIDER   ulFbDiv;         //Output Parameter

  };

  UCHAR   ucRefDiv;                           //Output Parameter
@@ -490,6 +491,7 @@ typedef struct _COMPUTE_MEMORY_ENGINE_PLL_PARAMETERS_V5 
  union

  {

    ATOM_COMPUTE_CLOCK_FREQ  ulClock;         //Input Parameter

    ULONG ulClockParams;                      //ULONG access for BE

    ATOM_S_MPLL_FB_DIVIDER   ulFbDiv;         //Output Parameter

  };

  UCHAR   ucRefDiv;                           //Output Parameter

drivers/gpu/drm/radeon/radeon_atombios.c

+2 −4
Original line number Diff line number Diff line
@@ -2710,8 +2710,7 @@ int radeon_atom_get_clock_dividers(struct radeon_device *rdev, 
				dividers->enable_post_div = (dividers->fb_div & 1) ? true : false;

		} else {

			if (clock_type == COMPUTE_ENGINE_PLL_PARAM) {

				args.v3.ulClock.ulComputeClockFlag = clock_type;

				args.v3.ulClock.ulClockFreq = cpu_to_le32(clock);	/* 10 khz */

				args.v3.ulClockParams = cpu_to_le32((clock_type << 24) | clock);



				atom_execute_table(rdev->mode_info.atom_context, index, (uint32_t *)&args);
@@ -2726,8 +2725,7 @@ int radeon_atom_get_clock_dividers(struct radeon_device *rdev, 
				dividers->vco_mode = (args.v3.ucCntlFlag &

						      ATOM_PLL_CNTL_FLAG_MPLL_VCO_MODE) ? 1 : 0;

			} else {

				args.v5.ulClock.ulComputeClockFlag = clock_type;

				args.v5.ulClock.ulClockFreq = cpu_to_le32(clock);	/* 10 khz */

				args.v5.ulClockParams = cpu_to_le32((clock_type << 24) | clock);

				if (strobe_mode)

					args.v5.ucInputFlag = ATOM_PLL_INPUT_FLAG_PLL_STROBE_MODE_EN;