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

Commit 74c85e13 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux into drm-fixes 

Just a few small fixes for radeon (audio regression fix,
stability fix, and an endian bug noticed by coverity).

* 'drm-fixes-3.12' of git://people.freedesktop.org/~agd5f/linux:
  drm/radeon/dpm: fix incompatible casting on big endian
  drm/radeon: disable bapm on KB
  drm/radeon: use sw CTS/N values for audio on DCE4+
parents 12aee278 cdf6e805

drivers/gpu/drm/radeon/evergreen_hdmi.c

+1 −0
Original line number Diff line number Diff line
@@ -291,6 +291,7 @@ void evergreen_hdmi_setmode(struct drm_encoder *encoder, struct drm_display_mode 
	/* fglrx clears sth in AFMT_AUDIO_PACKET_CONTROL2 here */



	WREG32(HDMI_ACR_PACKET_CONTROL + offset,

	       HDMI_ACR_SOURCE | /* select SW CTS value */

	       HDMI_ACR_AUTO_SEND); /* allow hw to sent ACR packets when required */



	evergreen_hdmi_update_ACR(encoder, mode->clock);

drivers/gpu/drm/radeon/kv_dpm.c

+1 −1
Original line number Diff line number Diff line
@@ -2635,7 +2635,7 @@ int kv_dpm_init(struct radeon_device *rdev) 
	pi->caps_sclk_ds = true;

	pi->enable_auto_thermal_throttling = true;

	pi->disable_nb_ps3_in_battery = false;

	pi->bapm_enable = true;

	pi->bapm_enable = false;

	pi->voltage_drop_t = 0;

	pi->caps_sclk_throttle_low_notification = false;

	pi->caps_fps = false; /* true? */

drivers/gpu/drm/radeon/radeon.h

+2 −2
Original line number Diff line number Diff line
@@ -1272,8 +1272,8 @@ struct radeon_blacklist_clocks 
struct radeon_clock_and_voltage_limits {

	u32 sclk;

	u32 mclk;

	u32 vddc;

	u32 vddci;

	u16 vddc;

	u16 vddci;

};



struct radeon_clock_array {