Merge tag 'drm-fixes-for-v4.7-rc8' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie: "These are just some i915 and amdgpu fixes that shows up, the amdgpu ones are polaris fixes, and the i915 one is a major regression fix" * tag 'drm-fixes-for-v4.7-rc8' of git://people.freedesktop.org/~airlied/linux: drm/amdgpu: fix power distribution issue for Polaris10 XT drm/amdgpu: Add a missing register to Polaris golden setting drm/i915: Ignore panel type from OpRegion on SKL drm/i915: Update ifdeffery for mutex->owner
This commit is contained in:
commit
24ee9a8326
|
@ -156,3 +156,18 @@ u32 amdgpu_atombios_i2c_func(struct i2c_adapter *adap)
|
|||
return I2C_FUNC_I2C | I2C_FUNC_SMBUS_EMUL;
|
||||
}
|
||||
|
||||
void amdgpu_atombios_i2c_channel_trans(struct amdgpu_device* adev, u8 slave_addr, u8 line_number, u8 offset, u8 data)
|
||||
{
|
||||
PROCESS_I2C_CHANNEL_TRANSACTION_PS_ALLOCATION args;
|
||||
int index = GetIndexIntoMasterTable(COMMAND, ProcessI2cChannelTransaction);
|
||||
|
||||
args.ucRegIndex = offset;
|
||||
args.lpI2CDataOut = data;
|
||||
args.ucFlag = 1;
|
||||
args.ucI2CSpeed = TARGET_HW_I2C_CLOCK;
|
||||
args.ucTransBytes = 1;
|
||||
args.ucSlaveAddr = slave_addr;
|
||||
args.ucLineNumber = line_number;
|
||||
|
||||
amdgpu_atom_execute_table(adev->mode_info.atom_context, index, (uint32_t *)&args);
|
||||
}
|
||||
|
|
|
@ -27,5 +27,7 @@
|
|||
int amdgpu_atombios_i2c_xfer(struct i2c_adapter *i2c_adap,
|
||||
struct i2c_msg *msgs, int num);
|
||||
u32 amdgpu_atombios_i2c_func(struct i2c_adapter *adap);
|
||||
void amdgpu_atombios_i2c_channel_trans(struct amdgpu_device* adev,
|
||||
u8 slave_addr, u8 line_number, u8 offset, u8 data);
|
||||
|
||||
#endif
|
||||
|
|
|
@ -28,6 +28,7 @@
|
|||
#include "vid.h"
|
||||
#include "amdgpu_ucode.h"
|
||||
#include "amdgpu_atombios.h"
|
||||
#include "atombios_i2c.h"
|
||||
#include "clearstate_vi.h"
|
||||
|
||||
#include "gmc/gmc_8_2_d.h"
|
||||
|
@ -284,6 +285,7 @@ static const u32 golden_settings_polaris11_a11[] =
|
|||
mmTCP_ADDR_CONFIG, 0x000003ff, 0x000000f3,
|
||||
mmTCP_CHAN_STEER_HI, 0xffffffff, 0x00000000,
|
||||
mmTCP_CHAN_STEER_LO, 0xffffffff, 0x00003210,
|
||||
mmVGT_RESET_DEBUG, 0x00000004, 0x00000004,
|
||||
};
|
||||
|
||||
static const u32 polaris11_golden_common_all[] =
|
||||
|
@ -314,6 +316,7 @@ static const u32 golden_settings_polaris10_a11[] =
|
|||
mmTCC_CTRL, 0x00100000, 0xf31fff7f,
|
||||
mmTCP_ADDR_CONFIG, 0x000003ff, 0x000000f7,
|
||||
mmTCP_CHAN_STEER_HI, 0xffffffff, 0x00000000,
|
||||
mmVGT_RESET_DEBUG, 0x00000004, 0x00000004,
|
||||
};
|
||||
|
||||
static const u32 polaris10_golden_common_all[] =
|
||||
|
@ -696,6 +699,10 @@ static void gfx_v8_0_init_golden_registers(struct amdgpu_device *adev)
|
|||
polaris10_golden_common_all,
|
||||
(const u32)ARRAY_SIZE(polaris10_golden_common_all));
|
||||
WREG32_SMC(ixCG_ACLK_CNTL, 0x0000001C);
|
||||
if (adev->pdev->revision == 0xc7) {
|
||||
amdgpu_atombios_i2c_channel_trans(adev, 0x10, 0x96, 0x1E, 0xDD);
|
||||
amdgpu_atombios_i2c_channel_trans(adev, 0x10, 0x96, 0x1F, 0xD0);
|
||||
}
|
||||
break;
|
||||
case CHIP_CARRIZO:
|
||||
amdgpu_program_register_sequence(adev,
|
||||
|
|
|
@ -40,7 +40,7 @@ static bool mutex_is_locked_by(struct mutex *mutex, struct task_struct *task)
|
|||
if (!mutex_is_locked(mutex))
|
||||
return false;
|
||||
|
||||
#if defined(CONFIG_SMP) || defined(CONFIG_DEBUG_MUTEXES)
|
||||
#if defined(CONFIG_DEBUG_MUTEXES) || defined(CONFIG_MUTEX_SPIN_ON_OWNER)
|
||||
return mutex->owner == task;
|
||||
#else
|
||||
/* Since UP may be pre-empted, we cannot assume that we own the lock */
|
||||
|
|
|
@ -1038,5 +1038,16 @@ intel_opregion_get_panel_type(struct drm_device *dev)
|
|||
return -ENODEV;
|
||||
}
|
||||
|
||||
/*
|
||||
* FIXME On Dell XPS 13 9350 the OpRegion panel type (0) gives us
|
||||
* low vswing for eDP, whereas the VBT panel type (2) gives us normal
|
||||
* vswing instead. Low vswing results in some display flickers, so
|
||||
* let's simply ignore the OpRegion panel type on SKL for now.
|
||||
*/
|
||||
if (IS_SKYLAKE(dev)) {
|
||||
DRM_DEBUG_KMS("Ignoring OpRegion panel type (%d)\n", ret - 1);
|
||||
return -ENODEV;
|
||||
}
|
||||
|
||||
return ret - 1;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue