2012-05-09 18:37:20 +00:00
|
|
|
/*
|
|
|
|
* Copyright © 2012 Intel Corporation
|
|
|
|
*
|
|
|
|
* Permission is hereby granted, free of charge, to any person obtaining a
|
|
|
|
* copy of this software and associated documentation files (the "Software"),
|
|
|
|
* to deal in the Software without restriction, including without limitation
|
|
|
|
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
|
|
|
* and/or sell copies of the Software, and to permit persons to whom the
|
|
|
|
* Software is furnished to do so, subject to the following conditions:
|
|
|
|
*
|
|
|
|
* The above copyright notice and this permission notice (including the next
|
|
|
|
* paragraph) shall be included in all copies or substantial portions of the
|
|
|
|
* Software.
|
|
|
|
*
|
|
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
|
|
|
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
|
|
|
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
|
|
|
|
* THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
|
|
|
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
|
|
|
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
|
|
|
|
* IN THE SOFTWARE.
|
|
|
|
*
|
|
|
|
* Authors:
|
|
|
|
* Eugeni Dodonov <eugeni.dodonov@intel.com>
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2018-01-17 19:21:46 +00:00
|
|
|
#include <drm/drm_scdc_helper.h>
|
2019-04-05 11:00:03 +00:00
|
|
|
|
2012-05-09 18:37:20 +00:00
|
|
|
#include "i915_drv.h"
|
2019-04-05 11:00:03 +00:00
|
|
|
#include "intel_audio.h"
|
2019-04-25 18:52:53 +00:00
|
|
|
#include "intel_combo_phy.h"
|
2019-04-05 11:00:06 +00:00
|
|
|
#include "intel_connector.h"
|
2019-04-05 11:00:05 +00:00
|
|
|
#include "intel_ddi.h"
|
2019-08-06 11:39:33 +00:00
|
|
|
#include "intel_display_types.h"
|
2019-04-05 11:00:17 +00:00
|
|
|
#include "intel_dp.h"
|
2019-12-23 01:06:51 +00:00
|
|
|
#include "intel_dp_mst.h"
|
2019-04-29 12:29:25 +00:00
|
|
|
#include "intel_dp_link_training.h"
|
2019-05-02 15:02:40 +00:00
|
|
|
#include "intel_dpio_phy.h"
|
2018-11-29 14:12:17 +00:00
|
|
|
#include "intel_dsi.h"
|
2019-04-29 12:29:24 +00:00
|
|
|
#include "intel_fifo_underrun.h"
|
2019-05-02 15:02:47 +00:00
|
|
|
#include "intel_gmbus.h"
|
2019-04-05 11:00:13 +00:00
|
|
|
#include "intel_hdcp.h"
|
2019-04-05 11:00:18 +00:00
|
|
|
#include "intel_hdmi.h"
|
2019-04-29 12:50:11 +00:00
|
|
|
#include "intel_hotplug.h"
|
2019-04-05 11:00:11 +00:00
|
|
|
#include "intel_lspcon.h"
|
2019-04-05 11:00:14 +00:00
|
|
|
#include "intel_panel.h"
|
2019-04-05 11:00:09 +00:00
|
|
|
#include "intel_psr.h"
|
2019-10-03 08:17:36 +00:00
|
|
|
#include "intel_sprite.h"
|
2019-06-28 14:36:15 +00:00
|
|
|
#include "intel_tc.h"
|
2019-04-29 12:29:32 +00:00
|
|
|
#include "intel_vdsc.h"
|
2012-05-09 18:37:20 +00:00
|
|
|
|
2014-08-27 13:27:30 +00:00
|
|
|
struct ddi_buf_trans {
|
|
|
|
u32 trans1; /* balance leg enable, de-emph level */
|
|
|
|
u32 trans2; /* vref sel, vswing */
|
2015-06-25 08:11:03 +00:00
|
|
|
u8 i_boost; /* SKL: I_boost; valid: 0x0, 0x1, 0x3, 0x7 */
|
2014-08-27 13:27:30 +00:00
|
|
|
};
|
|
|
|
|
2017-02-23 17:35:06 +00:00
|
|
|
static const u8 index_to_dp_signal_levels[] = {
|
|
|
|
[0] = DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_0,
|
|
|
|
[1] = DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_1,
|
|
|
|
[2] = DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_2,
|
|
|
|
[3] = DP_TRAIN_VOLTAGE_SWING_LEVEL_0 | DP_TRAIN_PRE_EMPH_LEVEL_3,
|
|
|
|
[4] = DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_0,
|
|
|
|
[5] = DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_1,
|
|
|
|
[6] = DP_TRAIN_VOLTAGE_SWING_LEVEL_1 | DP_TRAIN_PRE_EMPH_LEVEL_2,
|
|
|
|
[7] = DP_TRAIN_VOLTAGE_SWING_LEVEL_2 | DP_TRAIN_PRE_EMPH_LEVEL_0,
|
|
|
|
[8] = DP_TRAIN_VOLTAGE_SWING_LEVEL_2 | DP_TRAIN_PRE_EMPH_LEVEL_1,
|
|
|
|
[9] = DP_TRAIN_VOLTAGE_SWING_LEVEL_3 | DP_TRAIN_PRE_EMPH_LEVEL_0,
|
|
|
|
};
|
|
|
|
|
2012-05-09 18:37:20 +00:00
|
|
|
/* HDMI/DVI modes ignore everything but the last 2 items. So we share
|
|
|
|
* them for both DP and FDI transports, allowing those ports to
|
|
|
|
* automatically adapt to HDMI connections as well
|
|
|
|
*/
|
2014-08-27 13:27:30 +00:00
|
|
|
static const struct ddi_buf_trans hsw_ddi_translations_dp[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00FFFFFF, 0x0006000E, 0x0 },
|
|
|
|
{ 0x00D75FFF, 0x0005000A, 0x0 },
|
|
|
|
{ 0x00C30FFF, 0x00040006, 0x0 },
|
|
|
|
{ 0x80AAAFFF, 0x000B0000, 0x0 },
|
|
|
|
{ 0x00FFFFFF, 0x0005000A, 0x0 },
|
|
|
|
{ 0x00D75FFF, 0x000C0004, 0x0 },
|
|
|
|
{ 0x80C30FFF, 0x000B0000, 0x0 },
|
|
|
|
{ 0x00FFFFFF, 0x00040006, 0x0 },
|
|
|
|
{ 0x80D75FFF, 0x000B0000, 0x0 },
|
2012-05-09 18:37:20 +00:00
|
|
|
};
|
|
|
|
|
2014-08-27 13:27:30 +00:00
|
|
|
static const struct ddi_buf_trans hsw_ddi_translations_fdi[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00FFFFFF, 0x0007000E, 0x0 },
|
|
|
|
{ 0x00D75FFF, 0x000F000A, 0x0 },
|
|
|
|
{ 0x00C30FFF, 0x00060006, 0x0 },
|
|
|
|
{ 0x00AAAFFF, 0x001E0000, 0x0 },
|
|
|
|
{ 0x00FFFFFF, 0x000F000A, 0x0 },
|
|
|
|
{ 0x00D75FFF, 0x00160004, 0x0 },
|
|
|
|
{ 0x00C30FFF, 0x001E0000, 0x0 },
|
|
|
|
{ 0x00FFFFFF, 0x00060006, 0x0 },
|
|
|
|
{ 0x00D75FFF, 0x001E0000, 0x0 },
|
2013-09-12 20:06:24 +00:00
|
|
|
};
|
|
|
|
|
2014-08-27 13:27:30 +00:00
|
|
|
static const struct ddi_buf_trans hsw_ddi_translations_hdmi[] = {
|
|
|
|
/* Idx NT mV d T mV d db */
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00FFFFFF, 0x0006000E, 0x0 },/* 0: 400 400 0 */
|
|
|
|
{ 0x00E79FFF, 0x000E000C, 0x0 },/* 1: 400 500 2 */
|
|
|
|
{ 0x00D75FFF, 0x0005000A, 0x0 },/* 2: 400 600 3.5 */
|
|
|
|
{ 0x00FFFFFF, 0x0005000A, 0x0 },/* 3: 600 600 0 */
|
|
|
|
{ 0x00E79FFF, 0x001D0007, 0x0 },/* 4: 600 750 2 */
|
|
|
|
{ 0x00D75FFF, 0x000C0004, 0x0 },/* 5: 600 900 3.5 */
|
|
|
|
{ 0x00FFFFFF, 0x00040006, 0x0 },/* 6: 800 800 0 */
|
|
|
|
{ 0x80E79FFF, 0x00030002, 0x0 },/* 7: 800 1000 2 */
|
|
|
|
{ 0x00FFFFFF, 0x00140005, 0x0 },/* 8: 850 850 0 */
|
|
|
|
{ 0x00FFFFFF, 0x000C0004, 0x0 },/* 9: 900 900 0 */
|
|
|
|
{ 0x00FFFFFF, 0x001C0003, 0x0 },/* 10: 950 950 0 */
|
|
|
|
{ 0x80FFFFFF, 0x00030002, 0x0 },/* 11: 1000 1000 0 */
|
2012-05-09 18:37:20 +00:00
|
|
|
};
|
|
|
|
|
2014-08-27 13:27:30 +00:00
|
|
|
static const struct ddi_buf_trans bdw_ddi_translations_edp[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00FFFFFF, 0x00000012, 0x0 },
|
|
|
|
{ 0x00EBAFFF, 0x00020011, 0x0 },
|
|
|
|
{ 0x00C71FFF, 0x0006000F, 0x0 },
|
|
|
|
{ 0x00AAAFFF, 0x000E000A, 0x0 },
|
|
|
|
{ 0x00FFFFFF, 0x00020011, 0x0 },
|
|
|
|
{ 0x00DB6FFF, 0x0005000F, 0x0 },
|
|
|
|
{ 0x00BEEFFF, 0x000A000C, 0x0 },
|
|
|
|
{ 0x00FFFFFF, 0x0005000F, 0x0 },
|
|
|
|
{ 0x00DB6FFF, 0x000A000C, 0x0 },
|
2013-11-03 04:07:42 +00:00
|
|
|
};
|
|
|
|
|
2014-08-27 13:27:30 +00:00
|
|
|
static const struct ddi_buf_trans bdw_ddi_translations_dp[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00FFFFFF, 0x0007000E, 0x0 },
|
|
|
|
{ 0x00D75FFF, 0x000E000A, 0x0 },
|
|
|
|
{ 0x00BEFFFF, 0x00140006, 0x0 },
|
|
|
|
{ 0x80B2CFFF, 0x001B0002, 0x0 },
|
|
|
|
{ 0x00FFFFFF, 0x000E000A, 0x0 },
|
|
|
|
{ 0x00DB6FFF, 0x00160005, 0x0 },
|
|
|
|
{ 0x80C71FFF, 0x001A0002, 0x0 },
|
|
|
|
{ 0x00F7DFFF, 0x00180004, 0x0 },
|
|
|
|
{ 0x80D75FFF, 0x001B0002, 0x0 },
|
2013-11-03 04:07:41 +00:00
|
|
|
};
|
|
|
|
|
2014-08-27 13:27:30 +00:00
|
|
|
static const struct ddi_buf_trans bdw_ddi_translations_fdi[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00FFFFFF, 0x0001000E, 0x0 },
|
|
|
|
{ 0x00D75FFF, 0x0004000A, 0x0 },
|
|
|
|
{ 0x00C30FFF, 0x00070006, 0x0 },
|
|
|
|
{ 0x00AAAFFF, 0x000C0000, 0x0 },
|
|
|
|
{ 0x00FFFFFF, 0x0004000A, 0x0 },
|
|
|
|
{ 0x00D75FFF, 0x00090004, 0x0 },
|
|
|
|
{ 0x00C30FFF, 0x000C0000, 0x0 },
|
|
|
|
{ 0x00FFFFFF, 0x00070006, 0x0 },
|
|
|
|
{ 0x00D75FFF, 0x000C0000, 0x0 },
|
2013-11-03 04:07:41 +00:00
|
|
|
};
|
|
|
|
|
2014-08-27 13:27:30 +00:00
|
|
|
static const struct ddi_buf_trans bdw_ddi_translations_hdmi[] = {
|
|
|
|
/* Idx NT mV d T mV df db */
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00FFFFFF, 0x0007000E, 0x0 },/* 0: 400 400 0 */
|
|
|
|
{ 0x00D75FFF, 0x000E000A, 0x0 },/* 1: 400 600 3.5 */
|
|
|
|
{ 0x00BEFFFF, 0x00140006, 0x0 },/* 2: 400 800 6 */
|
|
|
|
{ 0x00FFFFFF, 0x0009000D, 0x0 },/* 3: 450 450 0 */
|
|
|
|
{ 0x00FFFFFF, 0x000E000A, 0x0 },/* 4: 600 600 0 */
|
|
|
|
{ 0x00D7FFFF, 0x00140006, 0x0 },/* 5: 600 800 2.5 */
|
|
|
|
{ 0x80CB2FFF, 0x001B0002, 0x0 },/* 6: 600 1000 4.5 */
|
|
|
|
{ 0x00FFFFFF, 0x00140006, 0x0 },/* 7: 800 800 0 */
|
|
|
|
{ 0x80E79FFF, 0x001B0002, 0x0 },/* 8: 800 1000 2 */
|
|
|
|
{ 0x80FFFFFF, 0x001B0002, 0x0 },/* 9: 1000 1000 0 */
|
2014-08-01 10:07:55 +00:00
|
|
|
};
|
|
|
|
|
2015-08-24 23:48:44 +00:00
|
|
|
/* Skylake H and S */
|
2013-12-03 13:56:25 +00:00
|
|
|
static const struct ddi_buf_trans skl_ddi_translations_dp[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00002016, 0x000000A0, 0x0 },
|
|
|
|
{ 0x00005012, 0x0000009B, 0x0 },
|
|
|
|
{ 0x00007011, 0x00000088, 0x0 },
|
2016-01-05 19:18:55 +00:00
|
|
|
{ 0x80009010, 0x000000C0, 0x1 },
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00002016, 0x0000009B, 0x0 },
|
|
|
|
{ 0x00005012, 0x00000088, 0x0 },
|
2016-01-05 19:18:55 +00:00
|
|
|
{ 0x80007011, 0x000000C0, 0x1 },
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00002016, 0x000000DF, 0x0 },
|
2016-01-05 19:18:55 +00:00
|
|
|
{ 0x80005012, 0x000000C0, 0x1 },
|
2013-12-03 13:56:25 +00:00
|
|
|
};
|
|
|
|
|
2015-06-25 08:11:03 +00:00
|
|
|
/* Skylake U */
|
|
|
|
static const struct ddi_buf_trans skl_u_ddi_translations_dp[] = {
|
2015-08-24 23:48:44 +00:00
|
|
|
{ 0x0000201B, 0x000000A2, 0x0 },
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00005012, 0x00000088, 0x0 },
|
2016-08-02 12:21:57 +00:00
|
|
|
{ 0x80007011, 0x000000CD, 0x1 },
|
2016-01-05 19:18:55 +00:00
|
|
|
{ 0x80009010, 0x000000C0, 0x1 },
|
2015-08-24 23:48:44 +00:00
|
|
|
{ 0x0000201B, 0x0000009D, 0x0 },
|
2016-01-05 19:18:55 +00:00
|
|
|
{ 0x80005012, 0x000000C0, 0x1 },
|
|
|
|
{ 0x80007011, 0x000000C0, 0x1 },
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00002016, 0x00000088, 0x0 },
|
2016-01-05 19:18:55 +00:00
|
|
|
{ 0x80005012, 0x000000C0, 0x1 },
|
2015-06-25 08:11:03 +00:00
|
|
|
};
|
|
|
|
|
2015-08-24 23:48:44 +00:00
|
|
|
/* Skylake Y */
|
|
|
|
static const struct ddi_buf_trans skl_y_ddi_translations_dp[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x000000A2, 0x0 },
|
|
|
|
{ 0x00005012, 0x00000088, 0x0 },
|
2016-08-02 12:21:57 +00:00
|
|
|
{ 0x80007011, 0x000000CD, 0x3 },
|
2016-01-05 19:18:55 +00:00
|
|
|
{ 0x80009010, 0x000000C0, 0x3 },
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x0000009D, 0x0 },
|
2016-01-05 19:18:55 +00:00
|
|
|
{ 0x80005012, 0x000000C0, 0x3 },
|
|
|
|
{ 0x80007011, 0x000000C0, 0x3 },
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x00000088, 0x0 },
|
2016-01-05 19:18:55 +00:00
|
|
|
{ 0x80005012, 0x000000C0, 0x3 },
|
2015-06-25 08:11:03 +00:00
|
|
|
};
|
|
|
|
|
2016-10-18 15:57:36 +00:00
|
|
|
/* Kabylake H and S */
|
|
|
|
static const struct ddi_buf_trans kbl_ddi_translations_dp[] = {
|
|
|
|
{ 0x00002016, 0x000000A0, 0x0 },
|
|
|
|
{ 0x00005012, 0x0000009B, 0x0 },
|
|
|
|
{ 0x00007011, 0x00000088, 0x0 },
|
|
|
|
{ 0x80009010, 0x000000C0, 0x1 },
|
|
|
|
{ 0x00002016, 0x0000009B, 0x0 },
|
|
|
|
{ 0x00005012, 0x00000088, 0x0 },
|
|
|
|
{ 0x80007011, 0x000000C0, 0x1 },
|
|
|
|
{ 0x00002016, 0x00000097, 0x0 },
|
|
|
|
{ 0x80005012, 0x000000C0, 0x1 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Kabylake U */
|
|
|
|
static const struct ddi_buf_trans kbl_u_ddi_translations_dp[] = {
|
|
|
|
{ 0x0000201B, 0x000000A1, 0x0 },
|
|
|
|
{ 0x00005012, 0x00000088, 0x0 },
|
|
|
|
{ 0x80007011, 0x000000CD, 0x3 },
|
|
|
|
{ 0x80009010, 0x000000C0, 0x3 },
|
|
|
|
{ 0x0000201B, 0x0000009D, 0x0 },
|
|
|
|
{ 0x80005012, 0x000000C0, 0x3 },
|
|
|
|
{ 0x80007011, 0x000000C0, 0x3 },
|
|
|
|
{ 0x00002016, 0x0000004F, 0x0 },
|
|
|
|
{ 0x80005012, 0x000000C0, 0x3 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Kabylake Y */
|
|
|
|
static const struct ddi_buf_trans kbl_y_ddi_translations_dp[] = {
|
|
|
|
{ 0x00001017, 0x000000A1, 0x0 },
|
|
|
|
{ 0x00005012, 0x00000088, 0x0 },
|
|
|
|
{ 0x80007011, 0x000000CD, 0x3 },
|
|
|
|
{ 0x8000800F, 0x000000C0, 0x3 },
|
|
|
|
{ 0x00001017, 0x0000009D, 0x0 },
|
|
|
|
{ 0x80005012, 0x000000C0, 0x3 },
|
|
|
|
{ 0x80007011, 0x000000C0, 0x3 },
|
|
|
|
{ 0x00001017, 0x0000004C, 0x0 },
|
|
|
|
{ 0x80005012, 0x000000C0, 0x3 },
|
|
|
|
};
|
|
|
|
|
2015-06-25 08:11:03 +00:00
|
|
|
/*
|
2016-10-18 15:57:36 +00:00
|
|
|
* Skylake/Kabylake H and S
|
2015-06-25 08:11:03 +00:00
|
|
|
* eDP 1.4 low vswing translation parameters
|
|
|
|
*/
|
2015-02-25 04:59:12 +00:00
|
|
|
static const struct ddi_buf_trans skl_ddi_translations_edp[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x000000A8, 0x0 },
|
|
|
|
{ 0x00004013, 0x000000A9, 0x0 },
|
|
|
|
{ 0x00007011, 0x000000A2, 0x0 },
|
|
|
|
{ 0x00009010, 0x0000009C, 0x0 },
|
|
|
|
{ 0x00000018, 0x000000A9, 0x0 },
|
|
|
|
{ 0x00006013, 0x000000A2, 0x0 },
|
|
|
|
{ 0x00007011, 0x000000A6, 0x0 },
|
|
|
|
{ 0x00000018, 0x000000AB, 0x0 },
|
|
|
|
{ 0x00007013, 0x0000009F, 0x0 },
|
|
|
|
{ 0x00000018, 0x000000DF, 0x0 },
|
|
|
|
};
|
|
|
|
|
|
|
|
/*
|
2016-10-18 15:57:36 +00:00
|
|
|
* Skylake/Kabylake U
|
2015-06-25 08:11:03 +00:00
|
|
|
* eDP 1.4 low vswing translation parameters
|
|
|
|
*/
|
|
|
|
static const struct ddi_buf_trans skl_u_ddi_translations_edp[] = {
|
|
|
|
{ 0x00000018, 0x000000A8, 0x0 },
|
|
|
|
{ 0x00004013, 0x000000A9, 0x0 },
|
|
|
|
{ 0x00007011, 0x000000A2, 0x0 },
|
|
|
|
{ 0x00009010, 0x0000009C, 0x0 },
|
|
|
|
{ 0x00000018, 0x000000A9, 0x0 },
|
|
|
|
{ 0x00006013, 0x000000A2, 0x0 },
|
|
|
|
{ 0x00007011, 0x000000A6, 0x0 },
|
|
|
|
{ 0x00002016, 0x000000AB, 0x0 },
|
|
|
|
{ 0x00005013, 0x0000009F, 0x0 },
|
|
|
|
{ 0x00000018, 0x000000DF, 0x0 },
|
2015-02-25 04:59:12 +00:00
|
|
|
};
|
|
|
|
|
2015-06-25 08:11:03 +00:00
|
|
|
/*
|
2016-10-18 15:57:36 +00:00
|
|
|
* Skylake/Kabylake Y
|
2015-06-25 08:11:03 +00:00
|
|
|
* eDP 1.4 low vswing translation parameters
|
|
|
|
*/
|
2015-08-24 23:48:44 +00:00
|
|
|
static const struct ddi_buf_trans skl_y_ddi_translations_edp[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x000000A8, 0x0 },
|
|
|
|
{ 0x00004013, 0x000000AB, 0x0 },
|
|
|
|
{ 0x00007011, 0x000000A4, 0x0 },
|
|
|
|
{ 0x00009010, 0x000000DF, 0x0 },
|
|
|
|
{ 0x00000018, 0x000000AA, 0x0 },
|
|
|
|
{ 0x00006013, 0x000000A4, 0x0 },
|
|
|
|
{ 0x00007011, 0x0000009D, 0x0 },
|
|
|
|
{ 0x00000018, 0x000000A0, 0x0 },
|
|
|
|
{ 0x00006012, 0x000000DF, 0x0 },
|
|
|
|
{ 0x00000018, 0x0000008A, 0x0 },
|
|
|
|
};
|
2015-02-25 04:59:12 +00:00
|
|
|
|
2016-10-18 15:57:36 +00:00
|
|
|
/* Skylake/Kabylake U, H and S */
|
2013-12-03 13:56:25 +00:00
|
|
|
static const struct ddi_buf_trans skl_ddi_translations_hdmi[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x000000AC, 0x0 },
|
|
|
|
{ 0x00005012, 0x0000009D, 0x0 },
|
|
|
|
{ 0x00007011, 0x00000088, 0x0 },
|
|
|
|
{ 0x00000018, 0x000000A1, 0x0 },
|
|
|
|
{ 0x00000018, 0x00000098, 0x0 },
|
|
|
|
{ 0x00004013, 0x00000088, 0x0 },
|
2016-01-05 19:11:27 +00:00
|
|
|
{ 0x80006012, 0x000000CD, 0x1 },
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x000000DF, 0x0 },
|
2016-01-05 19:11:27 +00:00
|
|
|
{ 0x80003015, 0x000000CD, 0x1 }, /* Default */
|
|
|
|
{ 0x80003015, 0x000000C0, 0x1 },
|
|
|
|
{ 0x80000018, 0x000000C0, 0x1 },
|
2015-06-25 08:11:03 +00:00
|
|
|
};
|
|
|
|
|
2016-10-18 15:57:36 +00:00
|
|
|
/* Skylake/Kabylake Y */
|
2015-08-24 23:48:44 +00:00
|
|
|
static const struct ddi_buf_trans skl_y_ddi_translations_hdmi[] = {
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x000000A1, 0x0 },
|
|
|
|
{ 0x00005012, 0x000000DF, 0x0 },
|
2016-01-05 19:11:27 +00:00
|
|
|
{ 0x80007011, 0x000000CB, 0x3 },
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x000000A4, 0x0 },
|
|
|
|
{ 0x00000018, 0x0000009D, 0x0 },
|
|
|
|
{ 0x00004013, 0x00000080, 0x0 },
|
2016-01-05 19:11:27 +00:00
|
|
|
{ 0x80006013, 0x000000C0, 0x3 },
|
2015-06-25 08:11:03 +00:00
|
|
|
{ 0x00000018, 0x0000008A, 0x0 },
|
2016-01-05 19:11:27 +00:00
|
|
|
{ 0x80003015, 0x000000C0, 0x3 }, /* Default */
|
|
|
|
{ 0x80003015, 0x000000C0, 0x3 },
|
|
|
|
{ 0x80000018, 0x000000C0, 0x3 },
|
2013-12-03 13:56:25 +00:00
|
|
|
};
|
|
|
|
|
2014-11-18 10:15:27 +00:00
|
|
|
struct bxt_ddi_buf_trans {
|
2017-09-18 18:25:37 +00:00
|
|
|
u8 margin; /* swing value */
|
|
|
|
u8 scale; /* scale value */
|
|
|
|
u8 enable; /* scale enable */
|
|
|
|
u8 deemphasis;
|
2014-11-18 10:15:27 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
static const struct bxt_ddi_buf_trans bxt_ddi_translations_dp[] = {
|
|
|
|
/* Idx NT mV diff db */
|
2017-10-16 14:57:02 +00:00
|
|
|
{ 52, 0x9A, 0, 128, }, /* 0: 400 0 */
|
|
|
|
{ 78, 0x9A, 0, 85, }, /* 1: 400 3.5 */
|
|
|
|
{ 104, 0x9A, 0, 64, }, /* 2: 400 6 */
|
|
|
|
{ 154, 0x9A, 0, 43, }, /* 3: 400 9.5 */
|
|
|
|
{ 77, 0x9A, 0, 128, }, /* 4: 600 0 */
|
|
|
|
{ 116, 0x9A, 0, 85, }, /* 5: 600 3.5 */
|
|
|
|
{ 154, 0x9A, 0, 64, }, /* 6: 600 6 */
|
|
|
|
{ 102, 0x9A, 0, 128, }, /* 7: 800 0 */
|
|
|
|
{ 154, 0x9A, 0, 85, }, /* 8: 800 3.5 */
|
|
|
|
{ 154, 0x9A, 1, 128, }, /* 9: 1200 0 */
|
2014-11-18 10:15:27 +00:00
|
|
|
};
|
|
|
|
|
2015-09-24 04:54:56 +00:00
|
|
|
static const struct bxt_ddi_buf_trans bxt_ddi_translations_edp[] = {
|
|
|
|
/* Idx NT mV diff db */
|
2017-10-16 14:57:02 +00:00
|
|
|
{ 26, 0, 0, 128, }, /* 0: 200 0 */
|
|
|
|
{ 38, 0, 0, 112, }, /* 1: 200 1.5 */
|
|
|
|
{ 48, 0, 0, 96, }, /* 2: 200 4 */
|
|
|
|
{ 54, 0, 0, 69, }, /* 3: 200 6 */
|
|
|
|
{ 32, 0, 0, 128, }, /* 4: 250 0 */
|
|
|
|
{ 48, 0, 0, 104, }, /* 5: 250 1.5 */
|
|
|
|
{ 54, 0, 0, 85, }, /* 6: 250 4 */
|
|
|
|
{ 43, 0, 0, 128, }, /* 7: 300 0 */
|
|
|
|
{ 54, 0, 0, 101, }, /* 8: 300 1.5 */
|
|
|
|
{ 48, 0, 0, 128, }, /* 9: 300 0 */
|
2015-09-24 04:54:56 +00:00
|
|
|
};
|
|
|
|
|
2014-11-18 10:15:27 +00:00
|
|
|
/* BSpec has 2 recommended values - entries 0 and 8.
|
|
|
|
* Using the entry with higher vswing.
|
|
|
|
*/
|
|
|
|
static const struct bxt_ddi_buf_trans bxt_ddi_translations_hdmi[] = {
|
|
|
|
/* Idx NT mV diff db */
|
2017-10-16 14:57:02 +00:00
|
|
|
{ 52, 0x9A, 0, 128, }, /* 0: 400 0 */
|
|
|
|
{ 52, 0x9A, 0, 85, }, /* 1: 400 3.5 */
|
|
|
|
{ 52, 0x9A, 0, 64, }, /* 2: 400 6 */
|
|
|
|
{ 42, 0x9A, 0, 43, }, /* 3: 400 9.5 */
|
|
|
|
{ 77, 0x9A, 0, 128, }, /* 4: 600 0 */
|
|
|
|
{ 77, 0x9A, 0, 85, }, /* 5: 600 3.5 */
|
|
|
|
{ 77, 0x9A, 0, 64, }, /* 6: 600 6 */
|
|
|
|
{ 102, 0x9A, 0, 128, }, /* 7: 800 0 */
|
|
|
|
{ 102, 0x9A, 0, 85, }, /* 8: 800 3.5 */
|
|
|
|
{ 154, 0x9A, 1, 128, }, /* 9: 1200 0 */
|
2014-11-18 10:15:27 +00:00
|
|
|
};
|
|
|
|
|
2017-06-09 22:26:07 +00:00
|
|
|
struct cnl_ddi_buf_trans {
|
2017-09-18 18:25:38 +00:00
|
|
|
u8 dw2_swing_sel;
|
|
|
|
u8 dw7_n_scalar;
|
|
|
|
u8 dw4_cursor_coeff;
|
|
|
|
u8 dw4_post_cursor_2;
|
|
|
|
u8 dw4_post_cursor_1;
|
2017-06-09 22:26:07 +00:00
|
|
|
};
|
|
|
|
|
|
|
|
/* Voltage Swing Programming for VccIO 0.85V for DP */
|
|
|
|
static const struct cnl_ddi_buf_trans cnl_ddi_translations_dp_0_85V[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x5D, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
|
|
|
|
{ 0xA, 0x6A, 0x38, 0x00, 0x07 }, /* 350 500 3.1 */
|
|
|
|
{ 0xB, 0x7A, 0x32, 0x00, 0x0D }, /* 350 700 6.0 */
|
|
|
|
{ 0x6, 0x7C, 0x2D, 0x00, 0x12 }, /* 350 900 8.2 */
|
|
|
|
{ 0xA, 0x69, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */
|
|
|
|
{ 0xB, 0x7A, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */
|
|
|
|
{ 0x6, 0x7C, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */
|
|
|
|
{ 0xB, 0x7D, 0x3C, 0x00, 0x03 }, /* 650 725 0.9 */
|
|
|
|
{ 0x6, 0x7C, 0x34, 0x00, 0x0B }, /* 600 900 3.5 */
|
|
|
|
{ 0x6, 0x7B, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Voltage Swing Programming for VccIO 0.85V for HDMI */
|
|
|
|
static const struct cnl_ddi_buf_trans cnl_ddi_translations_hdmi_0_85V[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x60, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */
|
|
|
|
{ 0xB, 0x73, 0x36, 0x00, 0x09 }, /* 450 650 3.2 */
|
|
|
|
{ 0x6, 0x7F, 0x31, 0x00, 0x0E }, /* 450 850 5.5 */
|
|
|
|
{ 0xB, 0x73, 0x3F, 0x00, 0x00 }, /* 650 650 0.0 */
|
|
|
|
{ 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 650 850 2.3 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 850 850 0.0 */
|
|
|
|
{ 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Voltage Swing Programming for VccIO 0.85V for eDP */
|
|
|
|
static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_85V[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x66, 0x3A, 0x00, 0x05 }, /* 384 500 2.3 */
|
|
|
|
{ 0x0, 0x7F, 0x38, 0x00, 0x07 }, /* 153 200 2.3 */
|
|
|
|
{ 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 192 250 2.3 */
|
|
|
|
{ 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 230 300 2.3 */
|
|
|
|
{ 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 269 350 2.3 */
|
|
|
|
{ 0xA, 0x66, 0x3C, 0x00, 0x03 }, /* 446 500 1.0 */
|
|
|
|
{ 0xB, 0x70, 0x3C, 0x00, 0x03 }, /* 460 600 2.3 */
|
|
|
|
{ 0xC, 0x75, 0x3C, 0x00, 0x03 }, /* 537 700 2.3 */
|
|
|
|
{ 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Voltage Swing Programming for VccIO 0.95V for DP */
|
|
|
|
static const struct cnl_ddi_buf_trans cnl_ddi_translations_dp_0_95V[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x5D, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
|
|
|
|
{ 0xA, 0x6A, 0x38, 0x00, 0x07 }, /* 350 500 3.1 */
|
|
|
|
{ 0xB, 0x7A, 0x32, 0x00, 0x0D }, /* 350 700 6.0 */
|
|
|
|
{ 0x6, 0x7C, 0x2D, 0x00, 0x12 }, /* 350 900 8.2 */
|
|
|
|
{ 0xA, 0x69, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */
|
|
|
|
{ 0xB, 0x7A, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */
|
|
|
|
{ 0x6, 0x7C, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */
|
|
|
|
{ 0xB, 0x7D, 0x3C, 0x00, 0x03 }, /* 650 725 0.9 */
|
|
|
|
{ 0x6, 0x7C, 0x34, 0x00, 0x0B }, /* 600 900 3.5 */
|
|
|
|
{ 0x6, 0x7B, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Voltage Swing Programming for VccIO 0.95V for HDMI */
|
|
|
|
static const struct cnl_ddi_buf_trans cnl_ddi_translations_hdmi_0_95V[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x5C, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */
|
|
|
|
{ 0xB, 0x69, 0x37, 0x00, 0x08 }, /* 400 600 3.5 */
|
|
|
|
{ 0x5, 0x76, 0x31, 0x00, 0x0E }, /* 400 800 6.0 */
|
|
|
|
{ 0xA, 0x5E, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */
|
|
|
|
{ 0xB, 0x69, 0x3F, 0x00, 0x00 }, /* 600 600 0.0 */
|
|
|
|
{ 0xB, 0x79, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */
|
|
|
|
{ 0x6, 0x7D, 0x32, 0x00, 0x0D }, /* 600 1000 4.4 */
|
|
|
|
{ 0x5, 0x76, 0x3F, 0x00, 0x00 }, /* 800 800 0.0 */
|
|
|
|
{ 0x6, 0x7D, 0x39, 0x00, 0x06 }, /* 800 1000 1.9 */
|
|
|
|
{ 0x6, 0x7F, 0x39, 0x00, 0x06 }, /* 850 1050 1.8 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1050 1050 0.0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Voltage Swing Programming for VccIO 0.95V for eDP */
|
|
|
|
static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_0_95V[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x61, 0x3A, 0x00, 0x05 }, /* 384 500 2.3 */
|
|
|
|
{ 0x0, 0x7F, 0x38, 0x00, 0x07 }, /* 153 200 2.3 */
|
|
|
|
{ 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 192 250 2.3 */
|
|
|
|
{ 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 230 300 2.3 */
|
|
|
|
{ 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 269 350 2.3 */
|
|
|
|
{ 0xA, 0x61, 0x3C, 0x00, 0x03 }, /* 446 500 1.0 */
|
|
|
|
{ 0xB, 0x68, 0x39, 0x00, 0x06 }, /* 460 600 2.3 */
|
|
|
|
{ 0xC, 0x6E, 0x39, 0x00, 0x06 }, /* 537 700 2.3 */
|
|
|
|
{ 0x4, 0x7F, 0x3A, 0x00, 0x05 }, /* 460 600 2.3 */
|
|
|
|
{ 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Voltage Swing Programming for VccIO 1.05V for DP */
|
|
|
|
static const struct cnl_ddi_buf_trans cnl_ddi_translations_dp_1_05V[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x58, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */
|
|
|
|
{ 0xB, 0x64, 0x37, 0x00, 0x08 }, /* 400 600 3.5 */
|
|
|
|
{ 0x5, 0x70, 0x31, 0x00, 0x0E }, /* 400 800 6.0 */
|
|
|
|
{ 0x6, 0x7F, 0x2C, 0x00, 0x13 }, /* 400 1050 8.4 */
|
|
|
|
{ 0xB, 0x64, 0x3F, 0x00, 0x00 }, /* 600 600 0.0 */
|
|
|
|
{ 0x5, 0x73, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */
|
|
|
|
{ 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 550 1050 5.6 */
|
|
|
|
{ 0x5, 0x76, 0x3E, 0x00, 0x01 }, /* 850 900 0.5 */
|
|
|
|
{ 0x6, 0x7F, 0x36, 0x00, 0x09 }, /* 750 1050 2.9 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1050 1050 0.0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Voltage Swing Programming for VccIO 1.05V for HDMI */
|
|
|
|
static const struct cnl_ddi_buf_trans cnl_ddi_translations_hdmi_1_05V[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x58, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */
|
|
|
|
{ 0xB, 0x64, 0x37, 0x00, 0x08 }, /* 400 600 3.5 */
|
|
|
|
{ 0x5, 0x70, 0x31, 0x00, 0x0E }, /* 400 800 6.0 */
|
|
|
|
{ 0xA, 0x5B, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */
|
|
|
|
{ 0xB, 0x64, 0x3F, 0x00, 0x00 }, /* 600 600 0.0 */
|
|
|
|
{ 0x5, 0x73, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */
|
|
|
|
{ 0x6, 0x7C, 0x32, 0x00, 0x0D }, /* 600 1000 4.4 */
|
|
|
|
{ 0x5, 0x70, 0x3F, 0x00, 0x00 }, /* 800 800 0.0 */
|
|
|
|
{ 0x6, 0x7C, 0x39, 0x00, 0x06 }, /* 800 1000 1.9 */
|
|
|
|
{ 0x6, 0x7F, 0x39, 0x00, 0x06 }, /* 850 1050 1.8 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 1050 1050 0.0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
/* Voltage Swing Programming for VccIO 1.05V for eDP */
|
|
|
|
static const struct cnl_ddi_buf_trans cnl_ddi_translations_edp_1_05V[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x5E, 0x3A, 0x00, 0x05 }, /* 384 500 2.3 */
|
|
|
|
{ 0x0, 0x7F, 0x38, 0x00, 0x07 }, /* 153 200 2.3 */
|
|
|
|
{ 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 192 250 2.3 */
|
|
|
|
{ 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 230 300 2.3 */
|
|
|
|
{ 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 269 350 2.3 */
|
|
|
|
{ 0xA, 0x5E, 0x3C, 0x00, 0x03 }, /* 446 500 1.0 */
|
|
|
|
{ 0xB, 0x64, 0x39, 0x00, 0x06 }, /* 460 600 2.3 */
|
|
|
|
{ 0xE, 0x6A, 0x39, 0x00, 0x06 }, /* 537 700 2.3 */
|
|
|
|
{ 0x2, 0x7F, 0x3F, 0x00, 0x00 }, /* 400 400 0.0 */
|
|
|
|
};
|
|
|
|
|
2018-12-17 22:13:47 +00:00
|
|
|
/* icl_combo_phy_ddi_translations */
|
|
|
|
static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_dp_hbr2[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
|
|
|
|
{ 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */
|
|
|
|
{ 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */
|
|
|
|
{ 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */
|
|
|
|
{ 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */
|
|
|
|
{ 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */
|
|
|
|
{ 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */
|
|
|
|
{ 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */
|
|
|
|
{ 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */
|
2018-03-23 17:24:14 +00:00
|
|
|
};
|
|
|
|
|
2018-12-17 22:13:47 +00:00
|
|
|
static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr2[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0x0, 0x7F, 0x3F, 0x00, 0x00 }, /* 200 200 0.0 */
|
|
|
|
{ 0x8, 0x7F, 0x38, 0x00, 0x07 }, /* 200 250 1.9 */
|
|
|
|
{ 0x1, 0x7F, 0x33, 0x00, 0x0C }, /* 200 300 3.5 */
|
|
|
|
{ 0x9, 0x7F, 0x31, 0x00, 0x0E }, /* 200 350 4.9 */
|
|
|
|
{ 0x8, 0x7F, 0x3F, 0x00, 0x00 }, /* 250 250 0.0 */
|
|
|
|
{ 0x1, 0x7F, 0x38, 0x00, 0x07 }, /* 250 300 1.6 */
|
|
|
|
{ 0x9, 0x7F, 0x35, 0x00, 0x0A }, /* 250 350 2.9 */
|
|
|
|
{ 0x1, 0x7F, 0x3F, 0x00, 0x00 }, /* 300 300 0.0 */
|
|
|
|
{ 0x9, 0x7F, 0x38, 0x00, 0x07 }, /* 300 350 1.3 */
|
|
|
|
{ 0x9, 0x7F, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
|
2018-03-23 17:24:14 +00:00
|
|
|
};
|
|
|
|
|
2018-12-17 22:13:47 +00:00
|
|
|
static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_edp_hbr3[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
|
|
|
|
{ 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */
|
|
|
|
{ 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */
|
|
|
|
{ 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */
|
|
|
|
{ 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */
|
|
|
|
{ 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */
|
|
|
|
{ 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */
|
|
|
|
{ 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */
|
|
|
|
{ 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */
|
2018-03-23 17:24:14 +00:00
|
|
|
};
|
|
|
|
|
2018-12-17 22:13:47 +00:00
|
|
|
static const struct cnl_ddi_buf_trans icl_combo_phy_ddi_translations_hdmi[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x60, 0x3F, 0x00, 0x00 }, /* 450 450 0.0 */
|
|
|
|
{ 0xB, 0x73, 0x36, 0x00, 0x09 }, /* 450 650 3.2 */
|
|
|
|
{ 0x6, 0x7F, 0x31, 0x00, 0x0E }, /* 450 850 5.5 */
|
|
|
|
{ 0xB, 0x73, 0x3F, 0x00, 0x00 }, /* 650 650 0.0 ALS */
|
|
|
|
{ 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 650 850 2.3 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 850 850 0.0 */
|
|
|
|
{ 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 850 3.0 */
|
2018-03-23 17:24:14 +00:00
|
|
|
};
|
|
|
|
|
2020-03-30 21:00:43 +00:00
|
|
|
static const struct cnl_ddi_buf_trans ehl_combo_phy_ddi_translations_dp[] = {
|
2020-02-05 20:56:47 +00:00
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x33, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
|
|
|
|
{ 0xA, 0x47, 0x36, 0x00, 0x09 }, /* 350 500 3.1 */
|
|
|
|
{ 0xC, 0x64, 0x30, 0x00, 0x0F }, /* 350 700 6.0 */
|
|
|
|
{ 0x6, 0x7F, 0x2C, 0x00, 0x13 }, /* 350 900 8.2 */
|
|
|
|
{ 0xA, 0x46, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */
|
|
|
|
{ 0xC, 0x64, 0x36, 0x00, 0x09 }, /* 500 700 2.9 */
|
|
|
|
{ 0x6, 0x7F, 0x30, 0x00, 0x0F }, /* 500 900 5.1 */
|
|
|
|
{ 0xC, 0x61, 0x3F, 0x00, 0x00 }, /* 650 700 0.6 */
|
|
|
|
{ 0x6, 0x7F, 0x37, 0x00, 0x08 }, /* 600 900 3.5 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */
|
|
|
|
};
|
|
|
|
|
2018-03-23 17:24:16 +00:00
|
|
|
struct icl_mg_phy_ddi_buf_trans {
|
|
|
|
u32 cri_txdeemph_override_11_6;
|
2020-03-30 21:00:44 +00:00
|
|
|
u32 cri_txdeemph_override_5_0;
|
2018-03-23 17:24:16 +00:00
|
|
|
u32 cri_txdeemph_override_17_12;
|
|
|
|
};
|
|
|
|
|
2020-03-30 21:00:44 +00:00
|
|
|
static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations_rbr_hbr[] = {
|
|
|
|
/* Voltage swing pre-emphasis */
|
|
|
|
{ 0x18, 0x00, 0x00 }, /* 0 0 */
|
|
|
|
{ 0x1D, 0x00, 0x05 }, /* 0 1 */
|
|
|
|
{ 0x24, 0x00, 0x0C }, /* 0 2 */
|
|
|
|
{ 0x2B, 0x00, 0x14 }, /* 0 3 */
|
|
|
|
{ 0x21, 0x00, 0x00 }, /* 1 0 */
|
|
|
|
{ 0x2B, 0x00, 0x08 }, /* 1 1 */
|
|
|
|
{ 0x30, 0x00, 0x0F }, /* 1 2 */
|
|
|
|
{ 0x31, 0x00, 0x03 }, /* 2 0 */
|
|
|
|
{ 0x34, 0x00, 0x0B }, /* 2 1 */
|
|
|
|
{ 0x3F, 0x00, 0x00 }, /* 3 0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations_hbr2_hbr3[] = {
|
2018-03-23 17:24:16 +00:00
|
|
|
/* Voltage swing pre-emphasis */
|
2020-03-30 21:00:44 +00:00
|
|
|
{ 0x18, 0x00, 0x00 }, /* 0 0 */
|
|
|
|
{ 0x1D, 0x00, 0x05 }, /* 0 1 */
|
|
|
|
{ 0x24, 0x00, 0x0C }, /* 0 2 */
|
|
|
|
{ 0x2B, 0x00, 0x14 }, /* 0 3 */
|
|
|
|
{ 0x26, 0x00, 0x00 }, /* 1 0 */
|
|
|
|
{ 0x2C, 0x00, 0x07 }, /* 1 1 */
|
|
|
|
{ 0x33, 0x00, 0x0C }, /* 1 2 */
|
|
|
|
{ 0x2E, 0x00, 0x00 }, /* 2 0 */
|
|
|
|
{ 0x36, 0x00, 0x09 }, /* 2 1 */
|
|
|
|
{ 0x3F, 0x00, 0x00 }, /* 3 0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct icl_mg_phy_ddi_buf_trans icl_mg_phy_ddi_translations_hdmi[] = {
|
|
|
|
/* HDMI Preset VS Pre-emph */
|
|
|
|
{ 0x1A, 0x0, 0x0 }, /* 1 400mV 0dB */
|
|
|
|
{ 0x20, 0x0, 0x0 }, /* 2 500mV 0dB */
|
|
|
|
{ 0x29, 0x0, 0x0 }, /* 3 650mV 0dB */
|
|
|
|
{ 0x32, 0x0, 0x0 }, /* 4 800mV 0dB */
|
|
|
|
{ 0x3F, 0x0, 0x0 }, /* 5 1000mV 0dB */
|
|
|
|
{ 0x3A, 0x0, 0x5 }, /* 6 Full -1.5 dB */
|
|
|
|
{ 0x39, 0x0, 0x6 }, /* 7 Full -1.8 dB */
|
|
|
|
{ 0x38, 0x0, 0x7 }, /* 8 Full -2 dB */
|
|
|
|
{ 0x37, 0x0, 0x8 }, /* 9 Full -2.5 dB */
|
|
|
|
{ 0x36, 0x0, 0x9 }, /* 10 Full -3 dB */
|
2018-03-23 17:24:16 +00:00
|
|
|
};
|
|
|
|
|
2019-09-26 21:06:57 +00:00
|
|
|
struct tgl_dkl_phy_ddi_buf_trans {
|
|
|
|
u32 dkl_vswing_control;
|
|
|
|
u32 dkl_preshoot_control;
|
|
|
|
u32 dkl_de_emphasis_control;
|
|
|
|
};
|
|
|
|
|
2019-11-18 18:02:19 +00:00
|
|
|
static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_dp_ddi_trans[] = {
|
2019-09-26 21:06:57 +00:00
|
|
|
/* VS pre-emp Non-trans mV Pre-emph dB */
|
|
|
|
{ 0x7, 0x0, 0x00 }, /* 0 0 400mV 0 dB */
|
2020-05-29 23:27:57 +00:00
|
|
|
{ 0x5, 0x0, 0x05 }, /* 0 1 400mV 3.5 dB */
|
|
|
|
{ 0x2, 0x0, 0x0B }, /* 0 2 400mV 6 dB */
|
2020-06-02 20:54:24 +00:00
|
|
|
{ 0x0, 0x0, 0x18 }, /* 0 3 400mV 9.5 dB */
|
|
|
|
{ 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */
|
|
|
|
{ 0x2, 0x0, 0x08 }, /* 1 1 600mV 3.5 dB */
|
|
|
|
{ 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */
|
|
|
|
{ 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */
|
|
|
|
{ 0x0, 0x0, 0x0B }, /* 2 1 800mV 3.5 dB */
|
|
|
|
{ 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB HDMI default */
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_dp_ddi_trans_hbr2[] = {
|
|
|
|
/* VS pre-emp Non-trans mV Pre-emph dB */
|
|
|
|
{ 0x7, 0x0, 0x00 }, /* 0 0 400mV 0 dB */
|
|
|
|
{ 0x5, 0x0, 0x05 }, /* 0 1 400mV 3.5 dB */
|
|
|
|
{ 0x2, 0x0, 0x0B }, /* 0 2 400mV 6 dB */
|
2019-09-26 21:06:57 +00:00
|
|
|
{ 0x0, 0x0, 0x19 }, /* 0 3 400mV 9.5 dB */
|
|
|
|
{ 0x5, 0x0, 0x00 }, /* 1 0 600mV 0 dB */
|
2020-05-29 23:27:57 +00:00
|
|
|
{ 0x2, 0x0, 0x08 }, /* 1 1 600mV 3.5 dB */
|
2019-09-26 21:06:57 +00:00
|
|
|
{ 0x0, 0x0, 0x14 }, /* 1 2 600mV 6 dB */
|
|
|
|
{ 0x2, 0x0, 0x00 }, /* 2 0 800mV 0 dB */
|
|
|
|
{ 0x0, 0x0, 0x0B }, /* 2 1 800mV 3.5 dB */
|
|
|
|
{ 0x0, 0x0, 0x00 }, /* 3 0 1200mV 0 dB HDMI default */
|
|
|
|
};
|
|
|
|
|
2019-11-18 18:02:19 +00:00
|
|
|
static const struct tgl_dkl_phy_ddi_buf_trans tgl_dkl_phy_hdmi_ddi_trans[] = {
|
|
|
|
/* HDMI Preset VS Pre-emph */
|
|
|
|
{ 0x7, 0x0, 0x0 }, /* 1 400mV 0dB */
|
|
|
|
{ 0x6, 0x0, 0x0 }, /* 2 500mV 0dB */
|
|
|
|
{ 0x4, 0x0, 0x0 }, /* 3 650mV 0dB */
|
|
|
|
{ 0x2, 0x0, 0x0 }, /* 4 800mV 0dB */
|
|
|
|
{ 0x0, 0x0, 0x0 }, /* 5 1000mV 0dB */
|
|
|
|
{ 0x0, 0x0, 0x5 }, /* 6 Full -1.5 dB */
|
|
|
|
{ 0x0, 0x0, 0x6 }, /* 7 Full -1.8 dB */
|
|
|
|
{ 0x0, 0x0, 0x7 }, /* 8 Full -2 dB */
|
|
|
|
{ 0x0, 0x0, 0x8 }, /* 9 Full -2.5 dB */
|
|
|
|
{ 0x0, 0x0, 0xA }, /* 10 Full -3 dB */
|
|
|
|
};
|
|
|
|
|
2020-01-10 23:39:02 +00:00
|
|
|
static const struct cnl_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x32, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
|
|
|
|
{ 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */
|
|
|
|
{ 0xC, 0x71, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */
|
|
|
|
{ 0x6, 0x7D, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */
|
|
|
|
{ 0xA, 0x4C, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */
|
|
|
|
{ 0xC, 0x73, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */
|
|
|
|
{ 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */
|
|
|
|
{ 0xC, 0x6C, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */
|
|
|
|
{ 0x6, 0x7F, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */
|
|
|
|
};
|
|
|
|
|
|
|
|
static const struct cnl_ddi_buf_trans tgl_combo_phy_ddi_translations_dp_hbr2[] = {
|
|
|
|
/* NT mV Trans mV db */
|
|
|
|
{ 0xA, 0x35, 0x3F, 0x00, 0x00 }, /* 350 350 0.0 */
|
|
|
|
{ 0xA, 0x4F, 0x37, 0x00, 0x08 }, /* 350 500 3.1 */
|
|
|
|
{ 0xC, 0x63, 0x2F, 0x00, 0x10 }, /* 350 700 6.0 */
|
|
|
|
{ 0x6, 0x7F, 0x2B, 0x00, 0x14 }, /* 350 900 8.2 */
|
|
|
|
{ 0xA, 0x47, 0x3F, 0x00, 0x00 }, /* 500 500 0.0 */
|
|
|
|
{ 0xC, 0x63, 0x34, 0x00, 0x0B }, /* 500 700 2.9 */
|
|
|
|
{ 0x6, 0x7F, 0x2F, 0x00, 0x10 }, /* 500 900 5.1 */
|
|
|
|
{ 0xC, 0x61, 0x3C, 0x00, 0x03 }, /* 650 700 0.6 */
|
|
|
|
{ 0x6, 0x7B, 0x35, 0x00, 0x0A }, /* 600 900 3.5 */
|
|
|
|
{ 0x6, 0x7F, 0x3F, 0x00, 0x00 }, /* 900 900 0.0 */
|
|
|
|
};
|
|
|
|
|
2016-07-12 12:59:36 +00:00
|
|
|
static const struct ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
bdw_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries)
|
2016-07-12 12:59:36 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2016-07-12 12:59:36 +00:00
|
|
|
if (dev_priv->vbt.edp.low_vswing) {
|
|
|
|
*n_entries = ARRAY_SIZE(bdw_ddi_translations_edp);
|
|
|
|
return bdw_ddi_translations_edp;
|
|
|
|
} else {
|
|
|
|
*n_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
|
|
|
|
return bdw_ddi_translations_dp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-08 17:59:39 +00:00
|
|
|
static const struct ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
skl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries)
|
2015-06-25 08:11:03 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2016-10-18 15:57:36 +00:00
|
|
|
if (IS_SKL_ULX(dev_priv)) {
|
2015-08-24 23:48:44 +00:00
|
|
|
*n_entries = ARRAY_SIZE(skl_y_ddi_translations_dp);
|
2015-12-08 17:59:39 +00:00
|
|
|
return skl_y_ddi_translations_dp;
|
2016-10-18 15:57:36 +00:00
|
|
|
} else if (IS_SKL_ULT(dev_priv)) {
|
2015-06-25 08:11:03 +00:00
|
|
|
*n_entries = ARRAY_SIZE(skl_u_ddi_translations_dp);
|
2015-12-08 17:59:39 +00:00
|
|
|
return skl_u_ddi_translations_dp;
|
2015-06-25 08:11:03 +00:00
|
|
|
} else {
|
|
|
|
*n_entries = ARRAY_SIZE(skl_ddi_translations_dp);
|
2015-12-08 17:59:39 +00:00
|
|
|
return skl_ddi_translations_dp;
|
2015-06-25 08:11:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2016-10-18 15:57:36 +00:00
|
|
|
static const struct ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
kbl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries)
|
2016-10-18 15:57:36 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2020-06-02 14:05:40 +00:00
|
|
|
if (IS_KBL_ULX(dev_priv) ||
|
|
|
|
IS_CFL_ULX(dev_priv) ||
|
|
|
|
IS_CML_ULX(dev_priv)) {
|
2016-10-18 15:57:36 +00:00
|
|
|
*n_entries = ARRAY_SIZE(kbl_y_ddi_translations_dp);
|
|
|
|
return kbl_y_ddi_translations_dp;
|
2020-06-02 14:05:40 +00:00
|
|
|
} else if (IS_KBL_ULT(dev_priv) ||
|
|
|
|
IS_CFL_ULT(dev_priv) ||
|
|
|
|
IS_CML_ULT(dev_priv)) {
|
2016-10-18 15:57:36 +00:00
|
|
|
*n_entries = ARRAY_SIZE(kbl_u_ddi_translations_dp);
|
|
|
|
return kbl_u_ddi_translations_dp;
|
|
|
|
} else {
|
|
|
|
*n_entries = ARRAY_SIZE(kbl_ddi_translations_dp);
|
|
|
|
return kbl_ddi_translations_dp;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-12-08 17:59:39 +00:00
|
|
|
static const struct ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
skl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries)
|
2015-06-25 08:11:03 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2016-03-24 15:50:21 +00:00
|
|
|
if (dev_priv->vbt.edp.low_vswing) {
|
2020-06-02 14:05:40 +00:00
|
|
|
if (IS_SKL_ULX(dev_priv) ||
|
|
|
|
IS_KBL_ULX(dev_priv) ||
|
|
|
|
IS_CFL_ULX(dev_priv) ||
|
|
|
|
IS_CML_ULX(dev_priv)) {
|
2015-08-24 23:48:44 +00:00
|
|
|
*n_entries = ARRAY_SIZE(skl_y_ddi_translations_edp);
|
2015-12-08 17:59:39 +00:00
|
|
|
return skl_y_ddi_translations_edp;
|
2020-06-02 14:05:40 +00:00
|
|
|
} else if (IS_SKL_ULT(dev_priv) ||
|
|
|
|
IS_KBL_ULT(dev_priv) ||
|
|
|
|
IS_CFL_ULT(dev_priv) ||
|
|
|
|
IS_CML_ULT(dev_priv)) {
|
2015-06-25 08:11:03 +00:00
|
|
|
*n_entries = ARRAY_SIZE(skl_u_ddi_translations_edp);
|
2015-12-08 17:59:39 +00:00
|
|
|
return skl_u_ddi_translations_edp;
|
2015-06-25 08:11:03 +00:00
|
|
|
} else {
|
|
|
|
*n_entries = ARRAY_SIZE(skl_ddi_translations_edp);
|
2015-12-08 17:59:39 +00:00
|
|
|
return skl_ddi_translations_edp;
|
2015-06-25 08:11:03 +00:00
|
|
|
}
|
|
|
|
}
|
2015-12-08 17:59:40 +00:00
|
|
|
|
2020-06-02 14:05:40 +00:00
|
|
|
if (IS_KABYLAKE(dev_priv) ||
|
|
|
|
IS_COFFEELAKE(dev_priv) ||
|
|
|
|
IS_COMETLAKE(dev_priv))
|
2020-07-08 20:55:08 +00:00
|
|
|
return kbl_get_buf_trans_dp(encoder, n_entries);
|
2016-10-18 15:57:36 +00:00
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
return skl_get_buf_trans_dp(encoder, n_entries);
|
2015-06-25 08:11:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct ddi_buf_trans *
|
2015-12-08 17:59:41 +00:00
|
|
|
skl_get_buf_trans_hdmi(struct drm_i915_private *dev_priv, int *n_entries)
|
2015-06-25 08:11:03 +00:00
|
|
|
{
|
2020-06-02 14:05:40 +00:00
|
|
|
if (IS_SKL_ULX(dev_priv) ||
|
|
|
|
IS_KBL_ULX(dev_priv) ||
|
|
|
|
IS_CFL_ULX(dev_priv) ||
|
|
|
|
IS_CML_ULX(dev_priv)) {
|
2015-08-24 23:48:44 +00:00
|
|
|
*n_entries = ARRAY_SIZE(skl_y_ddi_translations_hdmi);
|
2015-12-08 17:59:39 +00:00
|
|
|
return skl_y_ddi_translations_hdmi;
|
2015-06-25 08:11:03 +00:00
|
|
|
} else {
|
|
|
|
*n_entries = ARRAY_SIZE(skl_ddi_translations_hdmi);
|
2015-12-08 17:59:39 +00:00
|
|
|
return skl_ddi_translations_hdmi;
|
2015-06-25 08:11:03 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-16 14:57:03 +00:00
|
|
|
static int skl_buf_trans_num_entries(enum port port, int n_entries)
|
|
|
|
{
|
|
|
|
/* Only DDIA and DDIE can select the 10th register with DP */
|
|
|
|
if (port == PORT_A || port == PORT_E)
|
|
|
|
return min(n_entries, 10);
|
|
|
|
else
|
|
|
|
return min(n_entries, 9);
|
|
|
|
}
|
|
|
|
|
2017-10-16 14:56:56 +00:00
|
|
|
static const struct ddi_buf_trans *
|
2020-07-08 20:55:09 +00:00
|
|
|
intel_ddi_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries)
|
2017-10-16 14:56:56 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2020-06-02 14:05:40 +00:00
|
|
|
if (IS_KABYLAKE(dev_priv) ||
|
|
|
|
IS_COFFEELAKE(dev_priv) ||
|
|
|
|
IS_COMETLAKE(dev_priv)) {
|
2017-10-16 14:57:03 +00:00
|
|
|
const struct ddi_buf_trans *ddi_translations =
|
2020-07-08 20:55:08 +00:00
|
|
|
kbl_get_buf_trans_dp(encoder, n_entries);
|
2020-07-08 20:55:09 +00:00
|
|
|
*n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries);
|
2017-10-16 14:57:03 +00:00
|
|
|
return ddi_translations;
|
2017-10-16 14:56:56 +00:00
|
|
|
} else if (IS_SKYLAKE(dev_priv)) {
|
2017-10-16 14:57:03 +00:00
|
|
|
const struct ddi_buf_trans *ddi_translations =
|
2020-07-08 20:55:08 +00:00
|
|
|
skl_get_buf_trans_dp(encoder, n_entries);
|
2020-07-08 20:55:09 +00:00
|
|
|
*n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries);
|
2017-10-16 14:57:03 +00:00
|
|
|
return ddi_translations;
|
2017-10-16 14:56:56 +00:00
|
|
|
} else if (IS_BROADWELL(dev_priv)) {
|
|
|
|
*n_entries = ARRAY_SIZE(bdw_ddi_translations_dp);
|
|
|
|
return bdw_ddi_translations_dp;
|
|
|
|
} else if (IS_HASWELL(dev_priv)) {
|
|
|
|
*n_entries = ARRAY_SIZE(hsw_ddi_translations_dp);
|
|
|
|
return hsw_ddi_translations_dp;
|
|
|
|
}
|
|
|
|
|
|
|
|
*n_entries = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct ddi_buf_trans *
|
2020-07-08 20:55:09 +00:00
|
|
|
intel_ddi_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries)
|
2017-10-16 14:56:56 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2017-10-16 14:56:56 +00:00
|
|
|
if (IS_GEN9_BC(dev_priv)) {
|
2017-10-16 14:57:03 +00:00
|
|
|
const struct ddi_buf_trans *ddi_translations =
|
2020-07-08 20:55:08 +00:00
|
|
|
skl_get_buf_trans_edp(encoder, n_entries);
|
2020-07-08 20:55:09 +00:00
|
|
|
*n_entries = skl_buf_trans_num_entries(encoder->port, *n_entries);
|
2017-10-16 14:57:03 +00:00
|
|
|
return ddi_translations;
|
2017-10-16 14:56:56 +00:00
|
|
|
} else if (IS_BROADWELL(dev_priv)) {
|
2020-07-08 20:55:08 +00:00
|
|
|
return bdw_get_buf_trans_edp(encoder, n_entries);
|
2017-10-16 14:56:56 +00:00
|
|
|
} else if (IS_HASWELL(dev_priv)) {
|
|
|
|
*n_entries = ARRAY_SIZE(hsw_ddi_translations_dp);
|
|
|
|
return hsw_ddi_translations_dp;
|
|
|
|
}
|
|
|
|
|
|
|
|
*n_entries = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct ddi_buf_trans *
|
|
|
|
intel_ddi_get_buf_trans_fdi(struct drm_i915_private *dev_priv,
|
|
|
|
int *n_entries)
|
|
|
|
{
|
|
|
|
if (IS_BROADWELL(dev_priv)) {
|
|
|
|
*n_entries = ARRAY_SIZE(bdw_ddi_translations_fdi);
|
|
|
|
return bdw_ddi_translations_fdi;
|
|
|
|
} else if (IS_HASWELL(dev_priv)) {
|
|
|
|
*n_entries = ARRAY_SIZE(hsw_ddi_translations_fdi);
|
|
|
|
return hsw_ddi_translations_fdi;
|
|
|
|
}
|
|
|
|
|
|
|
|
*n_entries = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2017-10-16 14:56:57 +00:00
|
|
|
static const struct ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
intel_ddi_get_buf_trans_hdmi(struct intel_encoder *encoder,
|
2017-10-16 14:56:57 +00:00
|
|
|
int *n_entries)
|
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2017-10-16 14:56:57 +00:00
|
|
|
if (IS_GEN9_BC(dev_priv)) {
|
|
|
|
return skl_get_buf_trans_hdmi(dev_priv, n_entries);
|
|
|
|
} else if (IS_BROADWELL(dev_priv)) {
|
|
|
|
*n_entries = ARRAY_SIZE(bdw_ddi_translations_hdmi);
|
|
|
|
return bdw_ddi_translations_hdmi;
|
|
|
|
} else if (IS_HASWELL(dev_priv)) {
|
|
|
|
*n_entries = ARRAY_SIZE(hsw_ddi_translations_hdmi);
|
|
|
|
return hsw_ddi_translations_hdmi;
|
|
|
|
}
|
|
|
|
|
|
|
|
*n_entries = 0;
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
2017-10-16 14:57:00 +00:00
|
|
|
static const struct bxt_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
bxt_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries)
|
2017-10-16 14:57:00 +00:00
|
|
|
{
|
|
|
|
*n_entries = ARRAY_SIZE(bxt_ddi_translations_dp);
|
|
|
|
return bxt_ddi_translations_dp;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct bxt_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
bxt_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries)
|
2017-10-16 14:57:00 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2017-10-16 14:57:00 +00:00
|
|
|
if (dev_priv->vbt.edp.low_vswing) {
|
|
|
|
*n_entries = ARRAY_SIZE(bxt_ddi_translations_edp);
|
|
|
|
return bxt_ddi_translations_edp;
|
|
|
|
}
|
|
|
|
|
2020-07-08 20:55:08 +00:00
|
|
|
return bxt_get_buf_trans_dp(encoder, n_entries);
|
2017-10-16 14:57:00 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static const struct bxt_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
bxt_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries)
|
2017-10-16 14:57:00 +00:00
|
|
|
{
|
|
|
|
*n_entries = ARRAY_SIZE(bxt_ddi_translations_hdmi);
|
|
|
|
return bxt_ddi_translations_hdmi;
|
|
|
|
}
|
|
|
|
|
2017-08-29 23:22:28 +00:00
|
|
|
static const struct cnl_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
cnl_get_buf_trans_hdmi(struct intel_encoder *encoder, int *n_entries)
|
2017-08-29 23:22:28 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK;
|
2017-08-29 23:22:28 +00:00
|
|
|
|
|
|
|
if (voltage == VOLTAGE_INFO_0_85V) {
|
|
|
|
*n_entries = ARRAY_SIZE(cnl_ddi_translations_hdmi_0_85V);
|
|
|
|
return cnl_ddi_translations_hdmi_0_85V;
|
|
|
|
} else if (voltage == VOLTAGE_INFO_0_95V) {
|
|
|
|
*n_entries = ARRAY_SIZE(cnl_ddi_translations_hdmi_0_95V);
|
|
|
|
return cnl_ddi_translations_hdmi_0_95V;
|
|
|
|
} else if (voltage == VOLTAGE_INFO_1_05V) {
|
|
|
|
*n_entries = ARRAY_SIZE(cnl_ddi_translations_hdmi_1_05V);
|
|
|
|
return cnl_ddi_translations_hdmi_1_05V;
|
2017-10-05 12:08:26 +00:00
|
|
|
} else {
|
|
|
|
*n_entries = 1; /* shut up gcc */
|
2017-08-29 23:22:28 +00:00
|
|
|
MISSING_CASE(voltage);
|
2017-10-05 12:08:26 +00:00
|
|
|
}
|
2017-08-29 23:22:28 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct cnl_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
cnl_get_buf_trans_dp(struct intel_encoder *encoder, int *n_entries)
|
2017-08-29 23:22:28 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK;
|
2017-08-29 23:22:28 +00:00
|
|
|
|
|
|
|
if (voltage == VOLTAGE_INFO_0_85V) {
|
|
|
|
*n_entries = ARRAY_SIZE(cnl_ddi_translations_dp_0_85V);
|
|
|
|
return cnl_ddi_translations_dp_0_85V;
|
|
|
|
} else if (voltage == VOLTAGE_INFO_0_95V) {
|
|
|
|
*n_entries = ARRAY_SIZE(cnl_ddi_translations_dp_0_95V);
|
|
|
|
return cnl_ddi_translations_dp_0_95V;
|
|
|
|
} else if (voltage == VOLTAGE_INFO_1_05V) {
|
|
|
|
*n_entries = ARRAY_SIZE(cnl_ddi_translations_dp_1_05V);
|
|
|
|
return cnl_ddi_translations_dp_1_05V;
|
2017-10-05 12:08:26 +00:00
|
|
|
} else {
|
|
|
|
*n_entries = 1; /* shut up gcc */
|
2017-08-29 23:22:28 +00:00
|
|
|
MISSING_CASE(voltage);
|
2017-10-05 12:08:26 +00:00
|
|
|
}
|
2017-08-29 23:22:28 +00:00
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
static const struct cnl_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
cnl_get_buf_trans_edp(struct intel_encoder *encoder, int *n_entries)
|
2017-08-29 23:22:28 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
u32 voltage = intel_de_read(dev_priv, CNL_PORT_COMP_DW3) & VOLTAGE_INFO_MASK;
|
2017-08-29 23:22:28 +00:00
|
|
|
|
|
|
|
if (dev_priv->vbt.edp.low_vswing) {
|
|
|
|
if (voltage == VOLTAGE_INFO_0_85V) {
|
|
|
|
*n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_85V);
|
|
|
|
return cnl_ddi_translations_edp_0_85V;
|
|
|
|
} else if (voltage == VOLTAGE_INFO_0_95V) {
|
|
|
|
*n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_0_95V);
|
|
|
|
return cnl_ddi_translations_edp_0_95V;
|
|
|
|
} else if (voltage == VOLTAGE_INFO_1_05V) {
|
|
|
|
*n_entries = ARRAY_SIZE(cnl_ddi_translations_edp_1_05V);
|
|
|
|
return cnl_ddi_translations_edp_1_05V;
|
2017-10-05 12:08:26 +00:00
|
|
|
} else {
|
|
|
|
*n_entries = 1; /* shut up gcc */
|
2017-08-29 23:22:28 +00:00
|
|
|
MISSING_CASE(voltage);
|
2017-10-05 12:08:26 +00:00
|
|
|
}
|
2017-08-29 23:22:28 +00:00
|
|
|
return NULL;
|
|
|
|
} else {
|
2020-07-08 20:55:08 +00:00
|
|
|
return cnl_get_buf_trans_dp(encoder, n_entries);
|
2017-08-29 23:22:28 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-12-17 22:13:47 +00:00
|
|
|
static const struct cnl_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
icl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,
|
2019-06-26 00:03:48 +00:00
|
|
|
int *n_entries)
|
2018-03-28 21:58:02 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
2018-12-17 22:13:47 +00:00
|
|
|
if (type == INTEL_OUTPUT_HDMI) {
|
|
|
|
*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_hdmi);
|
|
|
|
return icl_combo_phy_ddi_translations_hdmi;
|
|
|
|
} else if (rate > 540000 && type == INTEL_OUTPUT_EDP) {
|
|
|
|
*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr3);
|
|
|
|
return icl_combo_phy_ddi_translations_edp_hbr3;
|
|
|
|
} else if (type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.low_vswing) {
|
|
|
|
*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_edp_hbr2);
|
|
|
|
return icl_combo_phy_ddi_translations_edp_hbr2;
|
2018-03-28 21:58:02 +00:00
|
|
|
}
|
2018-12-17 22:13:47 +00:00
|
|
|
|
|
|
|
*n_entries = ARRAY_SIZE(icl_combo_phy_ddi_translations_dp_hbr2);
|
|
|
|
return icl_combo_phy_ddi_translations_dp_hbr2;
|
2018-03-28 21:58:02 +00:00
|
|
|
}
|
|
|
|
|
2020-03-30 21:00:44 +00:00
|
|
|
static const struct icl_mg_phy_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
icl_get_mg_buf_trans(struct intel_encoder *encoder, int type, int rate,
|
2020-03-30 21:00:44 +00:00
|
|
|
int *n_entries)
|
|
|
|
{
|
|
|
|
if (type == INTEL_OUTPUT_HDMI) {
|
|
|
|
*n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hdmi);
|
|
|
|
return icl_mg_phy_ddi_translations_hdmi;
|
|
|
|
} else if (rate > 270000) {
|
|
|
|
*n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_hbr2_hbr3);
|
|
|
|
return icl_mg_phy_ddi_translations_hbr2_hbr3;
|
|
|
|
}
|
|
|
|
|
|
|
|
*n_entries = ARRAY_SIZE(icl_mg_phy_ddi_translations_rbr_hbr);
|
|
|
|
return icl_mg_phy_ddi_translations_rbr_hbr;
|
|
|
|
}
|
|
|
|
|
2020-02-05 20:56:47 +00:00
|
|
|
static const struct cnl_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
ehl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,
|
2020-02-05 20:56:47 +00:00
|
|
|
int *n_entries)
|
|
|
|
{
|
2020-03-30 21:00:43 +00:00
|
|
|
if (type != INTEL_OUTPUT_HDMI && type != INTEL_OUTPUT_EDP) {
|
|
|
|
*n_entries = ARRAY_SIZE(ehl_combo_phy_ddi_translations_dp);
|
|
|
|
return ehl_combo_phy_ddi_translations_dp;
|
2020-02-05 20:56:47 +00:00
|
|
|
}
|
|
|
|
|
2020-07-08 20:55:08 +00:00
|
|
|
return icl_get_combo_buf_trans(encoder, type, rate, n_entries);
|
2020-02-05 20:56:47 +00:00
|
|
|
}
|
|
|
|
|
2020-01-10 23:39:02 +00:00
|
|
|
static const struct cnl_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
tgl_get_combo_buf_trans(struct intel_encoder *encoder, int type, int rate,
|
2020-01-10 23:39:02 +00:00
|
|
|
int *n_entries)
|
|
|
|
{
|
2020-03-30 21:00:42 +00:00
|
|
|
if (type == INTEL_OUTPUT_HDMI || type == INTEL_OUTPUT_EDP) {
|
2020-07-08 20:55:08 +00:00
|
|
|
return icl_get_combo_buf_trans(encoder, type, rate, n_entries);
|
2020-01-10 23:39:02 +00:00
|
|
|
} else if (rate > 270000) {
|
|
|
|
*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr2);
|
|
|
|
return tgl_combo_phy_ddi_translations_dp_hbr2;
|
|
|
|
}
|
|
|
|
|
|
|
|
*n_entries = ARRAY_SIZE(tgl_combo_phy_ddi_translations_dp_hbr);
|
|
|
|
return tgl_combo_phy_ddi_translations_dp_hbr;
|
|
|
|
}
|
|
|
|
|
2020-06-02 20:54:24 +00:00
|
|
|
static const struct tgl_dkl_phy_ddi_buf_trans *
|
2020-07-08 20:55:08 +00:00
|
|
|
tgl_get_dkl_buf_trans(struct intel_encoder *encoder, int type, int rate,
|
2020-06-02 20:54:24 +00:00
|
|
|
int *n_entries)
|
|
|
|
{
|
|
|
|
if (type == INTEL_OUTPUT_HDMI) {
|
|
|
|
*n_entries = ARRAY_SIZE(tgl_dkl_phy_hdmi_ddi_trans);
|
|
|
|
return tgl_dkl_phy_hdmi_ddi_trans;
|
|
|
|
} else if (rate > 270000) {
|
|
|
|
*n_entries = ARRAY_SIZE(tgl_dkl_phy_dp_ddi_trans_hbr2);
|
|
|
|
return tgl_dkl_phy_dp_ddi_trans_hbr2;
|
|
|
|
}
|
|
|
|
|
|
|
|
*n_entries = ARRAY_SIZE(tgl_dkl_phy_dp_ddi_trans);
|
|
|
|
return tgl_dkl_phy_dp_ddi_trans;
|
|
|
|
}
|
|
|
|
|
2020-01-17 14:29:22 +00:00
|
|
|
static int intel_ddi_hdmi_level(struct intel_encoder *encoder)
|
2016-07-12 12:59:30 +00:00
|
|
|
{
|
2020-01-17 14:29:22 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2017-10-18 18:19:58 +00:00
|
|
|
int n_entries, level, default_entry;
|
2020-01-17 14:29:22 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2016-07-12 12:59:30 +00:00
|
|
|
|
2019-09-26 21:06:57 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12) {
|
|
|
|
if (intel_phy_is_combo(dev_priv, phy))
|
2020-07-08 20:55:08 +00:00
|
|
|
tgl_get_combo_buf_trans(encoder, INTEL_OUTPUT_HDMI,
|
2019-09-26 21:06:57 +00:00
|
|
|
0, &n_entries);
|
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
tgl_get_dkl_buf_trans(encoder, INTEL_OUTPUT_HDMI, 0,
|
2020-06-02 20:54:24 +00:00
|
|
|
&n_entries);
|
2019-09-26 21:06:57 +00:00
|
|
|
default_entry = n_entries - 1;
|
|
|
|
} else if (INTEL_GEN(dev_priv) == 11) {
|
2019-07-09 18:39:33 +00:00
|
|
|
if (intel_phy_is_combo(dev_priv, phy))
|
2020-07-08 20:55:08 +00:00
|
|
|
icl_get_combo_buf_trans(encoder, INTEL_OUTPUT_HDMI,
|
2018-12-17 22:13:47 +00:00
|
|
|
0, &n_entries);
|
2018-05-22 00:25:41 +00:00
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
icl_get_mg_buf_trans(encoder, INTEL_OUTPUT_HDMI, 0,
|
2020-03-30 21:00:44 +00:00
|
|
|
&n_entries);
|
2018-05-22 00:25:41 +00:00
|
|
|
default_entry = n_entries - 1;
|
|
|
|
} else if (IS_CANNONLAKE(dev_priv)) {
|
2020-07-08 20:55:08 +00:00
|
|
|
cnl_get_buf_trans_hdmi(encoder, &n_entries);
|
2017-10-18 18:19:58 +00:00
|
|
|
default_entry = n_entries - 1;
|
2017-10-16 14:57:02 +00:00
|
|
|
} else if (IS_GEN9_LP(dev_priv)) {
|
2020-07-08 20:55:08 +00:00
|
|
|
bxt_get_buf_trans_hdmi(encoder, &n_entries);
|
2017-10-18 18:19:58 +00:00
|
|
|
default_entry = n_entries - 1;
|
2017-08-29 23:22:29 +00:00
|
|
|
} else if (IS_GEN9_BC(dev_priv)) {
|
2020-07-08 20:55:08 +00:00
|
|
|
intel_ddi_get_buf_trans_hdmi(encoder, &n_entries);
|
2017-10-18 18:19:58 +00:00
|
|
|
default_entry = 8;
|
2016-07-12 12:59:30 +00:00
|
|
|
} else if (IS_BROADWELL(dev_priv)) {
|
2020-07-08 20:55:08 +00:00
|
|
|
intel_ddi_get_buf_trans_hdmi(encoder, &n_entries);
|
2017-10-18 18:19:58 +00:00
|
|
|
default_entry = 7;
|
2016-07-12 12:59:30 +00:00
|
|
|
} else if (IS_HASWELL(dev_priv)) {
|
2020-07-08 20:55:08 +00:00
|
|
|
intel_ddi_get_buf_trans_hdmi(encoder, &n_entries);
|
2017-10-18 18:19:58 +00:00
|
|
|
default_entry = 6;
|
2016-07-12 12:59:30 +00:00
|
|
|
} else {
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN(&dev_priv->drm, 1, "ddi translation table missing\n");
|
2017-10-16 14:56:57 +00:00
|
|
|
return 0;
|
2016-07-12 12:59:30 +00:00
|
|
|
}
|
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, n_entries == 0))
|
2017-10-18 18:19:34 +00:00
|
|
|
return 0;
|
2019-11-08 15:39:48 +00:00
|
|
|
|
2020-01-17 14:29:22 +00:00
|
|
|
level = intel_bios_hdmi_level_shift(encoder);
|
|
|
|
if (level < 0)
|
2019-11-08 15:39:48 +00:00
|
|
|
level = default_entry;
|
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries))
|
2017-10-18 18:19:58 +00:00
|
|
|
level = n_entries - 1;
|
2017-10-18 18:19:34 +00:00
|
|
|
|
2017-10-18 18:19:58 +00:00
|
|
|
return level;
|
2016-07-12 12:59:30 +00:00
|
|
|
}
|
|
|
|
|
2013-11-03 04:07:41 +00:00
|
|
|
/*
|
|
|
|
* Starting with Haswell, DDI port buffers must be programmed with correct
|
2016-07-12 12:59:33 +00:00
|
|
|
* values in advance. This function programs the correct values for
|
|
|
|
* DP/eDP/FDI use cases.
|
2012-05-09 18:37:20 +00:00
|
|
|
*/
|
2017-10-19 13:37:13 +00:00
|
|
|
static void intel_prepare_dp_ddi_buffers(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2012-05-09 18:37:20 +00:00
|
|
|
{
|
2015-12-08 17:59:44 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2015-07-10 11:10:55 +00:00
|
|
|
u32 iboost_bit = 0;
|
2017-02-23 17:35:05 +00:00
|
|
|
int i, n_entries;
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2014-08-27 13:27:30 +00:00
|
|
|
const struct ddi_buf_trans *ddi_translations;
|
2013-11-03 04:07:41 +00:00
|
|
|
|
2017-10-19 13:37:13 +00:00
|
|
|
if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_ANALOG))
|
|
|
|
ddi_translations = intel_ddi_get_buf_trans_fdi(dev_priv,
|
|
|
|
&n_entries);
|
|
|
|
else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_EDP))
|
2020-07-08 20:55:09 +00:00
|
|
|
ddi_translations = intel_ddi_get_buf_trans_edp(encoder,
|
2017-02-23 17:35:05 +00:00
|
|
|
&n_entries);
|
2017-10-19 13:37:13 +00:00
|
|
|
else
|
2020-07-08 20:55:09 +00:00
|
|
|
ddi_translations = intel_ddi_get_buf_trans_dp(encoder,
|
2017-02-23 17:35:05 +00:00
|
|
|
&n_entries);
|
2013-11-03 04:07:41 +00:00
|
|
|
|
2017-10-16 14:57:03 +00:00
|
|
|
/* If we're boosting the current, set bit 31 of trans1 */
|
2020-01-17 14:29:23 +00:00
|
|
|
if (IS_GEN9_BC(dev_priv) && intel_bios_dp_boost_level(encoder))
|
2017-10-16 14:57:03 +00:00
|
|
|
iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;
|
2012-05-09 18:37:20 +00:00
|
|
|
|
2017-02-23 17:35:05 +00:00
|
|
|
for (i = 0; i < n_entries; i++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, i),
|
|
|
|
ddi_translations[i].trans1 | iboost_bit);
|
|
|
|
intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, i),
|
|
|
|
ddi_translations[i].trans2);
|
2012-05-09 18:37:20 +00:00
|
|
|
}
|
2016-07-12 12:59:33 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Starting with Haswell, DDI port buffers must be programmed with correct
|
|
|
|
* values in advance. This function programs the correct values for
|
|
|
|
* HDMI/DVI use cases.
|
|
|
|
*/
|
2017-10-16 14:56:59 +00:00
|
|
|
static void intel_prepare_hdmi_ddi_buffers(struct intel_encoder *encoder,
|
2017-10-18 18:19:58 +00:00
|
|
|
int level)
|
2016-07-12 12:59:33 +00:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
u32 iboost_bit = 0;
|
2017-10-18 18:19:58 +00:00
|
|
|
int n_entries;
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2017-10-18 18:19:58 +00:00
|
|
|
const struct ddi_buf_trans *ddi_translations;
|
2014-08-01 10:07:54 +00:00
|
|
|
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = intel_ddi_get_buf_trans_hdmi(encoder, &n_entries);
|
2016-07-12 12:59:34 +00:00
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations))
|
2017-10-18 18:19:34 +00:00
|
|
|
return;
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries))
|
2017-10-18 18:19:58 +00:00
|
|
|
level = n_entries - 1;
|
2017-10-18 18:19:34 +00:00
|
|
|
|
2017-10-16 14:56:57 +00:00
|
|
|
/* If we're boosting the current, set bit 31 of trans1 */
|
2020-01-17 14:29:24 +00:00
|
|
|
if (IS_GEN9_BC(dev_priv) && intel_bios_hdmi_boost_level(encoder))
|
2017-10-16 14:56:57 +00:00
|
|
|
iboost_bit = DDI_BUF_BALANCE_LEG_ENABLE;
|
2016-07-12 12:59:33 +00:00
|
|
|
|
2013-09-12 20:06:24 +00:00
|
|
|
/* Entry 9 is for HDMI: */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_BUF_TRANS_LO(port, 9),
|
|
|
|
ddi_translations[level].trans1 | iboost_bit);
|
|
|
|
intel_de_write(dev_priv, DDI_BUF_TRANS_HI(port, 9),
|
|
|
|
ddi_translations[level].trans2);
|
2012-05-09 18:37:20 +00:00
|
|
|
}
|
|
|
|
|
2012-11-29 13:29:31 +00:00
|
|
|
static void intel_wait_ddi_buf_idle(struct drm_i915_private *dev_priv,
|
|
|
|
enum port port)
|
|
|
|
{
|
2020-07-01 22:10:51 +00:00
|
|
|
if (IS_BROXTON(dev_priv)) {
|
|
|
|
udelay(16);
|
|
|
|
return;
|
2012-11-29 13:29:31 +00:00
|
|
|
}
|
2020-07-01 22:10:51 +00:00
|
|
|
|
|
|
|
if (wait_for_us((intel_de_read(dev_priv, DDI_BUF_CTL(port)) &
|
|
|
|
DDI_BUF_IS_IDLE), 8))
|
|
|
|
drm_err(&dev_priv->drm, "Timeout waiting for DDI BUF %c to get idle\n",
|
|
|
|
port_name(port));
|
2012-11-29 13:29:31 +00:00
|
|
|
}
|
2012-05-09 18:37:21 +00:00
|
|
|
|
2020-07-01 22:10:52 +00:00
|
|
|
static void intel_wait_ddi_buf_active(struct drm_i915_private *dev_priv,
|
|
|
|
enum port port)
|
|
|
|
{
|
|
|
|
/* Wait > 518 usecs for DDI_BUF_CTL to be non idle */
|
|
|
|
if (INTEL_GEN(dev_priv) < 10 && !IS_GEMINILAKE(dev_priv)) {
|
|
|
|
usleep_range(518, 1000);
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (wait_for_us(!(intel_de_read(dev_priv, DDI_BUF_CTL(port)) &
|
|
|
|
DDI_BUF_IS_IDLE), 500))
|
|
|
|
drm_err(&dev_priv->drm, "Timeout waiting for DDI BUF %c to get active\n",
|
|
|
|
port_name(port));
|
|
|
|
}
|
|
|
|
|
2019-01-18 12:01:21 +00:00
|
|
|
static u32 hsw_pll_to_ddi_pll_sel(const struct intel_shared_dpll *pll)
|
2016-09-01 22:08:07 +00:00
|
|
|
{
|
2018-03-20 22:06:35 +00:00
|
|
|
switch (pll->info->id) {
|
2016-09-01 22:08:07 +00:00
|
|
|
case DPLL_ID_WRPLL1:
|
|
|
|
return PORT_CLK_SEL_WRPLL1;
|
|
|
|
case DPLL_ID_WRPLL2:
|
|
|
|
return PORT_CLK_SEL_WRPLL2;
|
|
|
|
case DPLL_ID_SPLL:
|
|
|
|
return PORT_CLK_SEL_SPLL;
|
|
|
|
case DPLL_ID_LCPLL_810:
|
|
|
|
return PORT_CLK_SEL_LCPLL_810;
|
|
|
|
case DPLL_ID_LCPLL_1350:
|
|
|
|
return PORT_CLK_SEL_LCPLL_1350;
|
|
|
|
case DPLL_ID_LCPLL_2700:
|
|
|
|
return PORT_CLK_SEL_LCPLL_2700;
|
|
|
|
default:
|
2018-03-20 22:06:35 +00:00
|
|
|
MISSING_CASE(pll->info->id);
|
2016-09-01 22:08:07 +00:00
|
|
|
return PORT_CLK_SEL_NONE;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-25 22:24:43 +00:00
|
|
|
static u32 icl_pll_to_ddi_clk_sel(struct intel_encoder *encoder,
|
2019-01-18 12:01:21 +00:00
|
|
|
const struct intel_crtc_state *crtc_state)
|
2018-04-27 23:14:36 +00:00
|
|
|
{
|
2018-10-04 09:46:00 +00:00
|
|
|
const struct intel_shared_dpll *pll = crtc_state->shared_dpll;
|
|
|
|
int clock = crtc_state->port_clock;
|
2018-04-27 23:14:36 +00:00
|
|
|
const enum intel_dpll_id id = pll->info->id;
|
|
|
|
|
|
|
|
switch (id) {
|
|
|
|
default:
|
2019-01-25 22:24:43 +00:00
|
|
|
/*
|
|
|
|
* DPLL_ID_ICL_DPLL0 and DPLL_ID_ICL_DPLL1 should not be used
|
|
|
|
* here, so do warn if this get passed in
|
|
|
|
*/
|
2018-04-27 23:14:36 +00:00
|
|
|
MISSING_CASE(id);
|
|
|
|
return DDI_CLK_SEL_NONE;
|
2018-05-22 00:25:48 +00:00
|
|
|
case DPLL_ID_ICL_TBTPLL:
|
|
|
|
switch (clock) {
|
|
|
|
case 162000:
|
|
|
|
return DDI_CLK_SEL_TBT_162;
|
|
|
|
case 270000:
|
|
|
|
return DDI_CLK_SEL_TBT_270;
|
|
|
|
case 540000:
|
|
|
|
return DDI_CLK_SEL_TBT_540;
|
|
|
|
case 810000:
|
|
|
|
return DDI_CLK_SEL_TBT_810;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(clock);
|
2019-01-25 22:24:42 +00:00
|
|
|
return DDI_CLK_SEL_NONE;
|
2018-05-22 00:25:48 +00:00
|
|
|
}
|
2018-04-27 23:14:36 +00:00
|
|
|
case DPLL_ID_ICL_MGPLL1:
|
|
|
|
case DPLL_ID_ICL_MGPLL2:
|
|
|
|
case DPLL_ID_ICL_MGPLL3:
|
|
|
|
case DPLL_ID_ICL_MGPLL4:
|
2019-09-24 21:00:40 +00:00
|
|
|
case DPLL_ID_TGL_MGPLL5:
|
|
|
|
case DPLL_ID_TGL_MGPLL6:
|
2018-04-27 23:14:36 +00:00
|
|
|
return DDI_CLK_SEL_MG;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2012-05-09 18:37:21 +00:00
|
|
|
/* Starting with Haswell, different DDI ports can work in FDI mode for
|
|
|
|
* connection to the PCH-located connectors. For this, it is necessary to train
|
|
|
|
* both the DDI port and PCH receiver for the desired DDI buffer settings.
|
|
|
|
*
|
|
|
|
* The recommended port to work in FDI mode is DDI E, which we use here. Also,
|
|
|
|
* please note that when FDI mode is active on DDI E, it shares 2 lines with
|
|
|
|
* DDI A (which is used for eDP)
|
|
|
|
*/
|
|
|
|
|
2019-12-13 19:52:13 +00:00
|
|
|
void hsw_fdi_link_train(struct intel_encoder *encoder,
|
2017-03-02 12:58:54 +00:00
|
|
|
const struct intel_crtc_state *crtc_state)
|
2012-05-09 18:37:21 +00:00
|
|
|
{
|
2019-12-13 19:52:13 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
2016-09-01 22:08:07 +00:00
|
|
|
u32 temp, i, rx_ctl_val, ddi_pll_sel;
|
2012-05-09 18:37:21 +00:00
|
|
|
|
2019-12-13 19:52:13 +00:00
|
|
|
intel_prepare_dp_ddi_buffers(encoder, crtc_state);
|
2015-12-08 17:59:44 +00:00
|
|
|
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
/* Set the FDI_RX_MISC pwrdn lanes and the 2 workarounds listed at the
|
|
|
|
* mode set "sequence for CRT port" document:
|
|
|
|
* - TP1 to TP2 time with the default value
|
|
|
|
* - FDI delay to 90h
|
2013-05-03 17:48:11 +00:00
|
|
|
*
|
|
|
|
* WaFDIAutoLinkSetTimingOverrride:hsw
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
*/
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_MISC(PIPE_A),
|
|
|
|
FDI_RX_PWRDN_LANE1_VAL(2) | FDI_RX_PWRDN_LANE0_VAL(2) | FDI_RX_TP1_TO_TP2_48 | FDI_RX_FDI_DELAY_90);
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
|
|
|
|
/* Enable the PCH Receiver FDI PLL */
|
2012-12-11 18:48:29 +00:00
|
|
|
rx_ctl_val = dev_priv->fdi_rx_config | FDI_RX_ENHANCE_FRAME_ENABLE |
|
2013-02-13 17:04:45 +00:00
|
|
|
FDI_RX_PLL_ENABLE |
|
2017-03-02 12:58:54 +00:00
|
|
|
FDI_DP_PORT_WIDTH(crtc_state->fdi_lanes);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_CTL(PIPE_A), rx_ctl_val);
|
|
|
|
intel_de_posting_read(dev_priv, FDI_RX_CTL(PIPE_A));
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
udelay(220);
|
|
|
|
|
|
|
|
/* Switch from Rawclk to PCDclk */
|
|
|
|
rx_ctl_val |= FDI_PCDCLK;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_CTL(PIPE_A), rx_ctl_val);
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
|
|
|
|
/* Configure Port Clock Select */
|
2017-03-02 12:58:54 +00:00
|
|
|
ddi_pll_sel = hsw_pll_to_ddi_pll_sel(crtc_state->shared_dpll);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, PORT_CLK_SEL(PORT_E), ddi_pll_sel);
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, ddi_pll_sel != PORT_CLK_SEL_SPLL);
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
|
|
|
|
/* Start the training iterating through available voltages and emphasis,
|
|
|
|
* testing each value twice. */
|
2014-08-27 13:27:30 +00:00
|
|
|
for (i = 0; i < ARRAY_SIZE(hsw_ddi_translations_fdi) * 2; i++) {
|
2012-05-09 18:37:21 +00:00
|
|
|
/* Configure DP_TP_CTL with auto-training */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DP_TP_CTL(PORT_E),
|
2020-04-20 20:06:10 +00:00
|
|
|
DP_TP_CTL_FDI_AUTOTRAIN |
|
|
|
|
DP_TP_CTL_ENHANCED_FRAME_ENABLE |
|
|
|
|
DP_TP_CTL_LINK_TRAIN_PAT1 |
|
|
|
|
DP_TP_CTL_ENABLE);
|
2012-05-09 18:37:21 +00:00
|
|
|
|
2012-12-11 18:48:30 +00:00
|
|
|
/* Configure and enable DDI_BUF_CTL for DDI E with next voltage.
|
|
|
|
* DDI E does not support port reversal, the functionality is
|
|
|
|
* achieved on the PCH side in FDI_RX_CTL, so no need to set the
|
|
|
|
* port reversal bit */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_BUF_CTL(PORT_E),
|
|
|
|
DDI_BUF_CTL_ENABLE | ((crtc_state->fdi_lanes - 1) << 1) | DDI_BUF_TRANS_SELECT(i / 2));
|
|
|
|
intel_de_posting_read(dev_priv, DDI_BUF_CTL(PORT_E));
|
2012-05-09 18:37:21 +00:00
|
|
|
|
|
|
|
udelay(600);
|
|
|
|
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
/* Program PCH FDI Receiver TU */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_TUSIZE1(PIPE_A), TU_SIZE(64));
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
|
|
|
|
/* Enable PCH FDI Receiver with auto-training */
|
|
|
|
rx_ctl_val |= FDI_RX_ENABLE | FDI_LINK_TRAIN_AUTO;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_CTL(PIPE_A), rx_ctl_val);
|
|
|
|
intel_de_posting_read(dev_priv, FDI_RX_CTL(PIPE_A));
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
|
|
|
|
/* Wait for FDI receiver lane calibration */
|
|
|
|
udelay(30);
|
|
|
|
|
|
|
|
/* Unset FDI_RX_MISC pwrdn lanes */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
temp = intel_de_read(dev_priv, FDI_RX_MISC(PIPE_A));
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
temp &= ~(FDI_RX_PWRDN_LANE1_MASK | FDI_RX_PWRDN_LANE0_MASK);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_MISC(PIPE_A), temp);
|
|
|
|
intel_de_posting_read(dev_priv, FDI_RX_MISC(PIPE_A));
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
|
|
|
|
/* Wait for FDI auto training time */
|
|
|
|
udelay(5);
|
2012-05-09 18:37:21 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
temp = intel_de_read(dev_priv, DP_TP_STATUS(PORT_E));
|
2012-05-09 18:37:21 +00:00
|
|
|
if (temp & DP_TP_STATUS_AUTOTRAIN_DONE) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"FDI link training done on step %d\n", i);
|
2015-12-04 20:22:50 +00:00
|
|
|
break;
|
|
|
|
}
|
2012-05-09 18:37:21 +00:00
|
|
|
|
2015-12-04 20:22:50 +00:00
|
|
|
/*
|
|
|
|
* Leave things enabled even if we failed to train FDI.
|
|
|
|
* Results in less fireworks from the state checker.
|
|
|
|
*/
|
|
|
|
if (i == ARRAY_SIZE(hsw_ddi_translations_fdi) * 2 - 1) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_err(&dev_priv->drm, "FDI link training failed!\n");
|
2015-12-04 20:22:50 +00:00
|
|
|
break;
|
2012-05-09 18:37:21 +00:00
|
|
|
}
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
|
drm/i915: Disable FDI RX before DDI_BUF_CTL
Bspec is confused w.r.t. the HSW/BDW FDI disable sequence. It lists
FDI RX disable both as step 13 and step 18 in the sequence. But I dug
up an old BUN mail from Art that moved the FDI RX disable to happen
before DDI_BUF_CTL disable. That BUN did not renumber the steps and just
added a note:
"Workaround: Disable PCH FDI Receiver before disabling DDI_BUF_CTL."
The BUN described the symptoms of the fixed issue as:
"PCH display underflow and a black screen on the analog CRT port that
happened after a FDI re-train"
I suppose later someone tried to renumber the steps to match, but forgot
to remove the FDI RX disable from its old position in the sequence.
They also forgot to update the note describing what should be done in
case of an FDI training failure. Currently it says:
"To retry FDI training, follow the Disable Sequence steps to Disable FDI,
but skip the steps related to clocks and PLLs (16, 19, and 20), ..."
It should really say "17, 20, and 21" with the current sequence because
those are the steps that deal with PLLs and whatnot, after step 13 became
FDI RX disable. And had the step 18 FDI RX disable been removed, as I
suspect it should have, the note should actually say "17, 19, and 20".
So, let's move the FDI RX disable to happen before DDI_BUF_CTL disable,
as that would appear to be the correct order based on the BUN.
Note that Art has since unconfused the spec, and so this patch should
now match the steps listed in the spec.
v2: Add a note that the spec is now correct
Cc: Paulo Zanoni <przanoni@gmail.com>
Cc: Art Runyan <arthur.j.runyan@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456841783-4779-1-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
2016-03-01 14:16:23 +00:00
|
|
|
rx_ctl_val &= ~FDI_RX_ENABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_CTL(PIPE_A), rx_ctl_val);
|
|
|
|
intel_de_posting_read(dev_priv, FDI_RX_CTL(PIPE_A));
|
drm/i915: Disable FDI RX before DDI_BUF_CTL
Bspec is confused w.r.t. the HSW/BDW FDI disable sequence. It lists
FDI RX disable both as step 13 and step 18 in the sequence. But I dug
up an old BUN mail from Art that moved the FDI RX disable to happen
before DDI_BUF_CTL disable. That BUN did not renumber the steps and just
added a note:
"Workaround: Disable PCH FDI Receiver before disabling DDI_BUF_CTL."
The BUN described the symptoms of the fixed issue as:
"PCH display underflow and a black screen on the analog CRT port that
happened after a FDI re-train"
I suppose later someone tried to renumber the steps to match, but forgot
to remove the FDI RX disable from its old position in the sequence.
They also forgot to update the note describing what should be done in
case of an FDI training failure. Currently it says:
"To retry FDI training, follow the Disable Sequence steps to Disable FDI,
but skip the steps related to clocks and PLLs (16, 19, and 20), ..."
It should really say "17, 20, and 21" with the current sequence because
those are the steps that deal with PLLs and whatnot, after step 13 became
FDI RX disable. And had the step 18 FDI RX disable been removed, as I
suspect it should have, the note should actually say "17, 19, and 20".
So, let's move the FDI RX disable to happen before DDI_BUF_CTL disable,
as that would appear to be the correct order based on the BUN.
Note that Art has since unconfused the spec, and so this patch should
now match the steps listed in the spec.
v2: Add a note that the spec is now correct
Cc: Paulo Zanoni <przanoni@gmail.com>
Cc: Art Runyan <arthur.j.runyan@intel.com>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1456841783-4779-1-git-send-email-ville.syrjala@linux.intel.com
Reviewed-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
2016-03-01 14:16:23 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
temp = intel_de_read(dev_priv, DDI_BUF_CTL(PORT_E));
|
2012-11-29 13:29:31 +00:00
|
|
|
temp &= ~DDI_BUF_CTL_ENABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_BUF_CTL(PORT_E), temp);
|
|
|
|
intel_de_posting_read(dev_priv, DDI_BUF_CTL(PORT_E));
|
2012-11-29 13:29:31 +00:00
|
|
|
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
/* Disable DP_TP_CTL and FDI_RX_CTL and retry */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
temp = intel_de_read(dev_priv, DP_TP_CTL(PORT_E));
|
2012-11-29 13:29:31 +00:00
|
|
|
temp &= ~(DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_MASK);
|
|
|
|
temp |= DP_TP_CTL_LINK_TRAIN_PAT1;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DP_TP_CTL(PORT_E), temp);
|
|
|
|
intel_de_posting_read(dev_priv, DP_TP_CTL(PORT_E));
|
2012-11-29 13:29:31 +00:00
|
|
|
|
|
|
|
intel_wait_ddi_buf_idle(dev_priv, PORT_E);
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
|
|
|
|
/* Reset FDI_RX_MISC pwrdn lanes */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
temp = intel_de_read(dev_priv, FDI_RX_MISC(PIPE_A));
|
drm/i915: fix Haswell FDI link training code
This commit makes hsw_fdi_link_train responsible for implementing
everything described in the "Enable and train FDI" section from the
Hawell CRT mode set sequence documentation. We completely rewrite
hsw_fdi_link_train to match the documentation and we also call it in
the right place.
This patch was initially sent as a series of tiny patches fixing every
little problem of the function, but since there were too many patches
fixing the same function it got a little difficult to get the "big
picture" of how the function would be in the end, so here we amended
all the patches into a single big patch fixing the whole function.
Problems we fixed:
1 - Train Haswell FDI at the right time.
We need to train the FDI before enabling the pipes and planes, so
we're moving the call from lpt_pch_enable to haswell_crtc_enable
directly.
We are also removing ironlake_fdi_pll_enable since the PLL
enablement on Haswell is completely different and is also done
during the link training steps.
2 - Use the right FDI_RX_CTL register on Haswell
There is only one PCH transcoder, so it's always _FDI_RXA_CTL.
Using "pipe" here is wrong.
3 - Don't rely on DDI_BUF_CTL previous values
Just set the bits we want, everything else is zero. Also
POSTING_READ the register before sleeping.
4 - Program the FDI RX TUSIZE register on hsw_fdi_link_train
According to the mode set sequence documentation, this is the
right place. According to the FDI_RX_TUSIZE register description,
this is the value we should set.
Also remove the code that sets this register from the old
location: lpt_pch_enable.
5 - Properly program FDI_RX_MISC pwrdn lane values on HSW
6 - Wait only 35us for the FDI link training
First we wait 30us for the FDI receiver lane calibration, then we
wait 5us for the FDI auto training time.
7 - Remove an useless indentation level on hsw_fdi_link_train
We already "break" when the link training succeeds.
8 - Disable FDI_RX_ENABLE, not FDI_RX_PLL_ENABLE
When we fail the training.
9 - Change Haswell FDI link training error messages
We shouldn't call DRM_ERROR when still looping through voltage
levels since this is expected and not really a failure. So in this
commit we adjust the error path to only DRM_ERROR when we really
fail after trying everything.
While at it, replace DRM_DEBUG_DRIVER with DRM_DEBUG_KMS since
it's what we use everywhere.
10 - Try each voltage twice at hsw_fdi_link_train
Now with Daniel Vetter's suggestion to use "/2" instead of ">>1".
Signed-off-by: Paulo Zanoni <paulo.r.zanoni@intel.com>
[danvet: Applied tiny bikesheds:
- mention in comment that we test each voltage/emphasis level twice
- realing arguments of the only untouched reg write, it spilled over
the 80 char limit ...]
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2012-11-01 23:00:59 +00:00
|
|
|
temp &= ~(FDI_RX_PWRDN_LANE1_MASK | FDI_RX_PWRDN_LANE0_MASK);
|
|
|
|
temp |= FDI_RX_PWRDN_LANE1_VAL(2) | FDI_RX_PWRDN_LANE0_VAL(2);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_MISC(PIPE_A), temp);
|
|
|
|
intel_de_posting_read(dev_priv, FDI_RX_MISC(PIPE_A));
|
2012-05-09 18:37:21 +00:00
|
|
|
}
|
|
|
|
|
2015-12-04 20:22:50 +00:00
|
|
|
/* Enable normal pixel sending for FDI */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DP_TP_CTL(PORT_E),
|
2020-04-20 20:06:10 +00:00
|
|
|
DP_TP_CTL_FDI_AUTOTRAIN |
|
|
|
|
DP_TP_CTL_LINK_TRAIN_NORMAL |
|
|
|
|
DP_TP_CTL_ENHANCED_FRAME_ENABLE |
|
|
|
|
DP_TP_CTL_ENABLE);
|
2012-05-09 18:37:21 +00:00
|
|
|
}
|
2012-05-09 18:37:27 +00:00
|
|
|
|
2017-03-30 20:57:52 +00:00
|
|
|
static void intel_ddi_init_dp_buf_reg(struct intel_encoder *encoder)
|
2014-05-02 03:36:43 +00:00
|
|
|
{
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2020-07-01 04:50:54 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2014-05-02 03:36:43 +00:00
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
intel_dp->DP = dig_port->saved_port_bits |
|
2014-08-11 03:27:36 +00:00
|
|
|
DDI_BUF_CTL_ENABLE | DDI_BUF_TRANS_SELECT(0);
|
2015-08-17 15:05:12 +00:00
|
|
|
intel_dp->DP |= DDI_PORT_WIDTH(intel_dp->lane_count);
|
2014-05-02 03:36:43 +00:00
|
|
|
}
|
|
|
|
|
2018-08-17 21:52:09 +00:00
|
|
|
static int icl_calc_tbt_pll_link(struct drm_i915_private *dev_priv,
|
|
|
|
enum port port)
|
|
|
|
{
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
u32 val = intel_de_read(dev_priv, DDI_CLK_SEL(port)) & DDI_CLK_SEL_MASK;
|
2018-08-17 21:52:09 +00:00
|
|
|
|
|
|
|
switch (val) {
|
|
|
|
case DDI_CLK_SEL_NONE:
|
|
|
|
return 0;
|
|
|
|
case DDI_CLK_SEL_TBT_162:
|
|
|
|
return 162000;
|
|
|
|
case DDI_CLK_SEL_TBT_270:
|
|
|
|
return 270000;
|
|
|
|
case DDI_CLK_SEL_TBT_540:
|
|
|
|
return 540000;
|
|
|
|
case DDI_CLK_SEL_TBT_810:
|
|
|
|
return 810000;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(val);
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2015-06-30 12:33:51 +00:00
|
|
|
static void ddi_dotclock_get(struct intel_crtc_state *pipe_config)
|
|
|
|
{
|
|
|
|
int dotclock;
|
|
|
|
|
|
|
|
if (pipe_config->has_pch_encoder)
|
|
|
|
dotclock = intel_dotclock_calculate(pipe_config->port_clock,
|
|
|
|
&pipe_config->fdi_m_n);
|
2016-06-22 18:57:04 +00:00
|
|
|
else if (intel_crtc_has_dp_encoder(pipe_config))
|
2015-06-30 12:33:51 +00:00
|
|
|
dotclock = intel_dotclock_calculate(pipe_config->port_clock,
|
|
|
|
&pipe_config->dp_m_n);
|
2019-08-08 16:25:47 +00:00
|
|
|
else if (pipe_config->has_hdmi_sink && pipe_config->pipe_bpp > 24)
|
|
|
|
dotclock = pipe_config->port_clock * 24 / pipe_config->pipe_bpp;
|
2015-06-30 12:33:51 +00:00
|
|
|
else
|
|
|
|
dotclock = pipe_config->port_clock;
|
|
|
|
|
2019-05-21 12:17:20 +00:00
|
|
|
if (pipe_config->output_format == INTEL_OUTPUT_FORMAT_YCBCR420 &&
|
|
|
|
!intel_crtc_has_dp_encoder(pipe_config))
|
2017-07-24 13:49:32 +00:00
|
|
|
dotclock *= 2;
|
|
|
|
|
2015-06-30 12:33:51 +00:00
|
|
|
if (pipe_config->pixel_multiplier)
|
|
|
|
dotclock /= pipe_config->pixel_multiplier;
|
|
|
|
|
2019-10-31 11:26:02 +00:00
|
|
|
pipe_config->hw.adjusted_mode.crtc_clock = dotclock;
|
2015-06-30 12:33:51 +00:00
|
|
|
}
|
2014-11-13 14:55:16 +00:00
|
|
|
|
2017-10-27 19:31:28 +00:00
|
|
|
static void intel_ddi_clock_get(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *pipe_config)
|
2014-07-29 18:57:08 +00:00
|
|
|
{
|
2016-10-13 10:03:02 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2020-03-03 19:50:43 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2014-12-12 14:26:57 +00:00
|
|
|
|
2020-03-03 19:50:43 +00:00
|
|
|
if (intel_phy_is_tc(dev_priv, phy) &&
|
2020-02-26 20:34:48 +00:00
|
|
|
intel_get_shared_dpll_id(dev_priv, pipe_config->shared_dpll) ==
|
|
|
|
DPLL_ID_ICL_TBTPLL)
|
|
|
|
pipe_config->port_clock = icl_calc_tbt_pll_link(dev_priv,
|
|
|
|
encoder->port);
|
|
|
|
else
|
2020-02-26 20:34:53 +00:00
|
|
|
pipe_config->port_clock =
|
|
|
|
intel_dpll_get_freq(dev_priv, pipe_config->shared_dpll);
|
2020-02-26 20:34:48 +00:00
|
|
|
|
|
|
|
ddi_dotclock_get(pipe_config);
|
2014-07-29 18:57:08 +00:00
|
|
|
}
|
|
|
|
|
2019-09-19 19:53:05 +00:00
|
|
|
void intel_ddi_set_dp_msa(const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2012-10-15 18:51:30 +00:00
|
|
|
{
|
2019-10-31 11:26:03 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2017-03-02 12:58:55 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
2017-03-02 12:58:56 +00:00
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2017-10-19 13:37:12 +00:00
|
|
|
u32 temp;
|
2012-10-15 18:51:30 +00:00
|
|
|
|
2017-10-19 13:37:12 +00:00
|
|
|
if (!intel_crtc_has_dp_encoder(crtc_state))
|
|
|
|
return;
|
2016-03-18 15:05:42 +00:00
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, transcoder_is_dsi(cpu_transcoder));
|
2017-10-19 13:37:12 +00:00
|
|
|
|
2019-07-18 14:50:47 +00:00
|
|
|
temp = DP_MSA_MISC_SYNC_CLOCK;
|
drm/i915: set DP Main Stream Attribute for color range on DDI platforms
Since Haswell we have no color range indication either in the pipe or
port registers for DP. Instead, there's a separate register for setting
the DP Main Stream Attributes (MSA) directly. The MSA register
definition makes no references to colorimetry, just a vague reference to
the DP spec. The connection to the color range was lost.
Apparently we've failed to set the proper MSA bit for limited, or CEA,
range ever since the first DDI platforms. We've started setting other
MSA parameters since commit dae847991a43 ("drm/i915: add
intel_ddi_set_pipe_settings").
Without the crucial bit of information, the DP sink has no way of
knowing the source is actually transmitting limited range RGB, leading
to "washed out" colors. With the colorimetry information, compliant
sinks should be able to handle the limited range properly. Native
(i.e. non-LSPCON) HDMI was not affected because we do pass the color
range via AVI infoframes.
Though not the root cause, the problem was made worse for DDI platforms
with commit 55bc60db5988 ("drm/i915: Add "Automatic" mode for the
"Broadcast RGB" property"), which selects limited range RGB
automatically based on the mode, as per the DP, HDMI and CEA specs.
After all these years, the fix boils down to flipping one bit.
[Per testing reports, this fixes DP sinks, but not the LSPCON. My
educated guess is that the LSPCON fails to turn the CEA range MSA into
AVI infoframes for HDMI.]
Reported-by: Michał Kopeć <mkopec12@gmail.com>
Reported-by: N. W. <nw9165-3201@yahoo.com>
Reported-by: Nicholas Stommel <nicholas.stommel@gmail.com>
Reported-by: Tom Yan <tom.ty89@gmail.com>
Tested-by: Nicholas Stommel <nicholas.stommel@gmail.com>
References: https://bugs.freedesktop.org/show_bug.cgi?id=100023
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=107476
Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=94921
Cc: Paulo Zanoni <paulo.r.zanoni@intel.com>
Cc: Rodrigo Vivi <rodrigo.vivi@intel.com>
Cc: Ville Syrjälä <ville.syrjala@linux.intel.com>
Cc: <stable@vger.kernel.org> # v3.9+
Reviewed-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20180814060001.18224-1-jani.nikula@intel.com
2018-08-14 06:00:01 +00:00
|
|
|
|
2017-10-19 13:37:12 +00:00
|
|
|
switch (crtc_state->pipe_bpp) {
|
|
|
|
case 18:
|
2019-07-18 14:50:47 +00:00
|
|
|
temp |= DP_MSA_MISC_6_BPC;
|
2017-10-19 13:37:12 +00:00
|
|
|
break;
|
|
|
|
case 24:
|
2019-07-18 14:50:47 +00:00
|
|
|
temp |= DP_MSA_MISC_8_BPC;
|
2017-10-19 13:37:12 +00:00
|
|
|
break;
|
|
|
|
case 30:
|
2019-07-18 14:50:47 +00:00
|
|
|
temp |= DP_MSA_MISC_10_BPC;
|
2017-10-19 13:37:12 +00:00
|
|
|
break;
|
|
|
|
case 36:
|
2019-07-18 14:50:47 +00:00
|
|
|
temp |= DP_MSA_MISC_12_BPC;
|
2017-10-19 13:37:12 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(crtc_state->pipe_bpp);
|
|
|
|
break;
|
2012-10-15 18:51:30 +00:00
|
|
|
}
|
2017-10-19 13:37:12 +00:00
|
|
|
|
2019-07-18 16:45:23 +00:00
|
|
|
/* nonsense combination */
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, crtc_state->limited_color_range &&
|
|
|
|
crtc_state->output_format != INTEL_OUTPUT_FORMAT_RGB);
|
2019-07-18 16:45:23 +00:00
|
|
|
|
|
|
|
if (crtc_state->limited_color_range)
|
2019-07-18 14:50:47 +00:00
|
|
|
temp |= DP_MSA_MISC_COLOR_CEA_RGB;
|
2019-07-18 16:45:23 +00:00
|
|
|
|
2018-10-12 06:23:14 +00:00
|
|
|
/*
|
|
|
|
* As per DP 1.2 spec section 2.3.4.3 while sending
|
|
|
|
* YCBCR 444 signals we should program MSA MISC1/0 fields with
|
2019-07-18 14:50:43 +00:00
|
|
|
* colorspace information.
|
2018-10-12 06:23:14 +00:00
|
|
|
*/
|
|
|
|
if (crtc_state->output_format == INTEL_OUTPUT_FORMAT_YCBCR444)
|
2019-07-18 14:50:47 +00:00
|
|
|
temp |= DP_MSA_MISC_COLOR_YCBCR_444_BT709;
|
2019-07-18 14:50:43 +00:00
|
|
|
|
2019-05-21 12:17:19 +00:00
|
|
|
/*
|
|
|
|
* As per DP 1.4a spec section 2.2.4.3 [MSA Field for Indication
|
|
|
|
* of Color Encoding Format and Content Color Gamut] while sending
|
2019-09-19 19:53:05 +00:00
|
|
|
* YCBCR 420, HDR BT.2020 signals we should program MSA MISC1 fields
|
|
|
|
* which indicate VSC SDP for the Pixel Encoding/Colorimetry Format.
|
2019-05-21 12:17:19 +00:00
|
|
|
*/
|
2019-11-06 21:26:36 +00:00
|
|
|
if (intel_dp_needs_vsc_sdp(crtc_state, conn_state))
|
2019-07-18 14:50:47 +00:00
|
|
|
temp |= DP_MSA_MISC_COLOR_VSC_SDP;
|
2019-09-19 19:53:05 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, TRANS_MSA_MISC(cpu_transcoder), temp);
|
2012-10-15 18:51:30 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
static u32 bdw_trans_port_sync_master_select(enum transcoder master_transcoder)
|
|
|
|
{
|
|
|
|
if (master_transcoder == TRANSCODER_EDP)
|
|
|
|
return 0;
|
|
|
|
else
|
|
|
|
return master_transcoder + 1;
|
|
|
|
}
|
|
|
|
|
2019-08-23 08:20:47 +00:00
|
|
|
/*
|
|
|
|
* Returns the TRANS_DDI_FUNC_CTL value based on CRTC state.
|
|
|
|
*
|
|
|
|
* Only intended to be used by intel_ddi_enable_transcoder_func() and
|
|
|
|
* intel_ddi_config_transcoder_func().
|
|
|
|
*/
|
|
|
|
static u32
|
2020-04-17 13:47:20 +00:00
|
|
|
intel_ddi_transcoder_func_reg_val_get(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2012-10-05 15:05:53 +00:00
|
|
|
{
|
2019-10-31 11:26:03 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2017-03-02 12:58:55 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
|
|
|
enum pipe pipe = crtc->pipe;
|
2017-03-02 12:58:56 +00:00
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2019-01-18 12:01:21 +00:00
|
|
|
u32 temp;
|
2012-10-05 15:05:53 +00:00
|
|
|
|
2012-10-24 18:06:19 +00:00
|
|
|
/* Enable TRANS_DDI_FUNC_CTL for the pipe to work in HDMI mode */
|
|
|
|
temp = TRANS_DDI_FUNC_ENABLE;
|
2019-07-13 01:09:20 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12)
|
|
|
|
temp |= TGL_TRANS_DDI_SELECT_PORT(port);
|
|
|
|
else
|
|
|
|
temp |= TRANS_DDI_SELECT_PORT(port);
|
2012-08-08 17:15:29 +00:00
|
|
|
|
2017-03-02 12:58:56 +00:00
|
|
|
switch (crtc_state->pipe_bpp) {
|
2012-08-08 17:15:29 +00:00
|
|
|
case 18:
|
2012-10-24 18:06:19 +00:00
|
|
|
temp |= TRANS_DDI_BPC_6;
|
2012-08-08 17:15:29 +00:00
|
|
|
break;
|
|
|
|
case 24:
|
2012-10-24 18:06:19 +00:00
|
|
|
temp |= TRANS_DDI_BPC_8;
|
2012-08-08 17:15:29 +00:00
|
|
|
break;
|
|
|
|
case 30:
|
2012-10-24 18:06:19 +00:00
|
|
|
temp |= TRANS_DDI_BPC_10;
|
2012-08-08 17:15:29 +00:00
|
|
|
break;
|
|
|
|
case 36:
|
2012-10-24 18:06:19 +00:00
|
|
|
temp |= TRANS_DDI_BPC_12;
|
2012-08-08 17:15:29 +00:00
|
|
|
break;
|
|
|
|
default:
|
drm/i915: precompute pipe bpp before touching the hw
The procedure has now 3 steps:
1. Compute the bpp that the plane will output, this is done in
pipe_config_set_bpp and stored into pipe_config->pipe_bpp. Also,
this function clamps the pipe_bpp to whatever limit the EDID of any
connected output specifies.
2. Adjust the pipe_bpp in the encoder and crtc functions, according to
whatever constraints there are.
3. Decide whether to use dither by comparing the stored plane bpp with
computed pipe_bpp.
There are a few slight functional changes in this patch:
- LVDS connector are now also going through the EDID clamping. But in
a 2nd change we now unconditionally force the lvds bpc value - this
shouldn't matter in reality when the panel setup is consistent, but
better safe than sorry.
- HDMI now forces the pipe_bpp to the selected value - I think that's
what we actually want, since otherwise at least the pixelclock
computations are wrong (I'm not sure whether the port would accept
e.g. 10 bpc when in 12bpc mode). Contrary to the old code, we pick
the next higher bpc value, since otherwise there's no way to make
use of the 12 bpc mode (since the next patch will remove the 12bpc
plane format, it doesn't exist).
Both of these changes are due to the removal of the
pipe_bpp = min(display_bpp, plane_bpp);
statement.
Another slight change is the reworking of the dp bpc code:
- For the mode_valid callback it's sufficient to only check whether
the mode would fit at the lowest bpc.
- The bandwidth computation code is a bit restructured: It now walks
all available bpp values in an outer loop and the codeblock that
computes derived values (once a good configuration is found) has been
moved out of the for loop maze. This is prep work to allow us to
successively fall back on bpc values, and also correctly support bpc
values != 8 or 6.
v2: Rebased on top of Paulo Zanoni's little refactoring to use more
drm dp helper functions.
v3: Rebased on top of Jani's eDP bpp fix and Ville's limited color
range work.
v4: Remove the INTEL_MODE_DP_FORCE_6BPC #define, no longer needed.
v5: Remove intel_crtc->bpp, too, and fix up the 12bpc check in the
hdmi code. Also fixup the bpp check in intel_dp.c, it'll get reworked
in a later patch though again.
v6: Fix spelling in a comment.
v7: Debug output improvements for the bpp computation.
v8: Fixup 6bpc lvds check - dual-link and 8bpc mode are different
things!
v9: Reinstate the fix to properly ignore the firmware edp bpp ... this
was lost in a rebase.
v10: Both g4x and vlv lack 12bpc pipes, so don't enforce that we have
that. Still unsure whether this is the way to go, but at least 6bpc
for a 8bpc hdmi output seems to work.
v11: And g4x/vlv also lack 12bpc hdmi support, so only support high
depth on DP. Adjust the code.
v12: Rebased.
v13: Split out the introduction of pipe_config->dither|pipe_bpp, as
requested from Jesse Barnes.
v14: Split out the special 6BPC handling for DP, as requested by Jesse
Barnes.
Reviewed-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
2013-03-26 23:44:58 +00:00
|
|
|
BUG();
|
2012-08-08 17:15:29 +00:00
|
|
|
}
|
2012-05-09 18:37:31 +00:00
|
|
|
|
2019-10-31 11:26:02 +00:00
|
|
|
if (crtc_state->hw.adjusted_mode.flags & DRM_MODE_FLAG_PVSYNC)
|
2012-10-24 18:06:19 +00:00
|
|
|
temp |= TRANS_DDI_PVSYNC;
|
2019-10-31 11:26:02 +00:00
|
|
|
if (crtc_state->hw.adjusted_mode.flags & DRM_MODE_FLAG_PHSYNC)
|
2012-10-24 18:06:19 +00:00
|
|
|
temp |= TRANS_DDI_PHSYNC;
|
2012-08-08 17:15:28 +00:00
|
|
|
|
2012-10-23 20:30:04 +00:00
|
|
|
if (cpu_transcoder == TRANSCODER_EDP) {
|
|
|
|
switch (pipe) {
|
|
|
|
case PIPE_A:
|
2013-11-03 04:07:37 +00:00
|
|
|
/* On Haswell, can only use the always-on power well for
|
|
|
|
* eDP when not using the panel fitter, and when not
|
|
|
|
* using motion blur mitigation (which we don't
|
|
|
|
* support). */
|
2019-04-25 16:29:06 +00:00
|
|
|
if (crtc_state->pch_pfit.force_thru)
|
2013-01-29 18:35:20 +00:00
|
|
|
temp |= TRANS_DDI_EDP_INPUT_A_ONOFF;
|
|
|
|
else
|
|
|
|
temp |= TRANS_DDI_EDP_INPUT_A_ON;
|
2012-10-23 20:30:04 +00:00
|
|
|
break;
|
|
|
|
case PIPE_B:
|
|
|
|
temp |= TRANS_DDI_EDP_INPUT_B_ONOFF;
|
|
|
|
break;
|
|
|
|
case PIPE_C:
|
|
|
|
temp |= TRANS_DDI_EDP_INPUT_C_ONOFF;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
BUG();
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-10-19 13:37:15 +00:00
|
|
|
if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
|
2017-03-02 12:58:56 +00:00
|
|
|
if (crtc_state->has_hdmi_sink)
|
2012-10-24 18:06:19 +00:00
|
|
|
temp |= TRANS_DDI_MODE_SELECT_HDMI;
|
2012-10-05 15:05:53 +00:00
|
|
|
else
|
2012-10-24 18:06:19 +00:00
|
|
|
temp |= TRANS_DDI_MODE_SELECT_DVI;
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 11:24:03 +00:00
|
|
|
|
|
|
|
if (crtc_state->hdmi_scrambling)
|
2018-12-10 22:52:54 +00:00
|
|
|
temp |= TRANS_DDI_HDMI_SCRAMBLING;
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 11:24:03 +00:00
|
|
|
if (crtc_state->hdmi_high_tmds_clock_ratio)
|
|
|
|
temp |= TRANS_DDI_HIGH_TMDS_CHAR_RATE;
|
2017-10-19 13:37:15 +00:00
|
|
|
} else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_ANALOG)) {
|
2012-10-24 18:06:19 +00:00
|
|
|
temp |= TRANS_DDI_MODE_SELECT_FDI;
|
2017-03-02 12:58:56 +00:00
|
|
|
temp |= (crtc_state->fdi_lanes - 1) << 1;
|
2017-10-19 13:37:15 +00:00
|
|
|
} else if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) {
|
2016-07-28 14:50:39 +00:00
|
|
|
temp |= TRANS_DDI_MODE_SELECT_DP_MST;
|
2017-03-02 12:58:56 +00:00
|
|
|
temp |= DDI_PORT_WIDTH(crtc_state->lane_count);
|
2019-10-29 03:50:49 +00:00
|
|
|
|
2019-12-23 01:06:49 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12) {
|
|
|
|
enum transcoder master;
|
|
|
|
|
|
|
|
master = crtc_state->mst_master_transcoder;
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm,
|
|
|
|
master == INVALID_TRANSCODER);
|
2019-12-23 01:06:49 +00:00
|
|
|
temp |= TRANS_DDI_MST_TRANSPORT_SELECT(master);
|
|
|
|
}
|
2012-10-05 15:05:53 +00:00
|
|
|
} else {
|
2017-10-19 13:37:15 +00:00
|
|
|
temp |= TRANS_DDI_MODE_SELECT_DP_SST;
|
|
|
|
temp |= DDI_PORT_WIDTH(crtc_state->lane_count);
|
2012-10-05 15:05:53 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
if (IS_GEN_RANGE(dev_priv, 8, 10) &&
|
|
|
|
crtc_state->master_transcoder != INVALID_TRANSCODER) {
|
|
|
|
u8 master_select =
|
|
|
|
bdw_trans_port_sync_master_select(crtc_state->master_transcoder);
|
|
|
|
|
|
|
|
temp |= TRANS_DDI_PORT_SYNC_ENABLE |
|
|
|
|
TRANS_DDI_PORT_SYNC_MASTER_SELECT(master_select);
|
|
|
|
}
|
|
|
|
|
2019-08-23 08:20:47 +00:00
|
|
|
return temp;
|
|
|
|
}
|
|
|
|
|
2020-04-17 13:47:20 +00:00
|
|
|
void intel_ddi_enable_transcoder_func(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2019-08-23 08:20:47 +00:00
|
|
|
{
|
2019-10-31 11:26:03 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2019-08-23 08:20:47 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2020-03-13 16:48:20 +00:00
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 11) {
|
|
|
|
enum transcoder master_transcoder = crtc_state->master_transcoder;
|
|
|
|
u32 ctl2 = 0;
|
|
|
|
|
|
|
|
if (master_transcoder != INVALID_TRANSCODER) {
|
2020-03-13 16:48:26 +00:00
|
|
|
u8 master_select =
|
|
|
|
bdw_trans_port_sync_master_select(master_transcoder);
|
2019-08-23 08:20:47 +00:00
|
|
|
|
2020-03-13 16:48:20 +00:00
|
|
|
ctl2 |= PORT_SYNC_MODE_ENABLE |
|
2020-03-13 16:48:23 +00:00
|
|
|
PORT_SYNC_MODE_MASTER_SELECT(master_select);
|
2020-03-13 16:48:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
intel_de_write(dev_priv,
|
|
|
|
TRANS_DDI_FUNC_CTL2(cpu_transcoder), ctl2);
|
|
|
|
}
|
|
|
|
|
2020-06-23 08:24:11 +00:00
|
|
|
intel_de_write(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder),
|
|
|
|
intel_ddi_transcoder_func_reg_val_get(encoder,
|
|
|
|
crtc_state));
|
2019-08-23 08:20:47 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Same as intel_ddi_enable_transcoder_func(), but it does not set the enable
|
|
|
|
* bit.
|
|
|
|
*/
|
|
|
|
static void
|
2020-04-17 13:47:20 +00:00
|
|
|
intel_ddi_config_transcoder_func(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2019-08-23 08:20:47 +00:00
|
|
|
{
|
2019-10-31 11:26:03 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2019-08-23 08:20:47 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2020-03-13 16:48:20 +00:00
|
|
|
u32 ctl;
|
2019-08-23 08:20:47 +00:00
|
|
|
|
2020-04-17 13:47:20 +00:00
|
|
|
ctl = intel_ddi_transcoder_func_reg_val_get(encoder, crtc_state);
|
2020-03-13 16:48:20 +00:00
|
|
|
ctl &= ~TRANS_DDI_FUNC_ENABLE;
|
|
|
|
intel_de_write(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder), ctl);
|
2012-10-05 15:05:53 +00:00
|
|
|
}
|
2012-05-09 18:37:31 +00:00
|
|
|
|
2018-07-10 20:02:05 +00:00
|
|
|
void intel_ddi_disable_transcoder_func(const struct intel_crtc_state *crtc_state)
|
2012-10-05 15:05:53 +00:00
|
|
|
{
|
2019-10-31 11:26:03 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2018-07-10 20:02:05 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2020-03-13 16:48:20 +00:00
|
|
|
u32 ctl;
|
2019-12-23 01:06:51 +00:00
|
|
|
|
2020-03-13 16:48:20 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 11)
|
|
|
|
intel_de_write(dev_priv,
|
|
|
|
TRANS_DDI_FUNC_CTL2(cpu_transcoder), 0);
|
|
|
|
|
|
|
|
ctl = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder));
|
2020-03-13 16:48:26 +00:00
|
|
|
|
2020-03-13 16:48:20 +00:00
|
|
|
ctl &= ~TRANS_DDI_FUNC_ENABLE;
|
2012-10-05 15:05:53 +00:00
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
if (IS_GEN_RANGE(dev_priv, 8, 10))
|
|
|
|
ctl &= ~(TRANS_DDI_PORT_SYNC_ENABLE |
|
|
|
|
TRANS_DDI_PORT_SYNC_MASTER_SELECT_MASK);
|
|
|
|
|
2019-07-13 01:09:20 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12) {
|
2020-02-03 22:55:49 +00:00
|
|
|
if (!intel_dp_mst_is_master_trans(crtc_state)) {
|
2020-03-13 16:48:20 +00:00
|
|
|
ctl &= ~(TGL_TRANS_DDI_PORT_MASK |
|
2020-02-03 22:55:49 +00:00
|
|
|
TRANS_DDI_MODE_SELECT_MASK);
|
|
|
|
}
|
2019-07-13 01:09:20 +00:00
|
|
|
} else {
|
2020-03-13 16:48:20 +00:00
|
|
|
ctl &= ~(TRANS_DDI_PORT_MASK | TRANS_DDI_MODE_SELECT_MASK);
|
2019-07-13 01:09:20 +00:00
|
|
|
}
|
2020-03-13 16:48:26 +00:00
|
|
|
|
2020-03-13 16:48:20 +00:00
|
|
|
intel_de_write(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder), ctl);
|
2018-07-10 20:02:05 +00:00
|
|
|
|
|
|
|
if (dev_priv->quirks & QUIRK_INCREASE_DDI_DISABLED_TIME &&
|
|
|
|
intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Quirk Increase DDI disabled time\n");
|
2018-07-10 20:02:05 +00:00
|
|
|
/* Quirk time at 100ms for reliable operation */
|
|
|
|
msleep(100);
|
|
|
|
}
|
2012-05-09 18:37:31 +00:00
|
|
|
}
|
|
|
|
|
2018-01-08 19:55:42 +00:00
|
|
|
int intel_ddi_toggle_hdcp_signalling(struct intel_encoder *intel_encoder,
|
|
|
|
bool enable)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = intel_encoder->base.dev;
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_wakeref_t wakeref;
|
2018-01-08 19:55:42 +00:00
|
|
|
enum pipe pipe = 0;
|
|
|
|
int ret = 0;
|
2019-01-18 12:01:21 +00:00
|
|
|
u32 tmp;
|
2018-01-08 19:55:42 +00:00
|
|
|
|
2019-01-14 14:21:24 +00:00
|
|
|
wakeref = intel_display_power_get_if_enabled(dev_priv,
|
|
|
|
intel_encoder->power_domain);
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(dev, !wakeref))
|
2018-01-08 19:55:42 +00:00
|
|
|
return -ENXIO;
|
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(dev,
|
|
|
|
!intel_encoder->get_hw_state(intel_encoder, &pipe))) {
|
2018-01-08 19:55:42 +00:00
|
|
|
ret = -EIO;
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
tmp = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(pipe));
|
2018-01-08 19:55:42 +00:00
|
|
|
if (enable)
|
|
|
|
tmp |= TRANS_DDI_HDCP_SIGNALLING;
|
|
|
|
else
|
|
|
|
tmp &= ~TRANS_DDI_HDCP_SIGNALLING;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, TRANS_DDI_FUNC_CTL(pipe), tmp);
|
2018-01-08 19:55:42 +00:00
|
|
|
out:
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_display_power_put(dev_priv, intel_encoder->power_domain, wakeref);
|
2018-01-08 19:55:42 +00:00
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
2012-10-26 21:05:51 +00:00
|
|
|
bool intel_ddi_connector_get_hw_state(struct intel_connector *intel_connector)
|
|
|
|
{
|
|
|
|
struct drm_device *dev = intel_connector->base.dev;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2019-12-04 18:05:45 +00:00
|
|
|
struct intel_encoder *encoder = intel_attached_encoder(intel_connector);
|
2012-10-26 21:05:51 +00:00
|
|
|
int type = intel_connector->base.connector_type;
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2012-10-26 21:05:51 +00:00
|
|
|
enum transcoder cpu_transcoder;
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_wakeref_t wakeref;
|
|
|
|
enum pipe pipe = 0;
|
2019-01-18 12:01:21 +00:00
|
|
|
u32 tmp;
|
2016-02-12 16:55:16 +00:00
|
|
|
bool ret;
|
2012-10-26 21:05:51 +00:00
|
|
|
|
2019-01-14 14:21:24 +00:00
|
|
|
wakeref = intel_display_power_get_if_enabled(dev_priv,
|
|
|
|
encoder->power_domain);
|
|
|
|
if (!wakeref)
|
2014-04-01 17:55:12 +00:00
|
|
|
return false;
|
|
|
|
|
2017-03-09 13:43:41 +00:00
|
|
|
if (!encoder->get_hw_state(encoder, &pipe)) {
|
2016-02-12 16:55:16 +00:00
|
|
|
ret = false;
|
|
|
|
goto out;
|
|
|
|
}
|
2012-10-26 21:05:51 +00:00
|
|
|
|
2020-03-18 17:02:35 +00:00
|
|
|
if (HAS_TRANSCODER(dev_priv, TRANSCODER_EDP) && port == PORT_A)
|
2012-10-26 21:05:51 +00:00
|
|
|
cpu_transcoder = TRANSCODER_EDP;
|
|
|
|
else
|
2012-11-29 21:18:51 +00:00
|
|
|
cpu_transcoder = (enum transcoder) pipe;
|
2012-10-26 21:05:51 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
tmp = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder));
|
2012-10-26 21:05:51 +00:00
|
|
|
|
|
|
|
switch (tmp & TRANS_DDI_MODE_SELECT_MASK) {
|
|
|
|
case TRANS_DDI_MODE_SELECT_HDMI:
|
|
|
|
case TRANS_DDI_MODE_SELECT_DVI:
|
2016-02-12 16:55:16 +00:00
|
|
|
ret = type == DRM_MODE_CONNECTOR_HDMIA;
|
|
|
|
break;
|
2012-10-26 21:05:51 +00:00
|
|
|
|
|
|
|
case TRANS_DDI_MODE_SELECT_DP_SST:
|
2016-02-12 16:55:16 +00:00
|
|
|
ret = type == DRM_MODE_CONNECTOR_eDP ||
|
|
|
|
type == DRM_MODE_CONNECTOR_DisplayPort;
|
|
|
|
break;
|
|
|
|
|
2014-05-02 04:02:48 +00:00
|
|
|
case TRANS_DDI_MODE_SELECT_DP_MST:
|
|
|
|
/* if the transcoder is in MST state then
|
|
|
|
* connector isn't connected */
|
2016-02-12 16:55:16 +00:00
|
|
|
ret = false;
|
|
|
|
break;
|
2012-10-26 21:05:51 +00:00
|
|
|
|
|
|
|
case TRANS_DDI_MODE_SELECT_FDI:
|
2016-02-12 16:55:16 +00:00
|
|
|
ret = type == DRM_MODE_CONNECTOR_VGA;
|
|
|
|
break;
|
2012-10-26 21:05:51 +00:00
|
|
|
|
|
|
|
default:
|
2016-02-12 16:55:16 +00:00
|
|
|
ret = false;
|
|
|
|
break;
|
2012-10-26 21:05:51 +00:00
|
|
|
}
|
2016-02-12 16:55:16 +00:00
|
|
|
|
|
|
|
out:
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_display_power_put(dev_priv, encoder->power_domain, wakeref);
|
2016-02-12 16:55:16 +00:00
|
|
|
|
|
|
|
return ret;
|
2012-10-26 21:05:51 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 20:08:35 +00:00
|
|
|
static void intel_ddi_get_encoder_pipes(struct intel_encoder *encoder,
|
|
|
|
u8 *pipe_mask, bool *is_dp_mst)
|
2012-07-02 11:27:29 +00:00
|
|
|
{
|
|
|
|
struct drm_device *dev = encoder->base.dev;
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dev);
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_wakeref_t wakeref;
|
2017-11-09 08:37:50 +00:00
|
|
|
enum pipe p;
|
2012-07-02 11:27:29 +00:00
|
|
|
u32 tmp;
|
2018-11-07 20:08:35 +00:00
|
|
|
u8 mst_pipe_mask;
|
|
|
|
|
|
|
|
*pipe_mask = 0;
|
|
|
|
*is_dp_mst = false;
|
2012-07-02 11:27:29 +00:00
|
|
|
|
2019-01-14 14:21:24 +00:00
|
|
|
wakeref = intel_display_power_get_if_enabled(dev_priv,
|
|
|
|
encoder->power_domain);
|
|
|
|
if (!wakeref)
|
2018-11-07 20:08:35 +00:00
|
|
|
return;
|
2016-02-12 16:55:16 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
tmp = intel_de_read(dev_priv, DDI_BUF_CTL(port));
|
2012-07-02 11:27:29 +00:00
|
|
|
if (!(tmp & DDI_BUF_CTL_ENABLE))
|
2016-02-12 16:55:16 +00:00
|
|
|
goto out;
|
2012-07-02 11:27:29 +00:00
|
|
|
|
2020-03-18 17:02:35 +00:00
|
|
|
if (HAS_TRANSCODER(dev_priv, TRANSCODER_EDP) && port == PORT_A) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
tmp = intel_de_read(dev_priv,
|
|
|
|
TRANS_DDI_FUNC_CTL(TRANSCODER_EDP));
|
2012-07-02 11:27:29 +00:00
|
|
|
|
2012-10-24 18:06:19 +00:00
|
|
|
switch (tmp & TRANS_DDI_EDP_INPUT_MASK) {
|
2018-11-07 20:08:35 +00:00
|
|
|
default:
|
|
|
|
MISSING_CASE(tmp & TRANS_DDI_EDP_INPUT_MASK);
|
|
|
|
/* fallthrough */
|
2012-10-24 18:06:19 +00:00
|
|
|
case TRANS_DDI_EDP_INPUT_A_ON:
|
|
|
|
case TRANS_DDI_EDP_INPUT_A_ONOFF:
|
2018-11-07 20:08:35 +00:00
|
|
|
*pipe_mask = BIT(PIPE_A);
|
2012-10-24 18:06:19 +00:00
|
|
|
break;
|
|
|
|
case TRANS_DDI_EDP_INPUT_B_ONOFF:
|
2018-11-07 20:08:35 +00:00
|
|
|
*pipe_mask = BIT(PIPE_B);
|
2012-10-24 18:06:19 +00:00
|
|
|
break;
|
|
|
|
case TRANS_DDI_EDP_INPUT_C_ONOFF:
|
2018-11-07 20:08:35 +00:00
|
|
|
*pipe_mask = BIT(PIPE_C);
|
2012-10-24 18:06:19 +00:00
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
2016-02-12 16:55:16 +00:00
|
|
|
goto out;
|
|
|
|
}
|
2014-05-02 04:02:48 +00:00
|
|
|
|
2018-11-07 20:08:35 +00:00
|
|
|
mst_pipe_mask = 0;
|
2017-11-09 08:37:50 +00:00
|
|
|
for_each_pipe(dev_priv, p) {
|
2018-11-07 20:08:35 +00:00
|
|
|
enum transcoder cpu_transcoder = (enum transcoder)p;
|
2019-07-13 01:09:20 +00:00
|
|
|
unsigned int port_mask, ddi_select;
|
2019-08-08 00:49:34 +00:00
|
|
|
intel_wakeref_t trans_wakeref;
|
|
|
|
|
|
|
|
trans_wakeref = intel_display_power_get_if_enabled(dev_priv,
|
|
|
|
POWER_DOMAIN_TRANSCODER(cpu_transcoder));
|
|
|
|
if (!trans_wakeref)
|
|
|
|
continue;
|
2019-07-13 01:09:20 +00:00
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 12) {
|
|
|
|
port_mask = TGL_TRANS_DDI_PORT_MASK;
|
|
|
|
ddi_select = TGL_TRANS_DDI_SELECT_PORT(port);
|
|
|
|
} else {
|
|
|
|
port_mask = TRANS_DDI_PORT_MASK;
|
|
|
|
ddi_select = TRANS_DDI_SELECT_PORT(port);
|
|
|
|
}
|
2017-11-09 08:37:50 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
tmp = intel_de_read(dev_priv,
|
|
|
|
TRANS_DDI_FUNC_CTL(cpu_transcoder));
|
2019-08-08 00:49:34 +00:00
|
|
|
intel_display_power_put(dev_priv, POWER_DOMAIN_TRANSCODER(cpu_transcoder),
|
|
|
|
trans_wakeref);
|
2016-02-12 16:55:16 +00:00
|
|
|
|
2019-07-13 01:09:20 +00:00
|
|
|
if ((tmp & port_mask) != ddi_select)
|
2018-11-07 20:08:35 +00:00
|
|
|
continue;
|
2016-02-12 16:55:16 +00:00
|
|
|
|
2018-11-07 20:08:35 +00:00
|
|
|
if ((tmp & TRANS_DDI_MODE_SELECT_MASK) ==
|
|
|
|
TRANS_DDI_MODE_SELECT_DP_MST)
|
|
|
|
mst_pipe_mask |= BIT(p);
|
2016-02-12 16:55:16 +00:00
|
|
|
|
2018-11-07 20:08:35 +00:00
|
|
|
*pipe_mask |= BIT(p);
|
2012-07-02 11:27:29 +00:00
|
|
|
}
|
|
|
|
|
2018-11-07 20:08:35 +00:00
|
|
|
if (!*pipe_mask)
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"No pipe for [ENCODER:%d:%s] found\n",
|
|
|
|
encoder->base.base.id, encoder->base.name);
|
2018-11-07 20:08:35 +00:00
|
|
|
|
|
|
|
if (!mst_pipe_mask && hweight8(*pipe_mask) > 1) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Multiple pipes for [ENCODER:%d:%s] (pipe_mask %02x)\n",
|
|
|
|
encoder->base.base.id, encoder->base.name,
|
|
|
|
*pipe_mask);
|
2018-11-07 20:08:35 +00:00
|
|
|
*pipe_mask = BIT(ffs(*pipe_mask) - 1);
|
|
|
|
}
|
|
|
|
|
|
|
|
if (mst_pipe_mask && mst_pipe_mask != *pipe_mask)
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Conflicting MST and non-MST state for [ENCODER:%d:%s] (pipe_mask %02x mst_pipe_mask %02x)\n",
|
|
|
|
encoder->base.base.id, encoder->base.name,
|
|
|
|
*pipe_mask, mst_pipe_mask);
|
2018-11-07 20:08:35 +00:00
|
|
|
else
|
|
|
|
*is_dp_mst = mst_pipe_mask;
|
2012-07-02 11:27:29 +00:00
|
|
|
|
2016-02-12 16:55:16 +00:00
|
|
|
out:
|
2018-11-07 20:08:35 +00:00
|
|
|
if (*pipe_mask && IS_GEN9_LP(dev_priv)) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
tmp = intel_de_read(dev_priv, BXT_PHY_CTL(port));
|
2017-10-02 13:53:07 +00:00
|
|
|
if ((tmp & (BXT_PHY_CMNLANE_POWERDOWN_ACK |
|
|
|
|
BXT_PHY_LANE_POWERDOWN_ACK |
|
2016-06-13 13:44:37 +00:00
|
|
|
BXT_PHY_LANE_ENABLED)) != BXT_PHY_LANE_ENABLED)
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"[ENCODER:%d:%s] enabled but PHY powered down? (PHY_CTL %08x)\n",
|
|
|
|
encoder->base.base.id, encoder->base.name, tmp);
|
2016-06-13 13:44:37 +00:00
|
|
|
}
|
|
|
|
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_display_power_put(dev_priv, encoder->power_domain, wakeref);
|
2018-11-07 20:08:35 +00:00
|
|
|
}
|
2016-02-12 16:55:16 +00:00
|
|
|
|
2018-11-07 20:08:35 +00:00
|
|
|
bool intel_ddi_get_hw_state(struct intel_encoder *encoder,
|
|
|
|
enum pipe *pipe)
|
|
|
|
{
|
|
|
|
u8 pipe_mask;
|
|
|
|
bool is_mst;
|
|
|
|
|
|
|
|
intel_ddi_get_encoder_pipes(encoder, &pipe_mask, &is_mst);
|
|
|
|
|
|
|
|
if (is_mst || !pipe_mask)
|
|
|
|
return false;
|
|
|
|
|
|
|
|
*pipe = ffs(pipe_mask) - 1;
|
|
|
|
|
|
|
|
return true;
|
2012-07-02 11:27:29 +00:00
|
|
|
}
|
|
|
|
|
2020-04-20 14:04:38 +00:00
|
|
|
static enum intel_display_power_domain
|
2018-11-01 14:04:24 +00:00
|
|
|
intel_ddi_main_link_aux_domain(struct intel_digital_port *dig_port)
|
2018-06-21 18:44:49 +00:00
|
|
|
{
|
2018-09-14 00:18:22 +00:00
|
|
|
/* CNL+ HW requires corresponding AUX IOs to be powered up for PSR with
|
2018-06-21 18:44:49 +00:00
|
|
|
* DC states enabled at the same time, while for driver initiated AUX
|
|
|
|
* transfers we need the same AUX IOs to be powered but with DC states
|
|
|
|
* disabled. Accordingly use the AUX power domain here which leaves DC
|
|
|
|
* states enabled.
|
|
|
|
* However, for non-A AUX ports the corresponding non-EDP transcoders
|
|
|
|
* would have already enabled power well 2 and DC_OFF. This means we can
|
|
|
|
* acquire a wider POWER_DOMAIN_AUX_{B,C,D,F} reference instead of a
|
|
|
|
* specific AUX_IO reference without powering up any extra wells.
|
|
|
|
* Note that PSR is enabled only on Port A even though this function
|
|
|
|
* returns the correct domain for other ports too.
|
|
|
|
*/
|
2018-11-01 14:04:21 +00:00
|
|
|
return dig_port->aux_ch == AUX_CH_A ? POWER_DOMAIN_AUX_IO_A :
|
2018-11-01 14:04:23 +00:00
|
|
|
intel_aux_power_domain(dig_port);
|
2018-06-21 18:44:49 +00:00
|
|
|
}
|
|
|
|
|
2019-04-07 12:46:55 +00:00
|
|
|
static void intel_ddi_get_power_domains(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state)
|
2017-02-24 14:19:59 +00:00
|
|
|
{
|
2018-11-01 14:04:25 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2018-07-05 12:26:54 +00:00
|
|
|
struct intel_digital_port *dig_port;
|
2019-07-09 18:39:33 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2017-02-24 14:19:59 +00:00
|
|
|
|
2018-06-21 18:44:49 +00:00
|
|
|
/*
|
|
|
|
* TODO: Add support for MST encoders. Atm, the following should never
|
2018-07-05 12:26:54 +00:00
|
|
|
* happen since fake-MST encoders don't set their get_power_domains()
|
|
|
|
* hook.
|
2018-06-21 18:44:49 +00:00
|
|
|
*/
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm,
|
|
|
|
intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)))
|
2019-04-07 12:46:55 +00:00
|
|
|
return;
|
2018-07-05 12:26:54 +00:00
|
|
|
|
2019-12-04 18:05:43 +00:00
|
|
|
dig_port = enc_to_dig_port(encoder);
|
2020-03-30 15:22:44 +00:00
|
|
|
|
|
|
|
if (!intel_phy_is_tc(dev_priv, phy) ||
|
|
|
|
dig_port->tc_mode != TC_PORT_TBT_ALT)
|
|
|
|
intel_display_power_get(dev_priv,
|
|
|
|
dig_port->ddi_io_power_domain);
|
2018-06-21 18:44:49 +00:00
|
|
|
|
2018-11-01 14:04:25 +00:00
|
|
|
/*
|
|
|
|
* AUX power is only needed for (e)DP mode, and for HDMI mode on TC
|
|
|
|
* ports.
|
|
|
|
*/
|
|
|
|
if (intel_crtc_has_dp_encoder(crtc_state) ||
|
2019-07-09 18:39:33 +00:00
|
|
|
intel_phy_is_tc(dev_priv, phy))
|
2019-04-07 12:46:55 +00:00
|
|
|
intel_display_power_get(dev_priv,
|
|
|
|
intel_ddi_main_link_aux_domain(dig_port));
|
2018-06-21 18:44:49 +00:00
|
|
|
|
2018-11-28 20:26:24 +00:00
|
|
|
/*
|
|
|
|
* VDSC power is needed when DSC is enabled
|
|
|
|
*/
|
2019-10-22 13:34:13 +00:00
|
|
|
if (crtc_state->dsc.compression_enable)
|
2019-04-07 12:46:55 +00:00
|
|
|
intel_display_power_get(dev_priv,
|
|
|
|
intel_dsc_power_domain(crtc_state));
|
2017-02-24 14:19:59 +00:00
|
|
|
}
|
|
|
|
|
2020-04-17 13:47:17 +00:00
|
|
|
void intel_ddi_enable_pipe_clock(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2012-10-05 15:05:54 +00:00
|
|
|
{
|
2019-10-31 11:26:03 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2017-03-02 12:58:55 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2017-03-02 12:58:56 +00:00
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2012-10-05 15:05:54 +00:00
|
|
|
|
2019-07-13 01:09:20 +00:00
|
|
|
if (cpu_transcoder != TRANSCODER_EDP) {
|
|
|
|
if (INTEL_GEN(dev_priv) >= 12)
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
TRANS_CLK_SEL(cpu_transcoder),
|
|
|
|
TGL_TRANS_CLK_SEL_PORT(port));
|
2019-07-13 01:09:20 +00:00
|
|
|
else
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
TRANS_CLK_SEL(cpu_transcoder),
|
|
|
|
TRANS_CLK_SEL_PORT(port));
|
2019-07-13 01:09:20 +00:00
|
|
|
}
|
2012-10-05 15:05:54 +00:00
|
|
|
}
|
|
|
|
|
2017-03-02 12:58:56 +00:00
|
|
|
void intel_ddi_disable_pipe_clock(const struct intel_crtc_state *crtc_state)
|
2012-10-05 15:05:54 +00:00
|
|
|
{
|
2019-10-31 11:26:03 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
|
2017-03-02 12:58:56 +00:00
|
|
|
enum transcoder cpu_transcoder = crtc_state->cpu_transcoder;
|
2012-10-05 15:05:54 +00:00
|
|
|
|
2019-07-13 01:09:20 +00:00
|
|
|
if (cpu_transcoder != TRANSCODER_EDP) {
|
|
|
|
if (INTEL_GEN(dev_priv) >= 12)
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
TRANS_CLK_SEL(cpu_transcoder),
|
|
|
|
TGL_TRANS_CLK_SEL_DISABLED);
|
2019-07-13 01:09:20 +00:00
|
|
|
else
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
TRANS_CLK_SEL(cpu_transcoder),
|
|
|
|
TRANS_CLK_SEL_DISABLED);
|
2019-07-13 01:09:20 +00:00
|
|
|
}
|
2012-10-05 15:05:54 +00:00
|
|
|
}
|
|
|
|
|
2016-07-12 12:59:28 +00:00
|
|
|
static void _skl_ddi_set_iboost(struct drm_i915_private *dev_priv,
|
2019-01-18 12:01:21 +00:00
|
|
|
enum port port, u8 iboost)
|
2015-06-25 08:11:03 +00:00
|
|
|
{
|
2016-07-12 12:59:28 +00:00
|
|
|
u32 tmp;
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
tmp = intel_de_read(dev_priv, DISPIO_CR_TX_BMU_CR0);
|
2016-07-12 12:59:28 +00:00
|
|
|
tmp &= ~(BALANCE_LEG_MASK(port) | BALANCE_LEG_DISABLE(port));
|
|
|
|
if (iboost)
|
|
|
|
tmp |= iboost << BALANCE_LEG_SHIFT(port);
|
|
|
|
else
|
|
|
|
tmp |= BALANCE_LEG_DISABLE(port);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DISPIO_CR_TX_BMU_CR0, tmp);
|
2016-07-12 12:59:28 +00:00
|
|
|
}
|
|
|
|
|
2017-10-16 14:56:58 +00:00
|
|
|
static void skl_ddi_set_iboost(struct intel_encoder *encoder,
|
|
|
|
int level, enum intel_output_type type)
|
2016-07-12 12:59:28 +00:00
|
|
|
{
|
2020-07-01 04:50:54 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2017-11-09 15:24:34 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-01-18 12:01:21 +00:00
|
|
|
u8 iboost;
|
2015-06-25 08:11:03 +00:00
|
|
|
|
2017-10-16 14:56:58 +00:00
|
|
|
if (type == INTEL_OUTPUT_HDMI)
|
2020-01-17 14:29:24 +00:00
|
|
|
iboost = intel_bios_hdmi_boost_level(encoder);
|
2017-10-16 14:56:58 +00:00
|
|
|
else
|
2020-01-17 14:29:23 +00:00
|
|
|
iboost = intel_bios_dp_boost_level(encoder);
|
2015-07-10 11:10:55 +00:00
|
|
|
|
2017-10-16 14:56:58 +00:00
|
|
|
if (iboost == 0) {
|
|
|
|
const struct ddi_buf_trans *ddi_translations;
|
|
|
|
int n_entries;
|
|
|
|
|
|
|
|
if (type == INTEL_OUTPUT_HDMI)
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = intel_ddi_get_buf_trans_hdmi(encoder, &n_entries);
|
2017-10-16 14:56:58 +00:00
|
|
|
else if (type == INTEL_OUTPUT_EDP)
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = intel_ddi_get_buf_trans_edp(encoder,
|
|
|
|
&n_entries);
|
2017-10-16 14:56:58 +00:00
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = intel_ddi_get_buf_trans_dp(encoder,
|
|
|
|
&n_entries);
|
2015-12-08 17:59:43 +00:00
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations))
|
2017-10-18 18:19:34 +00:00
|
|
|
return;
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries))
|
2017-10-18 18:19:34 +00:00
|
|
|
level = n_entries - 1;
|
|
|
|
|
2017-10-16 14:56:58 +00:00
|
|
|
iboost = ddi_translations[level].i_boost;
|
2015-06-25 08:11:03 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Make sure that the requested I_boost is valid */
|
|
|
|
if (iboost && iboost != 0x1 && iboost != 0x3 && iboost != 0x7) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_err(&dev_priv->drm, "Invalid I_boost value %u\n", iboost);
|
2015-06-25 08:11:03 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2020-07-08 20:55:09 +00:00
|
|
|
_skl_ddi_set_iboost(dev_priv, encoder->port, iboost);
|
2015-06-25 08:11:03 +00:00
|
|
|
|
2020-07-08 20:55:09 +00:00
|
|
|
if (encoder->port == PORT_A && dig_port->max_lanes == 4)
|
2016-07-12 12:59:28 +00:00
|
|
|
_skl_ddi_set_iboost(dev_priv, PORT_E, iboost);
|
2015-06-25 08:11:03 +00:00
|
|
|
}
|
|
|
|
|
2017-10-16 14:57:00 +00:00
|
|
|
static void bxt_ddi_vswing_sequence(struct intel_encoder *encoder,
|
|
|
|
int level, enum intel_output_type type)
|
2014-11-18 10:15:27 +00:00
|
|
|
{
|
2017-10-16 14:57:00 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2014-11-18 10:15:27 +00:00
|
|
|
const struct bxt_ddi_buf_trans *ddi_translations;
|
2017-10-16 14:57:00 +00:00
|
|
|
enum port port = encoder->port;
|
2017-10-16 14:57:02 +00:00
|
|
|
int n_entries;
|
2017-10-16 14:57:00 +00:00
|
|
|
|
|
|
|
if (type == INTEL_OUTPUT_HDMI)
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = bxt_get_buf_trans_hdmi(encoder, &n_entries);
|
2017-10-16 14:57:00 +00:00
|
|
|
else if (type == INTEL_OUTPUT_EDP)
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = bxt_get_buf_trans_edp(encoder, &n_entries);
|
2017-10-16 14:57:00 +00:00
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = bxt_get_buf_trans_dp(encoder, &n_entries);
|
2014-11-18 10:15:27 +00:00
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations))
|
2017-10-18 18:19:34 +00:00
|
|
|
return;
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries))
|
2017-10-18 18:19:34 +00:00
|
|
|
level = n_entries - 1;
|
|
|
|
|
2016-10-06 16:22:19 +00:00
|
|
|
bxt_ddi_phy_set_signal_level(dev_priv, port,
|
|
|
|
ddi_translations[level].margin,
|
|
|
|
ddi_translations[level].scale,
|
|
|
|
ddi_translations[level].enable,
|
|
|
|
ddi_translations[level].deemphasis);
|
2014-11-18 10:15:27 +00:00
|
|
|
}
|
|
|
|
|
2020-05-12 17:41:42 +00:00
|
|
|
static u8 intel_ddi_dp_voltage_max(struct intel_dp *intel_dp)
|
2017-02-23 17:49:01 +00:00
|
|
|
{
|
2020-05-12 17:41:42 +00:00
|
|
|
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
|
2017-02-23 17:49:01 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2017-10-16 14:57:03 +00:00
|
|
|
enum port port = encoder->port;
|
2019-07-09 18:39:33 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
2017-02-23 17:49:01 +00:00
|
|
|
int n_entries;
|
|
|
|
|
2019-09-26 21:06:57 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12) {
|
|
|
|
if (intel_phy_is_combo(dev_priv, phy))
|
2020-07-08 20:55:08 +00:00
|
|
|
tgl_get_combo_buf_trans(encoder, encoder->type,
|
2019-09-26 21:06:57 +00:00
|
|
|
intel_dp->link_rate, &n_entries);
|
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
tgl_get_dkl_buf_trans(encoder, encoder->type,
|
2020-06-02 20:54:24 +00:00
|
|
|
intel_dp->link_rate, &n_entries);
|
2019-09-26 21:06:57 +00:00
|
|
|
} else if (INTEL_GEN(dev_priv) == 11) {
|
2020-02-05 20:56:47 +00:00
|
|
|
if (IS_ELKHARTLAKE(dev_priv))
|
2020-07-08 20:55:08 +00:00
|
|
|
ehl_get_combo_buf_trans(encoder, encoder->type,
|
2020-02-05 20:56:47 +00:00
|
|
|
intel_dp->link_rate, &n_entries);
|
|
|
|
else if (intel_phy_is_combo(dev_priv, phy))
|
2020-07-08 20:55:08 +00:00
|
|
|
icl_get_combo_buf_trans(encoder, encoder->type,
|
2018-12-17 22:13:47 +00:00
|
|
|
intel_dp->link_rate, &n_entries);
|
2018-03-28 21:58:03 +00:00
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
icl_get_mg_buf_trans(encoder, encoder->type,
|
2020-03-30 21:00:44 +00:00
|
|
|
intel_dp->link_rate, &n_entries);
|
2018-03-28 21:58:03 +00:00
|
|
|
} else if (IS_CANNONLAKE(dev_priv)) {
|
2017-08-31 14:53:56 +00:00
|
|
|
if (encoder->type == INTEL_OUTPUT_EDP)
|
2020-07-08 20:55:08 +00:00
|
|
|
cnl_get_buf_trans_edp(encoder, &n_entries);
|
2017-08-31 14:53:56 +00:00
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
cnl_get_buf_trans_dp(encoder, &n_entries);
|
2017-10-16 14:57:00 +00:00
|
|
|
} else if (IS_GEN9_LP(dev_priv)) {
|
|
|
|
if (encoder->type == INTEL_OUTPUT_EDP)
|
2020-07-08 20:55:08 +00:00
|
|
|
bxt_get_buf_trans_edp(encoder, &n_entries);
|
2017-10-16 14:57:00 +00:00
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
bxt_get_buf_trans_dp(encoder, &n_entries);
|
2017-08-31 14:53:56 +00:00
|
|
|
} else {
|
|
|
|
if (encoder->type == INTEL_OUTPUT_EDP)
|
2020-07-08 20:55:09 +00:00
|
|
|
intel_ddi_get_buf_trans_edp(encoder, &n_entries);
|
2017-08-31 14:53:56 +00:00
|
|
|
else
|
2020-07-08 20:55:09 +00:00
|
|
|
intel_ddi_get_buf_trans_dp(encoder, &n_entries);
|
2017-08-31 14:53:56 +00:00
|
|
|
}
|
2017-02-23 17:49:01 +00:00
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, n_entries < 1))
|
2017-02-23 17:49:01 +00:00
|
|
|
n_entries = 1;
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm,
|
|
|
|
n_entries > ARRAY_SIZE(index_to_dp_signal_levels)))
|
2017-02-23 17:49:01 +00:00
|
|
|
n_entries = ARRAY_SIZE(index_to_dp_signal_levels);
|
|
|
|
|
|
|
|
return index_to_dp_signal_levels[n_entries - 1] &
|
|
|
|
DP_TRAIN_VOLTAGE_SWING_MASK;
|
|
|
|
}
|
|
|
|
|
2018-05-17 17:03:06 +00:00
|
|
|
/*
|
|
|
|
* We assume that the full set of pre-emphasis values can be
|
|
|
|
* used on all DDI platforms. Should that change we need to
|
|
|
|
* rethink this code.
|
|
|
|
*/
|
2020-05-12 17:41:42 +00:00
|
|
|
static u8 intel_ddi_dp_preemph_max(struct intel_dp *intel_dp)
|
2018-05-17 17:03:06 +00:00
|
|
|
{
|
2020-05-12 17:41:42 +00:00
|
|
|
return DP_TRAIN_PRE_EMPH_LEVEL_3;
|
2018-05-17 17:03:06 +00:00
|
|
|
}
|
|
|
|
|
2017-10-16 14:57:01 +00:00
|
|
|
static void cnl_ddi_vswing_program(struct intel_encoder *encoder,
|
|
|
|
int level, enum intel_output_type type)
|
2017-06-09 22:26:08 +00:00
|
|
|
{
|
2017-10-16 14:57:01 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
const struct cnl_ddi_buf_trans *ddi_translations;
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2017-10-16 14:57:01 +00:00
|
|
|
int n_entries, ln;
|
|
|
|
u32 val;
|
2017-06-09 22:26:08 +00:00
|
|
|
|
2017-10-16 14:57:01 +00:00
|
|
|
if (type == INTEL_OUTPUT_HDMI)
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = cnl_get_buf_trans_hdmi(encoder, &n_entries);
|
2017-10-16 14:57:01 +00:00
|
|
|
else if (type == INTEL_OUTPUT_EDP)
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = cnl_get_buf_trans_edp(encoder, &n_entries);
|
2017-10-16 14:57:01 +00:00
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = cnl_get_buf_trans_dp(encoder, &n_entries);
|
2017-06-09 22:26:08 +00:00
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, !ddi_translations))
|
2017-06-09 22:26:08 +00:00
|
|
|
return;
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON_ONCE(&dev_priv->drm, level >= n_entries))
|
2017-06-09 22:26:08 +00:00
|
|
|
level = n_entries - 1;
|
|
|
|
|
|
|
|
/* Set PORT_TX_DW5 Scaling Mode Sel to 010b. */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_TX_DW5_LN0(port));
|
2017-06-19 18:39:32 +00:00
|
|
|
val &= ~SCALING_MODE_SEL_MASK;
|
2017-06-09 22:26:08 +00:00
|
|
|
val |= SCALING_MODE_SEL(2);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_TX_DW5_GRP(port), val);
|
2017-06-09 22:26:08 +00:00
|
|
|
|
|
|
|
/* Program PORT_TX_DW2 */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_TX_DW2_LN0(port));
|
2017-06-19 18:39:32 +00:00
|
|
|
val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK |
|
|
|
|
RCOMP_SCALAR_MASK);
|
2017-06-09 22:26:08 +00:00
|
|
|
val |= SWING_SEL_UPPER(ddi_translations[level].dw2_swing_sel);
|
|
|
|
val |= SWING_SEL_LOWER(ddi_translations[level].dw2_swing_sel);
|
|
|
|
/* Rcomp scalar is fixed as 0x98 for every table entry */
|
|
|
|
val |= RCOMP_SCALAR(0x98);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_TX_DW2_GRP(port), val);
|
2017-06-09 22:26:08 +00:00
|
|
|
|
2017-09-18 18:25:36 +00:00
|
|
|
/* Program PORT_TX_DW4 */
|
2017-06-09 22:26:08 +00:00
|
|
|
/* We cannot write to GRP. It would overrite individual loadgen */
|
|
|
|
for (ln = 0; ln < 4; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_TX_DW4_LN(ln, port));
|
2017-06-19 18:39:32 +00:00
|
|
|
val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK |
|
|
|
|
CURSOR_COEFF_MASK);
|
2017-06-09 22:26:08 +00:00
|
|
|
val |= POST_CURSOR_1(ddi_translations[level].dw4_post_cursor_1);
|
|
|
|
val |= POST_CURSOR_2(ddi_translations[level].dw4_post_cursor_2);
|
|
|
|
val |= CURSOR_COEFF(ddi_translations[level].dw4_cursor_coeff);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_TX_DW4_LN(ln, port), val);
|
2017-06-09 22:26:08 +00:00
|
|
|
}
|
|
|
|
|
2017-09-18 18:25:36 +00:00
|
|
|
/* Program PORT_TX_DW5 */
|
2017-06-09 22:26:08 +00:00
|
|
|
/* All DW5 values are fixed for every table entry */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_TX_DW5_LN0(port));
|
2017-06-19 18:39:32 +00:00
|
|
|
val &= ~RTERM_SELECT_MASK;
|
2017-06-09 22:26:08 +00:00
|
|
|
val |= RTERM_SELECT(6);
|
|
|
|
val |= TAP3_DISABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_TX_DW5_GRP(port), val);
|
2017-06-09 22:26:08 +00:00
|
|
|
|
2017-09-18 18:25:36 +00:00
|
|
|
/* Program PORT_TX_DW7 */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_TX_DW7_LN0(port));
|
2017-06-19 18:39:32 +00:00
|
|
|
val &= ~N_SCALAR_MASK;
|
2017-06-09 22:26:08 +00:00
|
|
|
val |= N_SCALAR(ddi_translations[level].dw7_n_scalar);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_TX_DW7_GRP(port), val);
|
2017-06-09 22:26:08 +00:00
|
|
|
}
|
|
|
|
|
2017-10-16 14:57:01 +00:00
|
|
|
static void cnl_ddi_vswing_sequence(struct intel_encoder *encoder,
|
|
|
|
int level, enum intel_output_type type)
|
2017-06-09 22:26:08 +00:00
|
|
|
{
|
2017-06-09 22:26:09 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2017-10-16 14:57:01 +00:00
|
|
|
int width, rate, ln;
|
2017-06-09 22:26:08 +00:00
|
|
|
u32 val;
|
2017-06-09 22:26:09 +00:00
|
|
|
|
2017-10-16 14:57:01 +00:00
|
|
|
if (type == INTEL_OUTPUT_HDMI) {
|
2017-06-09 22:26:09 +00:00
|
|
|
width = 4;
|
2017-10-16 14:57:01 +00:00
|
|
|
rate = 0; /* Rate is always < than 6GHz for HDMI */
|
2017-07-10 20:58:52 +00:00
|
|
|
} else {
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2017-10-16 14:57:01 +00:00
|
|
|
|
|
|
|
width = intel_dp->lane_count;
|
|
|
|
rate = intel_dp->link_rate;
|
2017-06-09 22:26:09 +00:00
|
|
|
}
|
2017-06-09 22:26:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 1. If port type is eDP or DP,
|
|
|
|
* set PORT_PCS_DW1 cmnkeeper_enable to 1b,
|
|
|
|
* else clear to 0b.
|
|
|
|
*/
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_PCS_DW1_LN0(port));
|
2017-10-16 14:57:01 +00:00
|
|
|
if (type != INTEL_OUTPUT_HDMI)
|
2017-06-09 22:26:08 +00:00
|
|
|
val |= COMMON_KEEPER_EN;
|
|
|
|
else
|
|
|
|
val &= ~COMMON_KEEPER_EN;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_PCS_DW1_GRP(port), val);
|
2017-06-09 22:26:08 +00:00
|
|
|
|
|
|
|
/* 2. Program loadgen select */
|
|
|
|
/*
|
2017-06-09 22:26:09 +00:00
|
|
|
* Program PORT_TX_DW4_LN depending on Bit rate and used lanes
|
|
|
|
* <= 6 GHz and 4 lanes (LN0=0, LN1=1, LN2=1, LN3=1)
|
|
|
|
* <= 6 GHz and 1,2 lanes (LN0=0, LN1=1, LN2=1, LN3=0)
|
|
|
|
* > 6 GHz (LN0=0, LN1=0, LN2=0, LN3=0)
|
2017-06-09 22:26:08 +00:00
|
|
|
*/
|
2017-06-09 22:26:09 +00:00
|
|
|
for (ln = 0; ln <= 3; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_TX_DW4_LN(ln, port));
|
2017-06-09 22:26:09 +00:00
|
|
|
val &= ~LOADGEN_SELECT;
|
|
|
|
|
2017-07-17 22:05:22 +00:00
|
|
|
if ((rate <= 600000 && width == 4 && ln >= 1) ||
|
|
|
|
(rate <= 600000 && width < 4 && (ln == 1 || ln == 2))) {
|
2017-06-09 22:26:09 +00:00
|
|
|
val |= LOADGEN_SELECT;
|
|
|
|
}
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_TX_DW4_LN(ln, port), val);
|
2017-06-09 22:26:09 +00:00
|
|
|
}
|
2017-06-09 22:26:08 +00:00
|
|
|
|
|
|
|
/* 3. Set PORT_CL_DW5 SUS Clock Config to 11b */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_CL1CM_DW5);
|
2017-06-09 22:26:08 +00:00
|
|
|
val |= SUS_CLOCK_CONFIG;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_CL1CM_DW5, val);
|
2017-06-09 22:26:08 +00:00
|
|
|
|
|
|
|
/* 4. Clear training enable to change swing values */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_TX_DW5_LN0(port));
|
2017-06-09 22:26:08 +00:00
|
|
|
val &= ~TX_TRAINING_EN;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_TX_DW5_GRP(port), val);
|
2017-06-09 22:26:08 +00:00
|
|
|
|
|
|
|
/* 5. Program swing and de-emphasis */
|
2017-10-16 14:57:01 +00:00
|
|
|
cnl_ddi_vswing_program(encoder, level, type);
|
2017-06-09 22:26:08 +00:00
|
|
|
|
|
|
|
/* 6. Set training enable to trigger update */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, CNL_PORT_TX_DW5_LN0(port));
|
2017-06-09 22:26:08 +00:00
|
|
|
val |= TX_TRAINING_EN;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, CNL_PORT_TX_DW5_GRP(port), val);
|
2017-06-09 22:26:08 +00:00
|
|
|
}
|
|
|
|
|
2020-07-08 20:55:08 +00:00
|
|
|
static void icl_ddi_combo_vswing_program(struct intel_encoder *encoder,
|
2020-07-08 20:55:09 +00:00
|
|
|
u32 level, int type, int rate)
|
2018-03-28 21:58:02 +00:00
|
|
|
{
|
2020-07-08 20:55:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2020-07-08 20:55:09 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2018-12-17 22:13:47 +00:00
|
|
|
const struct cnl_ddi_buf_trans *ddi_translations = NULL;
|
2018-03-28 21:58:02 +00:00
|
|
|
u32 n_entries, val;
|
|
|
|
int ln;
|
|
|
|
|
2020-01-10 23:39:02 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12)
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = tgl_get_combo_buf_trans(encoder, type, rate,
|
2020-01-10 23:39:02 +00:00
|
|
|
&n_entries);
|
2020-02-05 20:56:47 +00:00
|
|
|
else if (IS_ELKHARTLAKE(dev_priv))
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = ehl_get_combo_buf_trans(encoder, type, rate,
|
2020-02-05 20:56:47 +00:00
|
|
|
&n_entries);
|
2020-01-10 23:39:02 +00:00
|
|
|
else
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = icl_get_combo_buf_trans(encoder, type, rate,
|
2020-01-10 23:39:02 +00:00
|
|
|
&n_entries);
|
2018-03-28 21:58:02 +00:00
|
|
|
if (!ddi_translations)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (level >= n_entries) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"DDI translation not found for level %d. Using %d instead.",
|
|
|
|
level, n_entries - 1);
|
2018-03-28 21:58:02 +00:00
|
|
|
level = n_entries - 1;
|
|
|
|
}
|
|
|
|
|
2018-12-17 22:13:47 +00:00
|
|
|
/* Set PORT_TX_DW5 */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_PORT_TX_DW5_LN0(phy));
|
2018-12-17 22:13:47 +00:00
|
|
|
val &= ~(SCALING_MODE_SEL_MASK | RTERM_SELECT_MASK |
|
|
|
|
TAP2_DISABLE | TAP3_DISABLE);
|
|
|
|
val |= SCALING_MODE_SEL(0x2);
|
2018-03-28 21:58:02 +00:00
|
|
|
val |= RTERM_SELECT(0x6);
|
2018-12-17 22:13:47 +00:00
|
|
|
val |= TAP3_DISABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_PORT_TX_DW5_GRP(phy), val);
|
2018-03-28 21:58:02 +00:00
|
|
|
|
|
|
|
/* Program PORT_TX_DW2 */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_PORT_TX_DW2_LN0(phy));
|
2018-03-28 21:58:02 +00:00
|
|
|
val &= ~(SWING_SEL_LOWER_MASK | SWING_SEL_UPPER_MASK |
|
|
|
|
RCOMP_SCALAR_MASK);
|
2018-12-17 22:13:47 +00:00
|
|
|
val |= SWING_SEL_UPPER(ddi_translations[level].dw2_swing_sel);
|
|
|
|
val |= SWING_SEL_LOWER(ddi_translations[level].dw2_swing_sel);
|
2018-03-28 21:58:02 +00:00
|
|
|
/* Program Rcomp scalar for every table entry */
|
2018-12-17 22:13:47 +00:00
|
|
|
val |= RCOMP_SCALAR(0x98);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_PORT_TX_DW2_GRP(phy), val);
|
2018-03-28 21:58:02 +00:00
|
|
|
|
|
|
|
/* Program PORT_TX_DW4 */
|
|
|
|
/* We cannot write to GRP. It would overwrite individual loadgen. */
|
|
|
|
for (ln = 0; ln <= 3; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy));
|
2018-03-28 21:58:02 +00:00
|
|
|
val &= ~(POST_CURSOR_1_MASK | POST_CURSOR_2_MASK |
|
|
|
|
CURSOR_COEFF_MASK);
|
2018-12-17 22:13:47 +00:00
|
|
|
val |= POST_CURSOR_1(ddi_translations[level].dw4_post_cursor_1);
|
|
|
|
val |= POST_CURSOR_2(ddi_translations[level].dw4_post_cursor_2);
|
|
|
|
val |= CURSOR_COEFF(ddi_translations[level].dw4_cursor_coeff);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy), val);
|
2018-03-28 21:58:02 +00:00
|
|
|
}
|
2018-12-17 22:13:47 +00:00
|
|
|
|
|
|
|
/* Program PORT_TX_DW7 */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_PORT_TX_DW7_LN0(phy));
|
2018-12-17 22:13:47 +00:00
|
|
|
val &= ~N_SCALAR_MASK;
|
|
|
|
val |= N_SCALAR(ddi_translations[level].dw7_n_scalar);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_PORT_TX_DW7_GRP(phy), val);
|
2018-03-28 21:58:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static void icl_combo_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
|
|
|
|
u32 level,
|
|
|
|
enum intel_output_type type)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-07-09 18:39:32 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2018-03-28 21:58:02 +00:00
|
|
|
int width = 0;
|
|
|
|
int rate = 0;
|
|
|
|
u32 val;
|
|
|
|
int ln = 0;
|
|
|
|
|
|
|
|
if (type == INTEL_OUTPUT_HDMI) {
|
|
|
|
width = 4;
|
|
|
|
/* Rate is always < than 6GHz for HDMI */
|
|
|
|
} else {
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2018-03-28 21:58:02 +00:00
|
|
|
|
|
|
|
width = intel_dp->lane_count;
|
|
|
|
rate = intel_dp->link_rate;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 1. If port type is eDP or DP,
|
|
|
|
* set PORT_PCS_DW1 cmnkeeper_enable to 1b,
|
|
|
|
* else clear to 0b.
|
|
|
|
*/
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_PORT_PCS_DW1_LN0(phy));
|
2018-03-28 21:58:02 +00:00
|
|
|
if (type == INTEL_OUTPUT_HDMI)
|
|
|
|
val &= ~COMMON_KEEPER_EN;
|
|
|
|
else
|
|
|
|
val |= COMMON_KEEPER_EN;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_PORT_PCS_DW1_GRP(phy), val);
|
2018-03-28 21:58:02 +00:00
|
|
|
|
|
|
|
/* 2. Program loadgen select */
|
|
|
|
/*
|
|
|
|
* Program PORT_TX_DW4_LN depending on Bit rate and used lanes
|
|
|
|
* <= 6 GHz and 4 lanes (LN0=0, LN1=1, LN2=1, LN3=1)
|
|
|
|
* <= 6 GHz and 1,2 lanes (LN0=0, LN1=1, LN2=1, LN3=0)
|
|
|
|
* > 6 GHz (LN0=0, LN1=0, LN2=0, LN3=0)
|
|
|
|
*/
|
|
|
|
for (ln = 0; ln <= 3; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy));
|
2018-03-28 21:58:02 +00:00
|
|
|
val &= ~LOADGEN_SELECT;
|
|
|
|
|
|
|
|
if ((rate <= 600000 && width == 4 && ln >= 1) ||
|
|
|
|
(rate <= 600000 && width < 4 && (ln == 1 || ln == 2))) {
|
|
|
|
val |= LOADGEN_SELECT;
|
|
|
|
}
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_PORT_TX_DW4_LN(ln, phy), val);
|
2018-03-28 21:58:02 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* 3. Set PORT_CL_DW5 SUS Clock Config to 11b */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_PORT_CL_DW5(phy));
|
2018-03-28 21:58:02 +00:00
|
|
|
val |= SUS_CLOCK_CONFIG;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_PORT_CL_DW5(phy), val);
|
2018-03-28 21:58:02 +00:00
|
|
|
|
|
|
|
/* 4. Clear training enable to change swing values */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_PORT_TX_DW5_LN0(phy));
|
2018-03-28 21:58:02 +00:00
|
|
|
val &= ~TX_TRAINING_EN;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_PORT_TX_DW5_GRP(phy), val);
|
2018-03-28 21:58:02 +00:00
|
|
|
|
|
|
|
/* 5. Program swing and de-emphasis */
|
2020-07-08 20:55:09 +00:00
|
|
|
icl_ddi_combo_vswing_program(encoder, level, type, rate);
|
2018-03-28 21:58:02 +00:00
|
|
|
|
|
|
|
/* 6. Set training enable to trigger update */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_PORT_TX_DW5_LN0(phy));
|
2018-03-28 21:58:02 +00:00
|
|
|
val |= TX_TRAINING_EN;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_PORT_TX_DW5_GRP(phy), val);
|
2018-03-28 21:58:02 +00:00
|
|
|
}
|
|
|
|
|
2018-06-28 22:35:44 +00:00
|
|
|
static void icl_mg_phy_ddi_vswing_sequence(struct intel_encoder *encoder,
|
2020-03-30 21:00:44 +00:00
|
|
|
int link_clock, u32 level,
|
|
|
|
enum intel_output_type type)
|
2018-06-28 22:35:44 +00:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-01 19:37:29 +00:00
|
|
|
enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port);
|
2018-06-28 22:35:44 +00:00
|
|
|
const struct icl_mg_phy_ddi_buf_trans *ddi_translations;
|
|
|
|
u32 n_entries, val;
|
2020-03-30 21:00:44 +00:00
|
|
|
int ln, rate = 0;
|
|
|
|
|
|
|
|
if (type != INTEL_OUTPUT_HDMI) {
|
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
|
|
|
|
|
|
|
rate = intel_dp->link_rate;
|
|
|
|
}
|
2018-06-28 22:35:44 +00:00
|
|
|
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = icl_get_mg_buf_trans(encoder, type, rate,
|
2020-03-30 21:00:44 +00:00
|
|
|
&n_entries);
|
2018-06-28 22:35:44 +00:00
|
|
|
/* The table does not have values for level 3 and level 9. */
|
|
|
|
if (level >= n_entries || level == 3 || level == 9) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"DDI translation not found for level %d. Using %d instead.",
|
|
|
|
level, n_entries - 2);
|
2018-06-28 22:35:44 +00:00
|
|
|
level = n_entries - 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Set MG_TX_LINK_PARAMS cri_use_fs32 to 0. */
|
|
|
|
for (ln = 0; ln < 2; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, MG_TX1_LINK_PARAMS(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val &= ~CRI_USE_FS32;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX1_LINK_PARAMS(ln, tc_port), val);
|
2018-06-28 22:35:44 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, MG_TX2_LINK_PARAMS(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val &= ~CRI_USE_FS32;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX2_LINK_PARAMS(ln, tc_port), val);
|
2018-06-28 22:35:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Program MG_TX_SWINGCTRL with values from vswing table */
|
|
|
|
for (ln = 0; ln < 2; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK;
|
|
|
|
val |= CRI_TXDEEMPH_OVERRIDE_17_12(
|
|
|
|
ddi_translations[level].cri_txdeemph_override_17_12);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX1_SWINGCTRL(ln, tc_port), val);
|
2018-06-28 22:35:44 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val &= ~CRI_TXDEEMPH_OVERRIDE_17_12_MASK;
|
|
|
|
val |= CRI_TXDEEMPH_OVERRIDE_17_12(
|
|
|
|
ddi_translations[level].cri_txdeemph_override_17_12);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX2_SWINGCTRL(ln, tc_port), val);
|
2018-06-28 22:35:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Program MG_TX_DRVCTRL with values from vswing table */
|
|
|
|
for (ln = 0; ln < 2; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, MG_TX1_DRVCTRL(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK |
|
|
|
|
CRI_TXDEEMPH_OVERRIDE_5_0_MASK);
|
|
|
|
val |= CRI_TXDEEMPH_OVERRIDE_5_0(
|
|
|
|
ddi_translations[level].cri_txdeemph_override_5_0) |
|
|
|
|
CRI_TXDEEMPH_OVERRIDE_11_6(
|
|
|
|
ddi_translations[level].cri_txdeemph_override_11_6) |
|
|
|
|
CRI_TXDEEMPH_OVERRIDE_EN;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX1_DRVCTRL(ln, tc_port), val);
|
2018-06-28 22:35:44 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, MG_TX2_DRVCTRL(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val &= ~(CRI_TXDEEMPH_OVERRIDE_11_6_MASK |
|
|
|
|
CRI_TXDEEMPH_OVERRIDE_5_0_MASK);
|
|
|
|
val |= CRI_TXDEEMPH_OVERRIDE_5_0(
|
|
|
|
ddi_translations[level].cri_txdeemph_override_5_0) |
|
|
|
|
CRI_TXDEEMPH_OVERRIDE_11_6(
|
|
|
|
ddi_translations[level].cri_txdeemph_override_11_6) |
|
|
|
|
CRI_TXDEEMPH_OVERRIDE_EN;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX2_DRVCTRL(ln, tc_port), val);
|
2018-06-28 22:35:44 +00:00
|
|
|
|
|
|
|
/* FIXME: Program CRI_LOADGEN_SEL after the spec is updated */
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Program MG_CLKHUB<LN, port being used> with value from frequency table
|
|
|
|
* In case of Legacy mode on MG PHY, both TX1 and TX2 enabled so use the
|
|
|
|
* values from table for which TX1 and TX2 enabled.
|
|
|
|
*/
|
|
|
|
for (ln = 0; ln < 2; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, MG_CLKHUB(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
if (link_clock < 300000)
|
|
|
|
val |= CFG_LOW_RATE_LKREN_EN;
|
|
|
|
else
|
|
|
|
val &= ~CFG_LOW_RATE_LKREN_EN;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_CLKHUB(ln, tc_port), val);
|
2018-06-28 22:35:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Program the MG_TX_DCC<LN, port being used> based on the link frequency */
|
|
|
|
for (ln = 0; ln < 2; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, MG_TX1_DCC(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val &= ~CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK;
|
|
|
|
if (link_clock <= 500000) {
|
|
|
|
val &= ~CFG_AMI_CK_DIV_OVERRIDE_EN;
|
|
|
|
} else {
|
|
|
|
val |= CFG_AMI_CK_DIV_OVERRIDE_EN |
|
|
|
|
CFG_AMI_CK_DIV_OVERRIDE_VAL(1);
|
|
|
|
}
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX1_DCC(ln, tc_port), val);
|
2018-06-28 22:35:44 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, MG_TX2_DCC(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val &= ~CFG_AMI_CK_DIV_OVERRIDE_VAL_MASK;
|
|
|
|
if (link_clock <= 500000) {
|
|
|
|
val &= ~CFG_AMI_CK_DIV_OVERRIDE_EN;
|
|
|
|
} else {
|
|
|
|
val |= CFG_AMI_CK_DIV_OVERRIDE_EN |
|
|
|
|
CFG_AMI_CK_DIV_OVERRIDE_VAL(1);
|
|
|
|
}
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX2_DCC(ln, tc_port), val);
|
2018-06-28 22:35:44 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/* Program MG_TX_PISO_READLOAD with values from vswing table */
|
|
|
|
for (ln = 0; ln < 2; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv,
|
|
|
|
MG_TX1_PISO_READLOAD(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val |= CRI_CALCINIT;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX1_PISO_READLOAD(ln, tc_port),
|
|
|
|
val);
|
2018-06-28 22:35:44 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv,
|
|
|
|
MG_TX2_PISO_READLOAD(ln, tc_port));
|
2018-06-28 22:35:44 +00:00
|
|
|
val |= CRI_CALCINIT;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_TX2_PISO_READLOAD(ln, tc_port),
|
|
|
|
val);
|
2018-06-28 22:35:44 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void icl_ddi_vswing_sequence(struct intel_encoder *encoder,
|
|
|
|
int link_clock,
|
|
|
|
u32 level,
|
2018-03-28 21:58:02 +00:00
|
|
|
enum intel_output_type type)
|
|
|
|
{
|
2018-10-04 08:50:43 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-07-09 18:39:33 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2018-03-28 21:58:02 +00:00
|
|
|
|
2019-07-09 18:39:33 +00:00
|
|
|
if (intel_phy_is_combo(dev_priv, phy))
|
2018-03-28 21:58:02 +00:00
|
|
|
icl_combo_phy_ddi_vswing_sequence(encoder, level, type);
|
|
|
|
else
|
2020-03-30 21:00:44 +00:00
|
|
|
icl_mg_phy_ddi_vswing_sequence(encoder, link_clock, level,
|
|
|
|
type);
|
2018-03-28 21:58:02 +00:00
|
|
|
}
|
|
|
|
|
2019-09-26 21:06:57 +00:00
|
|
|
static void
|
|
|
|
tgl_dkl_phy_ddi_vswing_sequence(struct intel_encoder *encoder, int link_clock,
|
2020-06-12 08:22:37 +00:00
|
|
|
u32 level, enum intel_output_type type)
|
2019-09-26 21:06:57 +00:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
enum tc_port tc_port = intel_port_to_tc(dev_priv, encoder->port);
|
|
|
|
const struct tgl_dkl_phy_ddi_buf_trans *ddi_translations;
|
|
|
|
u32 n_entries, val, ln, dpcnt_mask, dpcnt_val;
|
2020-06-02 20:54:24 +00:00
|
|
|
int rate = 0;
|
2019-09-26 21:06:57 +00:00
|
|
|
|
2020-06-12 08:22:37 +00:00
|
|
|
if (type == INTEL_OUTPUT_HDMI) {
|
2020-06-02 20:54:24 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
|
|
|
|
|
|
|
rate = intel_dp->link_rate;
|
2019-11-18 18:02:19 +00:00
|
|
|
}
|
2019-09-26 21:06:57 +00:00
|
|
|
|
2020-07-08 20:55:08 +00:00
|
|
|
ddi_translations = tgl_get_dkl_buf_trans(encoder, encoder->type, rate,
|
2020-06-02 20:54:24 +00:00
|
|
|
&n_entries);
|
|
|
|
|
2019-09-26 21:06:57 +00:00
|
|
|
if (level >= n_entries)
|
|
|
|
level = n_entries - 1;
|
|
|
|
|
|
|
|
dpcnt_mask = (DKL_TX_PRESHOOT_COEFF_MASK |
|
|
|
|
DKL_TX_DE_EMPAHSIS_COEFF_MASK |
|
|
|
|
DKL_TX_VSWING_CONTROL_MASK);
|
|
|
|
dpcnt_val = DKL_TX_VSWING_CONTROL(ddi_translations[level].dkl_vswing_control);
|
|
|
|
dpcnt_val |= DKL_TX_DE_EMPHASIS_COEFF(ddi_translations[level].dkl_de_emphasis_control);
|
|
|
|
dpcnt_val |= DKL_TX_PRESHOOT_COEFF(ddi_translations[level].dkl_preshoot_control);
|
|
|
|
|
|
|
|
for (ln = 0; ln < 2; ln++) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, HIP_INDEX_REG(tc_port),
|
|
|
|
HIP_INDEX_VAL(tc_port, ln));
|
2019-09-26 21:06:57 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DKL_TX_PMD_LANE_SUS(tc_port), 0);
|
2019-10-21 22:34:08 +00:00
|
|
|
|
2019-09-26 21:06:57 +00:00
|
|
|
/* All the registers are RMW */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, DKL_TX_DPCNTL0(tc_port));
|
2019-09-26 21:06:57 +00:00
|
|
|
val &= ~dpcnt_mask;
|
|
|
|
val |= dpcnt_val;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DKL_TX_DPCNTL0(tc_port), val);
|
2019-09-26 21:06:57 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, DKL_TX_DPCNTL1(tc_port));
|
2019-09-26 21:06:57 +00:00
|
|
|
val &= ~dpcnt_mask;
|
|
|
|
val |= dpcnt_val;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DKL_TX_DPCNTL1(tc_port), val);
|
2019-09-26 21:06:57 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, DKL_TX_DPCNTL2(tc_port));
|
2019-09-26 21:06:57 +00:00
|
|
|
val &= ~DKL_TX_DP20BITMODE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DKL_TX_DPCNTL2(tc_port), val);
|
2019-09-26 21:06:57 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
static void tgl_ddi_vswing_sequence(struct intel_encoder *encoder,
|
|
|
|
int link_clock,
|
|
|
|
u32 level,
|
|
|
|
enum intel_output_type type)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
|
|
|
|
|
|
|
if (intel_phy_is_combo(dev_priv, phy))
|
|
|
|
icl_combo_phy_ddi_vswing_sequence(encoder, level, type);
|
|
|
|
else
|
2020-06-12 08:22:37 +00:00
|
|
|
tgl_dkl_phy_ddi_vswing_sequence(encoder, link_clock, level, type);
|
2019-09-26 21:06:57 +00:00
|
|
|
}
|
|
|
|
|
2020-04-06 11:27:45 +00:00
|
|
|
static u32 translate_signal_level(struct intel_dp *intel_dp, int signal_levels)
|
2015-06-25 08:11:03 +00:00
|
|
|
{
|
2020-04-06 11:27:45 +00:00
|
|
|
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
|
2017-02-23 17:35:06 +00:00
|
|
|
int i;
|
2015-06-25 08:11:03 +00:00
|
|
|
|
2017-02-23 17:35:06 +00:00
|
|
|
for (i = 0; i < ARRAY_SIZE(index_to_dp_signal_levels); i++) {
|
|
|
|
if (index_to_dp_signal_levels[i] == signal_levels)
|
|
|
|
return i;
|
2015-06-25 08:11:03 +00:00
|
|
|
}
|
|
|
|
|
2020-04-06 11:27:45 +00:00
|
|
|
drm_WARN(&i915->drm, 1,
|
|
|
|
"Unsupported voltage swing/pre-emphasis level: 0x%x\n",
|
|
|
|
signal_levels);
|
2017-02-23 17:35:06 +00:00
|
|
|
|
|
|
|
return 0;
|
2015-06-25 08:11:03 +00:00
|
|
|
}
|
|
|
|
|
2019-01-18 12:01:21 +00:00
|
|
|
static u32 intel_ddi_dp_level(struct intel_dp *intel_dp)
|
2017-08-29 23:22:23 +00:00
|
|
|
{
|
2019-01-18 12:01:21 +00:00
|
|
|
u8 train_set = intel_dp->train_set[0];
|
2017-08-29 23:22:23 +00:00
|
|
|
int signal_levels = train_set & (DP_TRAIN_VOLTAGE_SWING_MASK |
|
|
|
|
DP_TRAIN_PRE_EMPHASIS_MASK);
|
|
|
|
|
2020-04-06 11:27:45 +00:00
|
|
|
return translate_signal_level(intel_dp, signal_levels);
|
2017-08-29 23:22:23 +00:00
|
|
|
}
|
|
|
|
|
2020-04-20 20:06:08 +00:00
|
|
|
static void
|
|
|
|
tgl_set_signal_levels(struct intel_dp *intel_dp)
|
2015-06-25 08:11:03 +00:00
|
|
|
{
|
2020-04-20 20:06:08 +00:00
|
|
|
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
|
2017-10-18 18:19:58 +00:00
|
|
|
int level = intel_ddi_dp_level(intel_dp);
|
2017-08-29 23:22:24 +00:00
|
|
|
|
2020-04-20 20:06:08 +00:00
|
|
|
tgl_ddi_vswing_sequence(encoder, intel_dp->link_rate,
|
|
|
|
level, encoder->type);
|
|
|
|
}
|
2017-08-29 23:22:24 +00:00
|
|
|
|
2020-04-20 20:06:08 +00:00
|
|
|
static void
|
|
|
|
icl_set_signal_levels(struct intel_dp *intel_dp)
|
|
|
|
{
|
|
|
|
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
|
|
|
|
int level = intel_ddi_dp_level(intel_dp);
|
|
|
|
|
|
|
|
icl_ddi_vswing_sequence(encoder, intel_dp->link_rate,
|
|
|
|
level, encoder->type);
|
2017-08-29 23:22:24 +00:00
|
|
|
}
|
|
|
|
|
2020-04-20 20:06:08 +00:00
|
|
|
static void
|
|
|
|
cnl_set_signal_levels(struct intel_dp *intel_dp)
|
2017-08-29 23:22:24 +00:00
|
|
|
{
|
2020-04-20 20:06:08 +00:00
|
|
|
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
|
2017-10-18 18:19:58 +00:00
|
|
|
int level = intel_ddi_dp_level(intel_dp);
|
2015-06-25 08:11:03 +00:00
|
|
|
|
2020-04-20 20:06:08 +00:00
|
|
|
cnl_ddi_vswing_sequence(encoder, level, encoder->type);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
bxt_set_signal_levels(struct intel_dp *intel_dp)
|
|
|
|
{
|
|
|
|
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
|
|
|
|
int level = intel_ddi_dp_level(intel_dp);
|
|
|
|
|
|
|
|
bxt_ddi_vswing_sequence(encoder, level, encoder->type);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
hsw_set_signal_levels(struct intel_dp *intel_dp)
|
|
|
|
{
|
|
|
|
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
int level = intel_ddi_dp_level(intel_dp);
|
|
|
|
enum port port = encoder->port;
|
|
|
|
u32 signal_levels;
|
|
|
|
|
|
|
|
signal_levels = DDI_BUF_TRANS_SELECT(level);
|
|
|
|
|
|
|
|
drm_dbg_kms(&dev_priv->drm, "Using signal levels %08x\n",
|
|
|
|
signal_levels);
|
|
|
|
|
|
|
|
intel_dp->DP &= ~DDI_BUF_EMP_MASK;
|
|
|
|
intel_dp->DP |= signal_levels;
|
|
|
|
|
2017-01-23 18:32:37 +00:00
|
|
|
if (IS_GEN9_BC(dev_priv))
|
2017-10-16 14:56:58 +00:00
|
|
|
skl_ddi_set_iboost(encoder, level, encoder->type);
|
2017-08-29 23:22:24 +00:00
|
|
|
|
2020-04-20 20:06:08 +00:00
|
|
|
intel_de_write(dev_priv, DDI_BUF_CTL(port), intel_dp->DP);
|
|
|
|
intel_de_posting_read(dev_priv, DDI_BUF_CTL(port));
|
2015-06-25 08:11:03 +00:00
|
|
|
}
|
|
|
|
|
2020-04-20 14:04:38 +00:00
|
|
|
static u32 icl_dpclka_cfgcr0_clk_off(struct drm_i915_private *dev_priv,
|
|
|
|
enum phy phy)
|
2018-10-16 02:37:52 +00:00
|
|
|
{
|
2019-07-09 18:39:31 +00:00
|
|
|
if (intel_phy_is_combo(dev_priv, phy)) {
|
|
|
|
return ICL_DPCLKA_CFGCR0_DDI_CLK_OFF(phy);
|
|
|
|
} else if (intel_phy_is_tc(dev_priv, phy)) {
|
|
|
|
enum tc_port tc_port = intel_port_to_tc(dev_priv,
|
|
|
|
(enum port)phy);
|
2018-10-16 02:37:52 +00:00
|
|
|
|
|
|
|
return ICL_DPCLKA_CFGCR0_TC_CLK_OFF(tc_port);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-11-29 14:12:16 +00:00
|
|
|
static void icl_map_plls_to_ports(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2018-04-27 23:14:36 +00:00
|
|
|
{
|
2018-11-29 14:12:16 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2018-04-27 23:14:36 +00:00
|
|
|
struct intel_shared_dpll *pll = crtc_state->shared_dpll;
|
2019-07-09 18:39:31 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2018-11-29 14:12:16 +00:00
|
|
|
u32 val;
|
2018-04-27 23:14:36 +00:00
|
|
|
|
2020-02-26 20:34:45 +00:00
|
|
|
mutex_lock(&dev_priv->dpll.lock);
|
2018-04-27 23:14:36 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_DPCLKA_CFGCR0);
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm,
|
|
|
|
(val & icl_dpclka_cfgcr0_clk_off(dev_priv, phy)) == 0);
|
2018-04-27 23:14:36 +00:00
|
|
|
|
2019-07-09 18:39:31 +00:00
|
|
|
if (intel_phy_is_combo(dev_priv, phy)) {
|
|
|
|
/*
|
|
|
|
* Even though this register references DDIs, note that we
|
|
|
|
* want to pass the PHY rather than the port (DDI). For
|
|
|
|
* ICL, port=phy in all cases so it doesn't matter, but for
|
|
|
|
* EHL the bspec notes the following:
|
|
|
|
*
|
|
|
|
* "DDID clock tied to DDIA clock, so DPCLKA_CFGCR0 DDIA
|
|
|
|
* Clock Select chooses the PLL for both DDIA and DDID and
|
|
|
|
* drives port A in all cases."
|
|
|
|
*/
|
|
|
|
val &= ~ICL_DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(phy);
|
|
|
|
val |= ICL_DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, phy);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_DPCLKA_CFGCR0, val);
|
|
|
|
intel_de_posting_read(dev_priv, ICL_DPCLKA_CFGCR0);
|
2018-04-27 23:14:36 +00:00
|
|
|
}
|
2018-11-29 14:12:16 +00:00
|
|
|
|
2019-07-09 18:39:31 +00:00
|
|
|
val &= ~icl_dpclka_cfgcr0_clk_off(dev_priv, phy);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_DPCLKA_CFGCR0, val);
|
2018-11-29 14:12:16 +00:00
|
|
|
|
2020-02-26 20:34:45 +00:00
|
|
|
mutex_unlock(&dev_priv->dpll.lock);
|
2018-04-27 23:14:36 +00:00
|
|
|
}
|
|
|
|
|
2018-11-29 14:12:16 +00:00
|
|
|
static void icl_unmap_plls_to_ports(struct intel_encoder *encoder)
|
2018-04-27 23:14:36 +00:00
|
|
|
{
|
2018-11-29 14:12:16 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-07-09 18:39:31 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2018-11-29 14:12:16 +00:00
|
|
|
u32 val;
|
2018-04-27 23:14:36 +00:00
|
|
|
|
2020-02-26 20:34:45 +00:00
|
|
|
mutex_lock(&dev_priv->dpll.lock);
|
2018-04-27 23:14:36 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_DPCLKA_CFGCR0);
|
2019-07-09 18:39:31 +00:00
|
|
|
val |= icl_dpclka_cfgcr0_clk_off(dev_priv, phy);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_DPCLKA_CFGCR0, val);
|
2018-04-27 23:14:36 +00:00
|
|
|
|
2020-02-26 20:34:45 +00:00
|
|
|
mutex_unlock(&dev_priv->dpll.lock);
|
2018-04-27 23:14:36 +00:00
|
|
|
}
|
|
|
|
|
2019-12-17 23:05:27 +00:00
|
|
|
static void icl_sanitize_port_clk_off(struct drm_i915_private *dev_priv,
|
|
|
|
u32 port_mask, bool ddi_clk_needed)
|
|
|
|
{
|
|
|
|
enum port port;
|
|
|
|
u32 val;
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, ICL_DPCLKA_CFGCR0);
|
2019-12-17 23:05:27 +00:00
|
|
|
for_each_port_masked(port, port_mask) {
|
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
2019-12-17 23:05:28 +00:00
|
|
|
bool ddi_clk_off = val & icl_dpclka_cfgcr0_clk_off(dev_priv,
|
|
|
|
phy);
|
2019-12-17 23:05:27 +00:00
|
|
|
|
2019-12-17 23:05:28 +00:00
|
|
|
if (ddi_clk_needed == !ddi_clk_off)
|
2019-12-17 23:05:27 +00:00
|
|
|
continue;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Punt on the case now where clock is gated, but it would
|
|
|
|
* be needed by the port. Something else is really broken then.
|
|
|
|
*/
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, ddi_clk_needed))
|
2019-12-17 23:05:27 +00:00
|
|
|
continue;
|
|
|
|
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_notice(&dev_priv->drm,
|
|
|
|
"PHY %c is disabled/in DSI mode with an ungated DDI clock, gate it\n",
|
|
|
|
phy_name(phy));
|
2019-12-17 23:05:27 +00:00
|
|
|
val |= icl_dpclka_cfgcr0_clk_off(dev_priv, phy);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, ICL_DPCLKA_CFGCR0, val);
|
2019-12-17 23:05:27 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2018-11-01 14:04:27 +00:00
|
|
|
void icl_sanitize_encoder_pll_mapping(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2018-11-29 14:12:17 +00:00
|
|
|
u32 port_mask;
|
|
|
|
bool ddi_clk_needed;
|
2018-11-07 20:08:36 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* In case of DP MST, we sanitize the primary encoder only, not the
|
|
|
|
* virtual ones.
|
|
|
|
*/
|
|
|
|
if (encoder->type == INTEL_OUTPUT_DP_MST)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (!encoder->base.crtc && intel_encoder_is_dp(encoder)) {
|
|
|
|
u8 pipe_mask;
|
|
|
|
bool is_mst;
|
|
|
|
|
|
|
|
intel_ddi_get_encoder_pipes(encoder, &pipe_mask, &is_mst);
|
|
|
|
/*
|
|
|
|
* In the unlikely case that BIOS enables DP in MST mode, just
|
|
|
|
* warn since our MST HW readout is incomplete.
|
|
|
|
*/
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, is_mst))
|
2018-11-07 20:08:36 +00:00
|
|
|
return;
|
|
|
|
}
|
2018-11-01 14:04:27 +00:00
|
|
|
|
2018-11-29 14:12:17 +00:00
|
|
|
port_mask = BIT(encoder->port);
|
|
|
|
ddi_clk_needed = encoder->base.crtc;
|
2018-11-01 14:04:27 +00:00
|
|
|
|
2018-11-29 14:12:17 +00:00
|
|
|
if (encoder->type == INTEL_OUTPUT_DSI) {
|
|
|
|
struct intel_encoder *other_encoder;
|
2018-11-01 14:04:27 +00:00
|
|
|
|
2018-11-29 14:12:17 +00:00
|
|
|
port_mask = intel_dsi_encoder_ports(encoder);
|
|
|
|
/*
|
|
|
|
* Sanity check that we haven't incorrectly registered another
|
|
|
|
* encoder using any of the ports of this DSI encoder.
|
|
|
|
*/
|
|
|
|
for_each_intel_encoder(&dev_priv->drm, other_encoder) {
|
|
|
|
if (other_encoder == encoder)
|
|
|
|
continue;
|
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm,
|
|
|
|
port_mask & BIT(other_encoder->port)))
|
2018-11-29 14:12:17 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
/*
|
2019-03-25 11:26:42 +00:00
|
|
|
* For DSI we keep the ddi clocks gated
|
|
|
|
* except during enable/disable sequence.
|
2018-11-29 14:12:17 +00:00
|
|
|
*/
|
2019-03-25 11:26:42 +00:00
|
|
|
ddi_clk_needed = false;
|
2018-11-29 14:12:17 +00:00
|
|
|
}
|
|
|
|
|
2019-12-17 23:05:27 +00:00
|
|
|
icl_sanitize_port_clk_off(dev_priv, port_mask, ddi_clk_needed);
|
2018-11-01 14:04:27 +00:00
|
|
|
}
|
|
|
|
|
2017-03-30 20:57:52 +00:00
|
|
|
static void intel_ddi_clk_select(struct intel_encoder *encoder,
|
2018-10-04 09:46:00 +00:00
|
|
|
const struct intel_crtc_state *crtc_state)
|
2012-10-05 15:05:58 +00:00
|
|
|
{
|
2015-08-17 15:46:20 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2019-07-09 18:39:33 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
2019-01-18 12:01:21 +00:00
|
|
|
u32 val;
|
2018-10-04 09:46:00 +00:00
|
|
|
const struct intel_shared_dpll *pll = crtc_state->shared_dpll;
|
2012-10-05 15:05:58 +00:00
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, !pll))
|
2016-09-01 22:08:07 +00:00
|
|
|
return;
|
|
|
|
|
2020-02-26 20:34:45 +00:00
|
|
|
mutex_lock(&dev_priv->dpll.lock);
|
2017-12-15 22:43:10 +00:00
|
|
|
|
2019-03-08 21:42:58 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 11) {
|
2019-07-09 18:39:33 +00:00
|
|
|
if (!intel_phy_is_combo(dev_priv, phy))
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_CLK_SEL(port),
|
|
|
|
icl_pll_to_ddi_clk_sel(encoder, crtc_state));
|
2019-07-30 17:51:21 +00:00
|
|
|
else if (IS_ELKHARTLAKE(dev_priv) && port >= PORT_C)
|
|
|
|
/*
|
|
|
|
* MG does not exist but the programming is required
|
|
|
|
* to ungate DDIC and DDID
|
|
|
|
*/
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_CLK_SEL(port),
|
|
|
|
DDI_CLK_SEL_MG);
|
2018-04-27 23:14:36 +00:00
|
|
|
} else if (IS_CANNONLAKE(dev_priv)) {
|
2017-06-09 22:26:02 +00:00
|
|
|
/* Configure DPCLKA_CFGCR0 to map the DPLL to the DDI. */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, DPCLKA_CFGCR0);
|
2017-12-01 02:17:00 +00:00
|
|
|
val &= ~DPCLKA_CFGCR0_DDI_CLK_SEL_MASK(port);
|
2018-03-20 22:06:35 +00:00
|
|
|
val |= DPCLKA_CFGCR0_DDI_CLK_SEL(pll->info->id, port);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DPCLKA_CFGCR0, val);
|
2014-11-13 14:55:19 +00:00
|
|
|
|
2017-06-09 22:26:02 +00:00
|
|
|
/*
|
|
|
|
* Configure DPCLKA_CFGCR0 to turn on the clock for the DDI.
|
|
|
|
* This step and the step before must be done with separate
|
|
|
|
* register writes.
|
|
|
|
*/
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, DPCLKA_CFGCR0);
|
2017-10-03 22:08:58 +00:00
|
|
|
val &= ~DPCLKA_CFGCR0_DDI_CLK_OFF(port);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DPCLKA_CFGCR0, val);
|
2017-06-09 22:26:02 +00:00
|
|
|
} else if (IS_GEN9_BC(dev_priv)) {
|
2014-11-14 17:24:33 +00:00
|
|
|
/* DDI -> PLL mapping */
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, DPLL_CTRL2);
|
2014-11-13 14:55:19 +00:00
|
|
|
|
|
|
|
val &= ~(DPLL_CTRL2_DDI_CLK_OFF(port) |
|
2017-12-19 11:26:49 +00:00
|
|
|
DPLL_CTRL2_DDI_CLK_SEL_MASK(port));
|
2018-03-20 22:06:35 +00:00
|
|
|
val |= (DPLL_CTRL2_DDI_CLK_SEL(pll->info->id, port) |
|
2014-11-13 14:55:19 +00:00
|
|
|
DPLL_CTRL2_DDI_SEL_OVERRIDE(port));
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DPLL_CTRL2, val);
|
2014-11-14 17:24:33 +00:00
|
|
|
|
2018-02-09 21:58:46 +00:00
|
|
|
} else if (INTEL_GEN(dev_priv) < 9) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, PORT_CLK_SEL(port),
|
|
|
|
hsw_pll_to_ddi_pll_sel(pll));
|
2014-11-13 14:55:19 +00:00
|
|
|
}
|
2017-12-15 22:43:10 +00:00
|
|
|
|
2020-02-26 20:34:45 +00:00
|
|
|
mutex_unlock(&dev_priv->dpll.lock);
|
2015-08-17 15:46:20 +00:00
|
|
|
}
|
|
|
|
|
2017-10-10 12:12:00 +00:00
|
|
|
static void intel_ddi_clk_disable(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2019-07-09 18:39:33 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
2017-10-10 12:12:00 +00:00
|
|
|
|
2019-03-08 21:42:58 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 11) {
|
2019-07-30 17:51:21 +00:00
|
|
|
if (!intel_phy_is_combo(dev_priv, phy) ||
|
|
|
|
(IS_ELKHARTLAKE(dev_priv) && port >= PORT_C))
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_CLK_SEL(port),
|
|
|
|
DDI_CLK_SEL_NONE);
|
2018-04-27 23:14:36 +00:00
|
|
|
} else if (IS_CANNONLAKE(dev_priv)) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DPCLKA_CFGCR0,
|
|
|
|
intel_de_read(dev_priv, DPCLKA_CFGCR0) | DPCLKA_CFGCR0_DDI_CLK_OFF(port));
|
2018-04-27 23:14:36 +00:00
|
|
|
} else if (IS_GEN9_BC(dev_priv)) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DPLL_CTRL2,
|
|
|
|
intel_de_read(dev_priv, DPLL_CTRL2) | DPLL_CTRL2_DDI_CLK_OFF(port));
|
2018-04-27 23:14:36 +00:00
|
|
|
} else if (INTEL_GEN(dev_priv) < 9) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, PORT_CLK_SEL(port),
|
|
|
|
PORT_CLK_SEL_NONE);
|
2018-04-27 23:14:36 +00:00
|
|
|
}
|
2017-10-10 12:12:00 +00:00
|
|
|
}
|
|
|
|
|
2019-09-26 21:06:56 +00:00
|
|
|
static void
|
2020-07-01 04:50:54 +00:00
|
|
|
icl_program_mg_dp_mode(struct intel_digital_port *dig_port,
|
2019-09-26 21:06:56 +00:00
|
|
|
const struct intel_crtc_state *crtc_state)
|
2018-11-02 19:26:56 +00:00
|
|
|
{
|
2020-07-01 04:50:54 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
|
|
|
|
enum tc_port tc_port = intel_port_to_tc(dev_priv, dig_port->base.port);
|
2019-09-26 21:06:56 +00:00
|
|
|
u32 ln0, ln1, pin_assignment;
|
|
|
|
u8 width;
|
2018-11-02 19:26:56 +00:00
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
if (dig_port->tc_mode == TC_PORT_TBT_ALT)
|
2018-11-02 19:26:56 +00:00
|
|
|
return;
|
|
|
|
|
2019-09-26 21:06:57 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, HIP_INDEX_REG(tc_port),
|
|
|
|
HIP_INDEX_VAL(tc_port, 0x0));
|
|
|
|
ln0 = intel_de_read(dev_priv, DKL_DP_MODE(tc_port));
|
|
|
|
intel_de_write(dev_priv, HIP_INDEX_REG(tc_port),
|
|
|
|
HIP_INDEX_VAL(tc_port, 0x1));
|
|
|
|
ln1 = intel_de_read(dev_priv, DKL_DP_MODE(tc_port));
|
2019-09-26 21:06:57 +00:00
|
|
|
} else {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
ln0 = intel_de_read(dev_priv, MG_DP_MODE(0, tc_port));
|
|
|
|
ln1 = intel_de_read(dev_priv, MG_DP_MODE(1, tc_port));
|
2019-09-26 21:06:57 +00:00
|
|
|
}
|
2018-11-02 19:26:56 +00:00
|
|
|
|
2020-06-08 20:45:37 +00:00
|
|
|
ln0 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE);
|
2019-09-26 21:06:56 +00:00
|
|
|
ln1 &= ~(MG_DP_MODE_CFG_DP_X1_MODE | MG_DP_MODE_CFG_DP_X2_MODE);
|
2018-11-02 19:26:56 +00:00
|
|
|
|
2019-09-26 21:06:56 +00:00
|
|
|
/* DPPATC */
|
2020-07-01 04:50:54 +00:00
|
|
|
pin_assignment = intel_tc_port_get_pin_assignment_mask(dig_port);
|
2019-09-26 21:06:56 +00:00
|
|
|
width = crtc_state->lane_count;
|
2018-11-02 19:26:56 +00:00
|
|
|
|
2019-09-26 21:06:56 +00:00
|
|
|
switch (pin_assignment) {
|
|
|
|
case 0x0:
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm,
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->tc_mode != TC_PORT_LEGACY);
|
2019-09-26 21:06:56 +00:00
|
|
|
if (width == 1) {
|
|
|
|
ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
|
|
|
} else {
|
|
|
|
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
|
|
|
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x1:
|
|
|
|
if (width == 4) {
|
|
|
|
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
|
|
|
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x2:
|
|
|
|
if (width == 2) {
|
|
|
|
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
|
|
|
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
|
|
|
}
|
|
|
|
break;
|
|
|
|
case 0x3:
|
|
|
|
case 0x5:
|
|
|
|
if (width == 1) {
|
2018-11-02 19:26:56 +00:00
|
|
|
ln0 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
|
|
|
ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
2019-09-26 21:06:56 +00:00
|
|
|
} else {
|
|
|
|
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
|
|
|
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
2018-11-02 19:26:56 +00:00
|
|
|
}
|
|
|
|
break;
|
2019-09-26 21:06:56 +00:00
|
|
|
case 0x4:
|
|
|
|
case 0x6:
|
|
|
|
if (width == 1) {
|
|
|
|
ln0 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
|
|
|
ln1 |= MG_DP_MODE_CFG_DP_X1_MODE;
|
|
|
|
} else {
|
|
|
|
ln0 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
|
|
|
ln1 |= MG_DP_MODE_CFG_DP_X2_MODE;
|
|
|
|
}
|
2018-11-02 19:26:56 +00:00
|
|
|
break;
|
|
|
|
default:
|
2019-09-26 21:06:56 +00:00
|
|
|
MISSING_CASE(pin_assignment);
|
2018-11-02 19:26:56 +00:00
|
|
|
}
|
|
|
|
|
2019-09-26 21:06:57 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, HIP_INDEX_REG(tc_port),
|
|
|
|
HIP_INDEX_VAL(tc_port, 0x0));
|
|
|
|
intel_de_write(dev_priv, DKL_DP_MODE(tc_port), ln0);
|
|
|
|
intel_de_write(dev_priv, HIP_INDEX_REG(tc_port),
|
|
|
|
HIP_INDEX_VAL(tc_port, 0x1));
|
|
|
|
intel_de_write(dev_priv, DKL_DP_MODE(tc_port), ln1);
|
2019-09-26 21:06:57 +00:00
|
|
|
} else {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, MG_DP_MODE(0, tc_port), ln0);
|
|
|
|
intel_de_write(dev_priv, MG_DP_MODE(1, tc_port), ln1);
|
2019-09-26 21:06:57 +00:00
|
|
|
}
|
2018-11-02 19:26:56 +00:00
|
|
|
}
|
|
|
|
|
2018-11-28 20:26:26 +00:00
|
|
|
static void intel_dp_sink_set_fec_ready(struct intel_dp *intel_dp,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
|
|
|
{
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
struct drm_i915_private *i915 = dp_to_i915(intel_dp);
|
|
|
|
|
2018-11-28 20:26:26 +00:00
|
|
|
if (!crtc_state->fec_enable)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (drm_dp_dpcd_writeb(&intel_dp->aux, DP_FEC_CONFIGURATION, DP_FEC_READY) <= 0)
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
"Failed to set FEC_READY in the sink\n");
|
2018-11-28 20:26:26 +00:00
|
|
|
}
|
|
|
|
|
2018-11-28 20:26:27 +00:00
|
|
|
static void intel_ddi_enable_fec(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-09-04 21:34:17 +00:00
|
|
|
struct intel_dp *intel_dp;
|
2018-11-28 20:26:27 +00:00
|
|
|
u32 val;
|
|
|
|
|
|
|
|
if (!crtc_state->fec_enable)
|
|
|
|
return;
|
|
|
|
|
2019-12-04 18:05:43 +00:00
|
|
|
intel_dp = enc_to_intel_dp(encoder);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, intel_dp->regs.dp_tp_ctl);
|
2018-11-28 20:26:27 +00:00
|
|
|
val |= DP_TP_CTL_FEC_ENABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, intel_dp->regs.dp_tp_ctl, val);
|
2018-11-28 20:26:27 +00:00
|
|
|
|
2019-09-04 21:34:17 +00:00
|
|
|
if (intel_de_wait_for_set(dev_priv, intel_dp->regs.dp_tp_status,
|
2019-08-16 01:23:43 +00:00
|
|
|
DP_TP_STATUS_FEC_ENABLE_LIVE, 1))
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"Timed out waiting for FEC Enable Status\n");
|
2018-11-28 20:26:27 +00:00
|
|
|
}
|
|
|
|
|
2018-11-28 20:26:28 +00:00
|
|
|
static void intel_ddi_disable_fec_state(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-09-04 21:34:17 +00:00
|
|
|
struct intel_dp *intel_dp;
|
2018-11-28 20:26:28 +00:00
|
|
|
u32 val;
|
|
|
|
|
|
|
|
if (!crtc_state->fec_enable)
|
|
|
|
return;
|
|
|
|
|
2019-12-04 18:05:43 +00:00
|
|
|
intel_dp = enc_to_intel_dp(encoder);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, intel_dp->regs.dp_tp_ctl);
|
2018-11-28 20:26:28 +00:00
|
|
|
val &= ~DP_TP_CTL_FEC_ENABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, intel_dp->regs.dp_tp_ctl, val);
|
|
|
|
intel_de_posting_read(dev_priv, intel_dp->regs.dp_tp_ctl);
|
2018-11-28 20:26:28 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void tgl_ddi_pre_enable_dp(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2019-08-23 08:20:47 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2019-08-23 08:20:47 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2019-08-23 08:20:47 +00:00
|
|
|
bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
|
|
|
|
int level = intel_ddi_dp_level(intel_dp);
|
2019-09-04 21:34:17 +00:00
|
|
|
enum transcoder transcoder = crtc_state->cpu_transcoder;
|
2019-08-23 08:20:47 +00:00
|
|
|
|
|
|
|
intel_dp_set_link_params(intel_dp, crtc_state->port_clock,
|
|
|
|
crtc_state->lane_count, is_mst);
|
|
|
|
|
2019-09-04 21:34:17 +00:00
|
|
|
intel_dp->regs.dp_tp_ctl = TGL_DP_TP_CTL(transcoder);
|
|
|
|
intel_dp->regs.dp_tp_status = TGL_DP_TP_STATUS(transcoder);
|
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/*
|
|
|
|
* 1. Enable Power Wells
|
|
|
|
*
|
|
|
|
* This was handled at the beginning of intel_atomic_commit_tail(),
|
|
|
|
* before we called down into this function.
|
|
|
|
*/
|
2019-08-23 08:20:47 +00:00
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/* 2. Enable Panel Power if PPS is required */
|
2019-08-23 08:20:47 +00:00
|
|
|
intel_edp_panel_on(intel_dp);
|
|
|
|
|
|
|
|
/*
|
2019-11-07 17:45:27 +00:00
|
|
|
* 3. For non-TBT Type-C ports, set FIA lane count
|
|
|
|
* (DFLEXDPSP.DPX4TXLATC)
|
|
|
|
*
|
|
|
|
* This was done before tgl_ddi_pre_enable_dp by
|
2019-12-24 08:40:05 +00:00
|
|
|
* hsw_crtc_enable()->intel_encoders_pre_pll_enable().
|
2019-08-23 08:20:47 +00:00
|
|
|
*/
|
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/*
|
|
|
|
* 4. Enable the port PLL.
|
|
|
|
*
|
|
|
|
* The PLL enabling itself was already done before this function by
|
2019-12-24 08:40:05 +00:00
|
|
|
* hsw_crtc_enable()->intel_enable_shared_dpll(). We need only
|
2019-11-07 17:45:27 +00:00
|
|
|
* configure the PLL to port mapping here.
|
|
|
|
*/
|
2019-09-20 20:58:05 +00:00
|
|
|
intel_ddi_clk_select(encoder, crtc_state);
|
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/* 5. If IO power is controlled through PWR_WELL_CTL, Enable IO Power */
|
2019-08-23 08:20:47 +00:00
|
|
|
if (!intel_phy_is_tc(dev_priv, phy) ||
|
|
|
|
dig_port->tc_mode != TC_PORT_TBT_ALT)
|
|
|
|
intel_display_power_get(dev_priv,
|
|
|
|
dig_port->ddi_io_power_domain);
|
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/* 6. Program DP_MODE */
|
2019-09-26 21:06:56 +00:00
|
|
|
icl_program_mg_dp_mode(dig_port, crtc_state);
|
2019-08-23 08:20:47 +00:00
|
|
|
|
|
|
|
/*
|
2019-11-07 17:45:27 +00:00
|
|
|
* 7. The rest of the below are substeps under the bspec's "Enable and
|
|
|
|
* Train Display Port" step. Note that steps that are specific to
|
|
|
|
* MST will be handled by intel_mst_pre_enable_dp() before/after it
|
|
|
|
* calls into this function. Also intel_mst_pre_enable_dp() only calls
|
|
|
|
* us when active_mst_links==0, so any steps designated for "single
|
|
|
|
* stream or multi-stream master transcoder" can just be performed
|
|
|
|
* unconditionally here.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* 7.a Configure Transcoder Clock Select to direct the Port clock to the
|
|
|
|
* Transcoder.
|
2019-08-23 08:20:47 +00:00
|
|
|
*/
|
2020-04-17 13:47:17 +00:00
|
|
|
intel_ddi_enable_pipe_clock(encoder, crtc_state);
|
2019-08-23 08:20:47 +00:00
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/*
|
|
|
|
* 7.b Configure TRANS_DDI_FUNC_CTL DDI Select, DDI Mode Select & MST
|
|
|
|
* Transport Select
|
|
|
|
*/
|
2020-04-17 13:47:20 +00:00
|
|
|
intel_ddi_config_transcoder_func(encoder, crtc_state);
|
2019-08-23 08:20:47 +00:00
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/*
|
|
|
|
* 7.c Configure & enable DP_TP_CTL with link training pattern 1
|
|
|
|
* selected
|
|
|
|
*
|
|
|
|
* This will be handled by the intel_dp_start_link_train() farther
|
|
|
|
* down this function.
|
|
|
|
*/
|
|
|
|
|
|
|
|
/* 7.e Configure voltage swing and related IO settings */
|
2019-09-26 21:06:57 +00:00
|
|
|
tgl_ddi_vswing_sequence(encoder, crtc_state->port_clock, level,
|
2019-08-23 08:20:47 +00:00
|
|
|
encoder->type);
|
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/*
|
|
|
|
* 7.f Combo PHY: Configure PORT_CL_DW10 Static Power Down to power up
|
|
|
|
* the used lanes of the DDI.
|
|
|
|
*/
|
2019-08-23 08:20:47 +00:00
|
|
|
if (intel_phy_is_combo(dev_priv, phy)) {
|
|
|
|
bool lane_reversal =
|
|
|
|
dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL;
|
|
|
|
|
|
|
|
intel_combo_phy_power_up_lanes(dev_priv, phy, false,
|
|
|
|
crtc_state->lane_count,
|
|
|
|
lane_reversal);
|
|
|
|
}
|
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/*
|
|
|
|
* 7.g Configure and enable DDI_BUF_CTL
|
|
|
|
* 7.h Wait for DDI_BUF_CTL DDI Idle Status = 0b (Not Idle), timeout
|
|
|
|
* after 500 us.
|
|
|
|
*
|
|
|
|
* We only configure what the register value will be here. Actual
|
|
|
|
* enabling happens during link training farther down.
|
|
|
|
*/
|
2019-08-23 08:20:47 +00:00
|
|
|
intel_ddi_init_dp_buf_reg(encoder);
|
|
|
|
|
|
|
|
if (!is_mst)
|
|
|
|
intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
|
|
|
|
|
|
|
|
intel_dp_sink_set_decompression_state(intel_dp, crtc_state, true);
|
|
|
|
/*
|
|
|
|
* DDI FEC: "anticipates enabling FEC encoding sets the FEC_READY bit
|
|
|
|
* in the FEC_CONFIGURATION register to 1 before initiating link
|
|
|
|
* training
|
|
|
|
*/
|
|
|
|
intel_dp_sink_set_fec_ready(intel_dp, crtc_state);
|
2019-11-07 17:45:27 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* 7.i Follow DisplayPort specification training sequence (see notes for
|
|
|
|
* failure handling)
|
|
|
|
* 7.j If DisplayPort multi-stream - Set DP_TP_CTL link training to Idle
|
|
|
|
* Pattern, wait for 5 idle patterns (DP_TP_STATUS Min_Idles_Sent)
|
|
|
|
* (timeout after 800 us)
|
|
|
|
*/
|
2019-08-23 08:20:47 +00:00
|
|
|
intel_dp_start_link_train(intel_dp);
|
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/* 7.k Set DP_TP_CTL link training to Normal */
|
2019-10-18 17:27:23 +00:00
|
|
|
if (!is_trans_port_sync_mode(crtc_state))
|
|
|
|
intel_dp_stop_link_train(intel_dp);
|
2019-08-23 08:20:47 +00:00
|
|
|
|
2019-11-07 17:45:27 +00:00
|
|
|
/* 7.l Configure and enable FEC if needed */
|
2019-08-23 08:20:47 +00:00
|
|
|
intel_ddi_enable_fec(encoder, crtc_state);
|
|
|
|
intel_dsc_enable(encoder, crtc_state);
|
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void hsw_ddi_pre_enable_dp(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2019-08-23 08:20:47 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2015-08-17 15:46:20 +00:00
|
|
|
{
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2016-09-01 22:08:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2019-07-09 18:39:32 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2017-10-10 12:12:06 +00:00
|
|
|
bool is_mst = intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST);
|
2017-10-18 18:19:58 +00:00
|
|
|
int level = intel_ddi_dp_level(intel_dp);
|
2016-05-02 19:08:24 +00:00
|
|
|
|
2020-01-07 17:09:22 +00:00
|
|
|
if (INTEL_GEN(dev_priv) < 11)
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm,
|
|
|
|
is_mst && (port == PORT_A || port == PORT_E));
|
2020-01-07 17:09:22 +00:00
|
|
|
else
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, is_mst && port == PORT_A);
|
2017-03-02 12:58:57 +00:00
|
|
|
|
2017-10-10 12:12:06 +00:00
|
|
|
intel_dp_set_link_params(intel_dp, crtc_state->port_clock,
|
|
|
|
crtc_state->lane_count, is_mst);
|
2017-10-10 12:12:04 +00:00
|
|
|
|
|
|
|
intel_edp_panel_on(intel_dp);
|
2016-07-12 12:59:33 +00:00
|
|
|
|
2018-10-04 09:46:00 +00:00
|
|
|
intel_ddi_clk_select(encoder, crtc_state);
|
2017-02-24 14:19:59 +00:00
|
|
|
|
2019-07-09 18:39:33 +00:00
|
|
|
if (!intel_phy_is_tc(dev_priv, phy) ||
|
2019-06-28 14:36:17 +00:00
|
|
|
dig_port->tc_mode != TC_PORT_TBT_ALT)
|
|
|
|
intel_display_power_get(dev_priv,
|
|
|
|
dig_port->ddi_io_power_domain);
|
2017-02-24 14:19:59 +00:00
|
|
|
|
2019-09-26 21:06:56 +00:00
|
|
|
icl_program_mg_dp_mode(dig_port, crtc_state);
|
2018-07-25 00:28:12 +00:00
|
|
|
|
2019-03-08 21:42:58 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 11)
|
2018-06-28 22:35:44 +00:00
|
|
|
icl_ddi_vswing_sequence(encoder, crtc_state->port_clock,
|
|
|
|
level, encoder->type);
|
2018-03-28 21:58:02 +00:00
|
|
|
else if (IS_CANNONLAKE(dev_priv))
|
2017-10-16 14:57:01 +00:00
|
|
|
cnl_ddi_vswing_sequence(encoder, level, encoder->type);
|
2017-08-29 23:22:26 +00:00
|
|
|
else if (IS_GEN9_LP(dev_priv))
|
2017-10-16 14:57:00 +00:00
|
|
|
bxt_ddi_vswing_sequence(encoder, level, encoder->type);
|
2017-08-29 23:22:26 +00:00
|
|
|
else
|
2017-10-19 13:37:13 +00:00
|
|
|
intel_prepare_dp_ddi_buffers(encoder, crtc_state);
|
2017-08-29 23:22:25 +00:00
|
|
|
|
2019-07-09 18:39:33 +00:00
|
|
|
if (intel_phy_is_combo(dev_priv, phy)) {
|
2019-04-25 18:52:53 +00:00
|
|
|
bool lane_reversal =
|
|
|
|
dig_port->saved_port_bits & DDI_BUF_PORT_REVERSAL;
|
|
|
|
|
2019-07-09 18:39:32 +00:00
|
|
|
intel_combo_phy_power_up_lanes(dev_priv, phy, false,
|
2019-04-25 18:52:53 +00:00
|
|
|
crtc_state->lane_count,
|
|
|
|
lane_reversal);
|
|
|
|
}
|
|
|
|
|
2016-09-01 22:08:08 +00:00
|
|
|
intel_ddi_init_dp_buf_reg(encoder);
|
2018-04-07 01:10:53 +00:00
|
|
|
if (!is_mst)
|
|
|
|
intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_ON);
|
2018-11-28 20:26:17 +00:00
|
|
|
intel_dp_sink_set_decompression_state(intel_dp, crtc_state,
|
|
|
|
true);
|
2018-11-28 20:26:26 +00:00
|
|
|
intel_dp_sink_set_fec_ready(intel_dp, crtc_state);
|
2016-09-01 22:08:08 +00:00
|
|
|
intel_dp_start_link_train(intel_dp);
|
2019-10-18 17:27:23 +00:00
|
|
|
if ((port != PORT_A || INTEL_GEN(dev_priv) >= 9) &&
|
|
|
|
!is_trans_port_sync_mode(crtc_state))
|
2016-09-01 22:08:08 +00:00
|
|
|
intel_dp_stop_link_train(intel_dp);
|
2018-06-13 17:27:46 +00:00
|
|
|
|
2018-11-28 20:26:27 +00:00
|
|
|
intel_ddi_enable_fec(encoder, crtc_state);
|
|
|
|
|
2018-08-31 17:47:39 +00:00
|
|
|
if (!is_mst)
|
2020-04-17 13:47:17 +00:00
|
|
|
intel_ddi_enable_pipe_clock(encoder, crtc_state);
|
2018-11-28 20:26:19 +00:00
|
|
|
|
|
|
|
intel_dsc_enable(encoder, crtc_state);
|
2016-09-01 22:08:08 +00:00
|
|
|
}
|
2015-08-17 15:05:12 +00:00
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_ddi_pre_enable_dp(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2019-08-23 08:20:47 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 12)
|
2020-03-13 16:48:30 +00:00
|
|
|
tgl_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state);
|
2019-08-23 08:20:47 +00:00
|
|
|
else
|
2020-03-13 16:48:30 +00:00
|
|
|
hsw_ddi_pre_enable_dp(state, encoder, crtc_state, conn_state);
|
2019-09-19 19:53:05 +00:00
|
|
|
|
2019-11-06 21:26:36 +00:00
|
|
|
/* MST will call a setting of MSA after an allocating of Virtual Channel
|
|
|
|
* from MST encoder pre_enable callback.
|
|
|
|
*/
|
2020-02-11 18:50:07 +00:00
|
|
|
if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_DP_MST)) {
|
2019-11-06 21:26:36 +00:00
|
|
|
intel_ddi_set_dp_msa(crtc_state, conn_state);
|
2020-01-28 16:28:50 +00:00
|
|
|
|
2020-02-11 18:50:07 +00:00
|
|
|
intel_dp_set_m_n(crtc_state, M1_N1);
|
|
|
|
}
|
2019-08-23 08:20:47 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_ddi_pre_enable_hdmi(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2016-11-23 14:57:00 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
2017-10-10 12:12:06 +00:00
|
|
|
const struct drm_connector_state *conn_state)
|
2016-09-01 22:08:08 +00:00
|
|
|
{
|
2020-06-26 23:48:32 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
|
|
|
struct intel_hdmi *intel_hdmi = &dig_port->hdmi;
|
2016-09-01 22:08:08 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2020-01-17 14:29:22 +00:00
|
|
|
int level = intel_ddi_hdmi_level(encoder);
|
2012-10-15 18:51:41 +00:00
|
|
|
|
2016-09-01 22:08:08 +00:00
|
|
|
intel_dp_dual_mode_set_tmds_output(intel_hdmi, true);
|
2018-10-04 09:46:00 +00:00
|
|
|
intel_ddi_clk_select(encoder, crtc_state);
|
2017-02-24 14:19:59 +00:00
|
|
|
|
|
|
|
intel_display_power_get(dev_priv, dig_port->ddi_io_power_domain);
|
|
|
|
|
2019-09-26 21:06:56 +00:00
|
|
|
icl_program_mg_dp_mode(dig_port, crtc_state);
|
2018-11-02 19:26:55 +00:00
|
|
|
|
2019-09-26 21:06:57 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12)
|
|
|
|
tgl_ddi_vswing_sequence(encoder, crtc_state->port_clock,
|
|
|
|
level, INTEL_OUTPUT_HDMI);
|
|
|
|
else if (INTEL_GEN(dev_priv) == 11)
|
2018-06-28 22:35:44 +00:00
|
|
|
icl_ddi_vswing_sequence(encoder, crtc_state->port_clock,
|
|
|
|
level, INTEL_OUTPUT_HDMI);
|
2018-03-28 21:58:02 +00:00
|
|
|
else if (IS_CANNONLAKE(dev_priv))
|
2017-10-16 14:57:01 +00:00
|
|
|
cnl_ddi_vswing_sequence(encoder, level, INTEL_OUTPUT_HDMI);
|
2016-12-02 08:23:49 +00:00
|
|
|
else if (IS_GEN9_LP(dev_priv))
|
2017-10-16 14:57:00 +00:00
|
|
|
bxt_ddi_vswing_sequence(encoder, level, INTEL_OUTPUT_HDMI);
|
2017-08-29 23:22:25 +00:00
|
|
|
else
|
2017-10-16 14:56:59 +00:00
|
|
|
intel_prepare_hdmi_ddi_buffers(encoder, level);
|
2017-08-29 23:22:25 +00:00
|
|
|
|
|
|
|
if (IS_GEN9_BC(dev_priv))
|
2017-10-16 14:56:58 +00:00
|
|
|
skl_ddi_set_iboost(encoder, level, INTEL_OUTPUT_HDMI);
|
2016-07-12 12:59:30 +00:00
|
|
|
|
2020-04-17 13:47:17 +00:00
|
|
|
intel_ddi_enable_pipe_clock(encoder, crtc_state);
|
2018-06-13 17:07:09 +00:00
|
|
|
|
2020-06-26 23:48:32 +00:00
|
|
|
dig_port->set_infoframes(encoder,
|
|
|
|
crtc_state->has_infoframe,
|
|
|
|
crtc_state, conn_state);
|
2016-09-01 22:08:08 +00:00
|
|
|
}
|
2016-07-12 12:59:33 +00:00
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_ddi_pre_enable(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:06 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
2017-08-18 13:49:58 +00:00
|
|
|
const struct drm_connector_state *conn_state)
|
2016-09-01 22:08:08 +00:00
|
|
|
{
|
2019-10-31 11:26:03 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(crtc_state->uapi.crtc);
|
2017-10-10 12:12:06 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc->base.dev);
|
|
|
|
enum pipe pipe = crtc->pipe;
|
2014-04-24 21:54:58 +00:00
|
|
|
|
2017-10-27 19:31:27 +00:00
|
|
|
/*
|
|
|
|
* When called from DP MST code:
|
|
|
|
* - conn_state will be NULL
|
|
|
|
* - encoder will be the main encoder (ie. mst->primary)
|
|
|
|
* - the main connector associated with this port
|
|
|
|
* won't be active or linked to a crtc
|
|
|
|
* - crtc_state will be the state of the first stream to
|
|
|
|
* be activated on this port, and it may not be the same
|
|
|
|
* stream that will be deactivated last, but each stream
|
|
|
|
* should have a state that is identical when it comes to
|
|
|
|
* the DP link parameteres
|
|
|
|
*/
|
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, crtc_state->has_pch_encoder);
|
2017-10-05 10:52:12 +00:00
|
|
|
|
2018-11-29 14:12:16 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 11)
|
|
|
|
icl_map_plls_to_ports(encoder, crtc_state);
|
|
|
|
|
2017-10-05 10:52:12 +00:00
|
|
|
intel_set_cpu_fifo_underrun_reporting(dev_priv, pipe, true);
|
|
|
|
|
2018-10-12 06:23:11 +00:00
|
|
|
if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI)) {
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_ddi_pre_enable_hdmi(state, encoder, crtc_state,
|
|
|
|
conn_state);
|
2018-10-12 06:23:11 +00:00
|
|
|
} else {
|
|
|
|
struct intel_lspcon *lspcon =
|
2019-12-04 18:05:43 +00:00
|
|
|
enc_to_intel_lspcon(encoder);
|
2018-10-12 06:23:11 +00:00
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_ddi_pre_enable_dp(state, encoder, crtc_state,
|
|
|
|
conn_state);
|
2018-10-12 06:23:11 +00:00
|
|
|
if (lspcon->active) {
|
|
|
|
struct intel_digital_port *dig_port =
|
2019-12-04 18:05:43 +00:00
|
|
|
enc_to_dig_port(encoder);
|
2018-10-12 06:23:11 +00:00
|
|
|
|
|
|
|
dig_port->set_infoframes(encoder,
|
|
|
|
crtc_state->has_infoframe,
|
|
|
|
crtc_state, conn_state);
|
|
|
|
}
|
|
|
|
}
|
2012-10-05 15:05:58 +00:00
|
|
|
}
|
|
|
|
|
2018-11-28 20:26:28 +00:00
|
|
|
static void intel_disable_ddi_buf(struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
2017-10-10 12:12:01 +00:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2017-10-10 12:12:01 +00:00
|
|
|
bool wait = false;
|
|
|
|
u32 val;
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, DDI_BUF_CTL(port));
|
2017-10-10 12:12:01 +00:00
|
|
|
if (val & DDI_BUF_CTL_ENABLE) {
|
|
|
|
val &= ~DDI_BUF_CTL_ENABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_BUF_CTL(port), val);
|
2017-10-10 12:12:01 +00:00
|
|
|
wait = true;
|
|
|
|
}
|
|
|
|
|
2019-09-04 21:34:16 +00:00
|
|
|
if (intel_crtc_has_dp_encoder(crtc_state)) {
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2019-09-04 21:34:17 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, intel_dp->regs.dp_tp_ctl);
|
2019-09-04 21:34:16 +00:00
|
|
|
val &= ~(DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_MASK);
|
|
|
|
val |= DP_TP_CTL_LINK_TRAIN_PAT1;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, intel_dp->regs.dp_tp_ctl, val);
|
2019-09-04 21:34:16 +00:00
|
|
|
}
|
2017-10-10 12:12:01 +00:00
|
|
|
|
2018-11-28 20:26:28 +00:00
|
|
|
/* Disable FEC in DP Sink */
|
|
|
|
intel_ddi_disable_fec_state(encoder, crtc_state);
|
|
|
|
|
2017-10-10 12:12:01 +00:00
|
|
|
if (wait)
|
|
|
|
intel_wait_ddi_buf_idle(dev_priv, port);
|
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_ddi_post_disable_dp(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:03 +00:00
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
2012-10-05 15:05:58 +00:00
|
|
|
{
|
2017-10-10 12:12:03 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2017-10-10 12:12:03 +00:00
|
|
|
struct intel_dp *intel_dp = &dig_port->dp;
|
2018-04-07 01:10:53 +00:00
|
|
|
bool is_mst = intel_crtc_has_type(old_crtc_state,
|
|
|
|
INTEL_OUTPUT_DP_MST);
|
2019-07-09 18:39:33 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
2012-10-05 15:06:00 +00:00
|
|
|
|
2020-06-09 22:06:16 +00:00
|
|
|
if (!is_mst)
|
|
|
|
intel_dp_set_infoframes(encoder, false,
|
|
|
|
old_crtc_state, old_conn_state);
|
2020-05-14 06:07:30 +00:00
|
|
|
|
2019-12-02 22:25:13 +00:00
|
|
|
/*
|
|
|
|
* Power down sink before disabling the port, otherwise we end
|
|
|
|
* up getting interrupts from the sink on detecting link loss.
|
|
|
|
*/
|
|
|
|
intel_dp_sink_dpms(intel_dp, DRM_MODE_DPMS_OFF);
|
|
|
|
|
2019-12-23 01:06:51 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12) {
|
|
|
|
if (is_mst) {
|
|
|
|
enum transcoder cpu_transcoder = old_crtc_state->cpu_transcoder;
|
|
|
|
u32 val;
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv,
|
|
|
|
TRANS_DDI_FUNC_CTL(cpu_transcoder));
|
2020-02-03 22:55:49 +00:00
|
|
|
val &= ~(TGL_TRANS_DDI_PORT_MASK |
|
|
|
|
TRANS_DDI_MODE_SELECT_MASK);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv,
|
|
|
|
TRANS_DDI_FUNC_CTL(cpu_transcoder),
|
|
|
|
val);
|
2019-12-23 01:06:51 +00:00
|
|
|
}
|
|
|
|
} else {
|
|
|
|
if (!is_mst)
|
|
|
|
intel_ddi_disable_pipe_clock(old_crtc_state);
|
|
|
|
}
|
2017-08-22 14:09:14 +00:00
|
|
|
|
2018-11-28 20:26:28 +00:00
|
|
|
intel_disable_ddi_buf(encoder, old_crtc_state);
|
2017-05-31 17:05:35 +00:00
|
|
|
|
2019-12-05 21:03:49 +00:00
|
|
|
/*
|
|
|
|
* From TGL spec: "If single stream or multi-stream master transcoder:
|
|
|
|
* Configure Transcoder Clock select to direct no clock to the
|
|
|
|
* transcoder"
|
|
|
|
*/
|
|
|
|
if (INTEL_GEN(dev_priv) >= 12)
|
|
|
|
intel_ddi_disable_pipe_clock(old_crtc_state);
|
|
|
|
|
2017-10-10 12:12:03 +00:00
|
|
|
intel_edp_panel_vdd_on(intel_dp);
|
|
|
|
intel_edp_panel_off(intel_dp);
|
2012-10-15 18:51:32 +00:00
|
|
|
|
2019-07-09 18:39:33 +00:00
|
|
|
if (!intel_phy_is_tc(dev_priv, phy) ||
|
2019-06-28 14:36:17 +00:00
|
|
|
dig_port->tc_mode != TC_PORT_TBT_ALT)
|
|
|
|
intel_display_power_put_unchecked(dev_priv,
|
|
|
|
dig_port->ddi_io_power_domain);
|
2017-08-22 14:09:14 +00:00
|
|
|
|
2017-10-10 12:12:03 +00:00
|
|
|
intel_ddi_clk_disable(encoder);
|
|
|
|
}
|
2017-08-22 14:09:14 +00:00
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_ddi_post_disable_hdmi(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:03 +00:00
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2017-10-10 12:12:03 +00:00
|
|
|
struct intel_hdmi *intel_hdmi = &dig_port->hdmi;
|
2012-10-23 20:30:07 +00:00
|
|
|
|
2018-09-20 18:51:36 +00:00
|
|
|
dig_port->set_infoframes(encoder, false,
|
2018-06-13 17:07:09 +00:00
|
|
|
old_crtc_state, old_conn_state);
|
|
|
|
|
2018-06-13 17:27:46 +00:00
|
|
|
intel_ddi_disable_pipe_clock(old_crtc_state);
|
|
|
|
|
2018-11-28 20:26:28 +00:00
|
|
|
intel_disable_ddi_buf(encoder, old_crtc_state);
|
2017-02-24 14:19:59 +00:00
|
|
|
|
2019-01-14 14:21:24 +00:00
|
|
|
intel_display_power_put_unchecked(dev_priv,
|
|
|
|
dig_port->ddi_io_power_domain);
|
2016-05-02 19:08:24 +00:00
|
|
|
|
2017-10-10 12:12:03 +00:00
|
|
|
intel_ddi_clk_disable(encoder);
|
|
|
|
|
|
|
|
intel_dp_dual_mode_set_tmds_output(intel_hdmi, false);
|
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_ddi_post_disable(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:03 +00:00
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
|
|
|
{
|
2018-11-29 14:12:16 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2019-12-13 19:52:14 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
|
|
|
bool is_tc_port = intel_phy_is_tc(dev_priv, phy);
|
2018-11-29 14:12:16 +00:00
|
|
|
|
2020-01-08 14:45:50 +00:00
|
|
|
if (!intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_DP_MST)) {
|
|
|
|
intel_crtc_vblank_off(old_crtc_state);
|
2019-12-13 19:52:17 +00:00
|
|
|
|
2020-01-08 14:45:50 +00:00
|
|
|
intel_disable_pipe(old_crtc_state);
|
2019-12-13 19:52:17 +00:00
|
|
|
|
2020-01-08 14:45:50 +00:00
|
|
|
intel_ddi_disable_transcoder_func(old_crtc_state);
|
2019-12-13 19:52:17 +00:00
|
|
|
|
2020-01-08 14:45:50 +00:00
|
|
|
intel_dsc_disable(old_crtc_state);
|
2019-12-13 19:52:17 +00:00
|
|
|
|
2020-01-08 14:45:50 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 9)
|
|
|
|
skl_scaler_disable(old_crtc_state);
|
|
|
|
else
|
|
|
|
ilk_pfit_disable(old_crtc_state);
|
|
|
|
}
|
2019-12-13 19:52:17 +00:00
|
|
|
|
2017-10-10 12:12:03 +00:00
|
|
|
/*
|
2017-10-27 19:31:27 +00:00
|
|
|
* When called from DP MST code:
|
|
|
|
* - old_conn_state will be NULL
|
|
|
|
* - encoder will be the main encoder (ie. mst->primary)
|
|
|
|
* - the main connector associated with this port
|
|
|
|
* won't be active or linked to a crtc
|
|
|
|
* - old_crtc_state will be the state of the last stream to
|
|
|
|
* be deactivated on this port, and it may not be the same
|
|
|
|
* stream that was activated last, but each stream
|
|
|
|
* should have a state that is identical when it comes to
|
|
|
|
* the DP link parameteres
|
2017-10-10 12:12:03 +00:00
|
|
|
*/
|
2017-10-27 19:31:27 +00:00
|
|
|
|
|
|
|
if (intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_HDMI))
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_ddi_post_disable_hdmi(state, encoder, old_crtc_state,
|
|
|
|
old_conn_state);
|
2017-10-10 12:12:03 +00:00
|
|
|
else
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_ddi_post_disable_dp(state, encoder, old_crtc_state,
|
|
|
|
old_conn_state);
|
2018-11-29 14:12:16 +00:00
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 11)
|
|
|
|
icl_unmap_plls_to_ports(encoder);
|
2019-12-13 19:52:14 +00:00
|
|
|
|
|
|
|
if (intel_crtc_has_dp_encoder(old_crtc_state) || is_tc_port)
|
|
|
|
intel_display_power_put_unchecked(dev_priv,
|
|
|
|
intel_ddi_main_link_aux_domain(dig_port));
|
|
|
|
|
|
|
|
if (is_tc_port)
|
|
|
|
intel_tc_port_put_link(dig_port);
|
2012-10-05 15:05:58 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
void intel_ddi_fdi_post_disable(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-08-18 13:49:58 +00:00
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
2016-08-23 14:18:08 +00:00
|
|
|
{
|
2017-03-09 13:43:41 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-01-18 12:01:21 +00:00
|
|
|
u32 val;
|
2016-08-23 14:18:08 +00:00
|
|
|
|
|
|
|
/*
|
|
|
|
* Bspec lists this as both step 13 (before DDI_BUF_CTL disable)
|
|
|
|
* and step 18 (after clearing PORT_CLK_SEL). Based on a BUN,
|
|
|
|
* step 13 is the correct place for it. Step 18 is where it was
|
|
|
|
* originally before the BUN.
|
|
|
|
*/
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, FDI_RX_CTL(PIPE_A));
|
2016-08-23 14:18:08 +00:00
|
|
|
val &= ~FDI_RX_ENABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_CTL(PIPE_A), val);
|
2016-08-23 14:18:08 +00:00
|
|
|
|
2018-11-28 20:26:28 +00:00
|
|
|
intel_disable_ddi_buf(encoder, old_crtc_state);
|
2017-10-10 12:12:02 +00:00
|
|
|
intel_ddi_clk_disable(encoder);
|
2016-08-23 14:18:08 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, FDI_RX_MISC(PIPE_A));
|
2016-08-23 14:18:08 +00:00
|
|
|
val &= ~(FDI_RX_PWRDN_LANE1_MASK | FDI_RX_PWRDN_LANE0_MASK);
|
|
|
|
val |= FDI_RX_PWRDN_LANE1_VAL(2) | FDI_RX_PWRDN_LANE0_VAL(2);
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_MISC(PIPE_A), val);
|
2016-08-23 14:18:08 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, FDI_RX_CTL(PIPE_A));
|
2016-08-23 14:18:08 +00:00
|
|
|
val &= ~FDI_PCDCLK;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_CTL(PIPE_A), val);
|
2016-08-23 14:18:08 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, FDI_RX_CTL(PIPE_A));
|
2016-08-23 14:18:08 +00:00
|
|
|
val &= ~FDI_RX_PLL_ENABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, FDI_RX_CTL(PIPE_A), val);
|
2016-08-23 14:18:08 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:31 +00:00
|
|
|
static void trans_port_sync_stop_link_train(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
|
|
|
const struct intel_crtc_state *crtc_state)
|
|
|
|
{
|
|
|
|
const struct drm_connector_state *conn_state;
|
|
|
|
struct drm_connector *conn;
|
|
|
|
int i;
|
|
|
|
|
|
|
|
if (!crtc_state->sync_mode_slaves_mask)
|
|
|
|
return;
|
|
|
|
|
|
|
|
for_each_new_connector_in_state(&state->base, conn, conn_state, i) {
|
|
|
|
struct intel_encoder *slave_encoder =
|
|
|
|
to_intel_encoder(conn_state->best_encoder);
|
|
|
|
struct intel_crtc *slave_crtc = to_intel_crtc(conn_state->crtc);
|
|
|
|
const struct intel_crtc_state *slave_crtc_state;
|
|
|
|
|
|
|
|
if (!slave_crtc)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
slave_crtc_state =
|
|
|
|
intel_atomic_get_new_crtc_state(state, slave_crtc);
|
|
|
|
|
|
|
|
if (slave_crtc_state->master_transcoder !=
|
|
|
|
crtc_state->cpu_transcoder)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
intel_dp_stop_link_train(enc_to_intel_dp(slave_encoder));
|
|
|
|
}
|
|
|
|
|
|
|
|
usleep_range(200, 400);
|
|
|
|
|
|
|
|
intel_dp_stop_link_train(enc_to_intel_dp(encoder));
|
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_enable_ddi_dp(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:07 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2012-05-09 18:37:31 +00:00
|
|
|
{
|
2017-10-10 12:12:07 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2012-05-09 18:37:31 +00:00
|
|
|
|
2017-10-10 12:12:07 +00:00
|
|
|
if (port == PORT_A && INTEL_GEN(dev_priv) < 9)
|
|
|
|
intel_dp_stop_link_train(intel_dp);
|
2012-10-23 20:30:06 +00:00
|
|
|
|
2017-10-10 12:12:07 +00:00
|
|
|
intel_edp_backlight_on(crtc_state, conn_state);
|
2020-05-14 06:07:32 +00:00
|
|
|
intel_psr_enable(intel_dp, crtc_state, conn_state);
|
2020-05-14 06:07:25 +00:00
|
|
|
intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);
|
2017-10-10 12:12:07 +00:00
|
|
|
intel_edp_drrs_enable(intel_dp, crtc_state);
|
2013-05-03 09:57:41 +00:00
|
|
|
|
2017-10-10 12:12:07 +00:00
|
|
|
if (crtc_state->has_audio)
|
|
|
|
intel_audio_codec_enable(encoder, crtc_state, conn_state);
|
2020-03-13 16:48:31 +00:00
|
|
|
|
|
|
|
trans_port_sync_stop_link_train(state, encoder, crtc_state);
|
2017-10-10 12:12:07 +00:00
|
|
|
}
|
|
|
|
|
2018-11-19 18:00:21 +00:00
|
|
|
static i915_reg_t
|
|
|
|
gen9_chicken_trans_reg_by_port(struct drm_i915_private *dev_priv,
|
|
|
|
enum port port)
|
|
|
|
{
|
2019-10-24 12:21:36 +00:00
|
|
|
static const enum transcoder trans[] = {
|
|
|
|
[PORT_A] = TRANSCODER_EDP,
|
|
|
|
[PORT_B] = TRANSCODER_A,
|
|
|
|
[PORT_C] = TRANSCODER_B,
|
|
|
|
[PORT_D] = TRANSCODER_C,
|
|
|
|
[PORT_E] = TRANSCODER_A,
|
2018-11-19 18:00:21 +00:00
|
|
|
};
|
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, INTEL_GEN(dev_priv) < 9);
|
2018-11-19 18:00:21 +00:00
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, port < PORT_A || port > PORT_E))
|
2018-11-19 18:00:21 +00:00
|
|
|
port = PORT_A;
|
|
|
|
|
2019-10-24 12:21:36 +00:00
|
|
|
return CHICKEN_TRANS(trans[port]);
|
2018-11-19 18:00:21 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_enable_ddi_hdmi(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:07 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2018-03-22 15:47:07 +00:00
|
|
|
struct drm_connector *connector = conn_state->connector;
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2017-10-10 12:12:07 +00:00
|
|
|
|
2018-03-22 15:47:07 +00:00
|
|
|
if (!intel_hdmi_handle_sink_scrambling(encoder, connector,
|
|
|
|
crtc_state->hdmi_high_tmds_clock_ratio,
|
|
|
|
crtc_state->hdmi_scrambling))
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"[CONNECTOR:%d:%s] Failed to configure sink scrambling/TMDS bit clock ratio\n",
|
|
|
|
connector->base.id, connector->name);
|
2017-10-10 12:12:07 +00:00
|
|
|
|
2018-01-22 17:41:31 +00:00
|
|
|
/* Display WA #1143: skl,kbl,cfl */
|
|
|
|
if (IS_GEN9_BC(dev_priv)) {
|
|
|
|
/*
|
|
|
|
* For some reason these chicken bits have been
|
|
|
|
* stuffed into a transcoder register, event though
|
|
|
|
* the bits affect a specific DDI port rather than
|
|
|
|
* a specific transcoder.
|
|
|
|
*/
|
2018-11-19 18:00:21 +00:00
|
|
|
i915_reg_t reg = gen9_chicken_trans_reg_by_port(dev_priv, port);
|
2018-01-22 17:41:31 +00:00
|
|
|
u32 val;
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
val = intel_de_read(dev_priv, reg);
|
2018-01-22 17:41:31 +00:00
|
|
|
|
|
|
|
if (port == PORT_E)
|
|
|
|
val |= DDIE_TRAINING_OVERRIDE_ENABLE |
|
|
|
|
DDIE_TRAINING_OVERRIDE_VALUE;
|
|
|
|
else
|
|
|
|
val |= DDI_TRAINING_OVERRIDE_ENABLE |
|
|
|
|
DDI_TRAINING_OVERRIDE_VALUE;
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
|
|
|
intel_de_posting_read(dev_priv, reg);
|
2018-01-22 17:41:31 +00:00
|
|
|
|
|
|
|
udelay(1);
|
|
|
|
|
|
|
|
if (port == PORT_E)
|
|
|
|
val &= ~(DDIE_TRAINING_OVERRIDE_ENABLE |
|
|
|
|
DDIE_TRAINING_OVERRIDE_VALUE);
|
|
|
|
else
|
|
|
|
val &= ~(DDI_TRAINING_OVERRIDE_ENABLE |
|
|
|
|
DDI_TRAINING_OVERRIDE_VALUE);
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, reg, val);
|
2018-01-22 17:41:31 +00:00
|
|
|
}
|
|
|
|
|
2017-10-10 12:12:07 +00:00
|
|
|
/* In HDMI/DVI mode, the port width, and swing/emphasis values
|
|
|
|
* are ignored so nothing special needs to be done besides
|
|
|
|
* enabling the port.
|
|
|
|
*/
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_BUF_CTL(port),
|
|
|
|
dig_port->saved_port_bits | DDI_BUF_CTL_ENABLE);
|
2013-01-22 15:25:25 +00:00
|
|
|
|
2017-10-10 12:12:07 +00:00
|
|
|
if (crtc_state->has_audio)
|
|
|
|
intel_audio_codec_enable(encoder, crtc_state, conn_state);
|
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_enable_ddi(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:07 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
2020-04-06 11:27:45 +00:00
|
|
|
drm_WARN_ON(state->base.dev, crtc_state->has_pch_encoder);
|
2020-01-28 16:28:48 +00:00
|
|
|
|
2020-04-17 13:47:20 +00:00
|
|
|
intel_ddi_enable_transcoder_func(encoder, crtc_state);
|
2020-04-17 13:47:19 +00:00
|
|
|
|
2020-01-28 16:28:48 +00:00
|
|
|
intel_enable_pipe(crtc_state);
|
|
|
|
|
|
|
|
intel_crtc_vblank_on(crtc_state);
|
|
|
|
|
2017-10-10 12:12:07 +00:00
|
|
|
if (intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_enable_ddi_hdmi(state, encoder, crtc_state, conn_state);
|
2017-10-10 12:12:07 +00:00
|
|
|
else
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_enable_ddi_dp(state, encoder, crtc_state, conn_state);
|
2018-01-08 19:55:39 +00:00
|
|
|
|
|
|
|
/* Enable hdcp if it's desired */
|
|
|
|
if (conn_state->content_protection ==
|
|
|
|
DRM_MODE_CONTENT_PROTECTION_DESIRED)
|
2019-08-01 11:41:15 +00:00
|
|
|
intel_hdcp_enable(to_intel_connector(conn_state->connector),
|
2019-12-04 18:05:41 +00:00
|
|
|
crtc_state->cpu_transcoder,
|
2019-08-01 11:41:15 +00:00
|
|
|
(u8)conn_state->hdcp_content_type);
|
2012-06-30 06:59:56 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_disable_ddi_dp(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:05 +00:00
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
2012-06-30 06:59:56 +00:00
|
|
|
{
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2012-10-23 20:30:06 +00:00
|
|
|
|
2018-01-17 19:21:49 +00:00
|
|
|
intel_dp->link_trained = false;
|
|
|
|
|
2016-12-15 14:29:43 +00:00
|
|
|
if (old_crtc_state->has_audio)
|
2017-10-30 18:46:53 +00:00
|
|
|
intel_audio_codec_disable(encoder,
|
|
|
|
old_crtc_state, old_conn_state);
|
2013-03-06 23:03:09 +00:00
|
|
|
|
2017-10-10 12:12:05 +00:00
|
|
|
intel_edp_drrs_disable(intel_dp, old_crtc_state);
|
|
|
|
intel_psr_disable(intel_dp, old_crtc_state);
|
|
|
|
intel_edp_backlight_off(old_conn_state);
|
2018-11-28 20:26:17 +00:00
|
|
|
/* Disable the decompression in DP Sink */
|
|
|
|
intel_dp_sink_set_decompression_state(intel_dp, old_crtc_state,
|
|
|
|
false);
|
2017-10-10 12:12:05 +00:00
|
|
|
}
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 11:24:03 +00:00
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_disable_ddi_hdmi(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:05 +00:00
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
|
|
|
{
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
|
2018-03-22 15:47:07 +00:00
|
|
|
struct drm_connector *connector = old_conn_state->connector;
|
|
|
|
|
2017-10-10 12:12:05 +00:00
|
|
|
if (old_crtc_state->has_audio)
|
2017-10-30 18:46:53 +00:00
|
|
|
intel_audio_codec_disable(encoder,
|
|
|
|
old_crtc_state, old_conn_state);
|
2012-10-23 20:30:06 +00:00
|
|
|
|
2018-03-22 15:47:07 +00:00
|
|
|
if (!intel_hdmi_handle_sink_scrambling(encoder, connector,
|
|
|
|
false, false))
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&i915->drm,
|
|
|
|
"[CONNECTOR:%d:%s] Failed to reset sink scrambling/TMDS bit clock ratio\n",
|
|
|
|
connector->base.id, connector->name);
|
2017-10-10 12:12:05 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_disable_ddi(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2017-10-10 12:12:05 +00:00
|
|
|
const struct intel_crtc_state *old_crtc_state,
|
|
|
|
const struct drm_connector_state *old_conn_state)
|
|
|
|
{
|
2018-01-08 19:55:39 +00:00
|
|
|
intel_hdcp_disable(to_intel_connector(old_conn_state->connector));
|
|
|
|
|
2017-10-10 12:12:05 +00:00
|
|
|
if (intel_crtc_has_type(old_crtc_state, INTEL_OUTPUT_HDMI))
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_disable_ddi_hdmi(state, encoder, old_crtc_state,
|
|
|
|
old_conn_state);
|
2017-10-10 12:12:05 +00:00
|
|
|
else
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_disable_ddi_dp(state, encoder, old_crtc_state,
|
|
|
|
old_conn_state);
|
2012-05-09 18:37:31 +00:00
|
|
|
}
|
2012-10-05 15:05:52 +00:00
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_ddi_update_pipe_dp(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2018-12-20 13:21:20 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2018-12-20 13:21:20 +00:00
|
|
|
|
2019-09-19 19:53:05 +00:00
|
|
|
intel_ddi_set_dp_msa(crtc_state, conn_state);
|
2019-03-26 14:25:55 +00:00
|
|
|
|
2020-05-14 06:07:32 +00:00
|
|
|
intel_psr_update(intel_dp, crtc_state, conn_state);
|
2020-05-14 06:07:29 +00:00
|
|
|
intel_dp_set_infoframes(encoder, true, crtc_state, conn_state);
|
2018-12-20 13:21:20 +00:00
|
|
|
intel_edp_drrs_enable(intel_dp, crtc_state);
|
2019-01-08 16:08:38 +00:00
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_panel_update_backlight(state, encoder, crtc_state, conn_state);
|
2018-12-20 13:21:20 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
static void intel_ddi_update_pipe(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2018-12-20 13:21:20 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
|
|
|
{
|
2019-08-01 11:41:15 +00:00
|
|
|
|
2018-12-20 13:21:20 +00:00
|
|
|
if (!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI))
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_ddi_update_pipe_dp(state, encoder, crtc_state,
|
|
|
|
conn_state);
|
2019-02-04 15:44:40 +00:00
|
|
|
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_hdcp_update_pipe(state, encoder, crtc_state, conn_state);
|
2018-12-20 13:21:20 +00:00
|
|
|
}
|
|
|
|
|
2019-06-28 14:36:32 +00:00
|
|
|
static void
|
|
|
|
intel_ddi_update_prepare(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc *crtc)
|
|
|
|
{
|
|
|
|
struct intel_crtc_state *crtc_state =
|
|
|
|
crtc ? intel_atomic_get_new_crtc_state(state, crtc) : NULL;
|
|
|
|
int required_lanes = crtc_state ? crtc_state->lane_count : 1;
|
|
|
|
|
2020-04-06 11:27:45 +00:00
|
|
|
drm_WARN_ON(state->base.dev, crtc && crtc->active);
|
2019-06-28 14:36:32 +00:00
|
|
|
|
2019-12-04 18:05:43 +00:00
|
|
|
intel_tc_port_get_link(enc_to_dig_port(encoder),
|
|
|
|
required_lanes);
|
2019-10-31 11:26:02 +00:00
|
|
|
if (crtc_state && crtc_state->hw.active)
|
2019-06-28 14:36:32 +00:00
|
|
|
intel_update_active_dpll(state, crtc, encoder);
|
|
|
|
}
|
|
|
|
|
|
|
|
static void
|
|
|
|
intel_ddi_update_complete(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc *crtc)
|
|
|
|
{
|
2019-12-04 18:05:43 +00:00
|
|
|
intel_tc_port_put_link(enc_to_dig_port(encoder));
|
2019-06-28 14:36:32 +00:00
|
|
|
}
|
|
|
|
|
2018-11-01 14:04:24 +00:00
|
|
|
static void
|
2020-03-13 16:48:30 +00:00
|
|
|
intel_ddi_pre_pll_enable(struct intel_atomic_state *state,
|
|
|
|
struct intel_encoder *encoder,
|
2018-11-01 14:04:24 +00:00
|
|
|
const struct intel_crtc_state *crtc_state,
|
|
|
|
const struct drm_connector_state *conn_state)
|
2018-10-23 19:12:48 +00:00
|
|
|
{
|
2018-11-01 14:04:24 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2019-07-09 18:39:33 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, encoder->port);
|
|
|
|
bool is_tc_port = intel_phy_is_tc(dev_priv, phy);
|
2018-11-01 14:04:24 +00:00
|
|
|
|
2019-06-28 14:36:32 +00:00
|
|
|
if (is_tc_port)
|
|
|
|
intel_tc_port_get_link(dig_port, crtc_state->lane_count);
|
|
|
|
|
|
|
|
if (intel_crtc_has_dp_encoder(crtc_state) || is_tc_port)
|
2018-11-01 14:04:24 +00:00
|
|
|
intel_display_power_get(dev_priv,
|
|
|
|
intel_ddi_main_link_aux_domain(dig_port));
|
|
|
|
|
2019-07-08 17:28:14 +00:00
|
|
|
if (is_tc_port && dig_port->tc_mode != TC_PORT_TBT_ALT)
|
|
|
|
/*
|
|
|
|
* Program the lane count for static/dynamic connections on
|
|
|
|
* Type-C ports. Skip this step for TBT.
|
|
|
|
*/
|
|
|
|
intel_tc_port_set_fia_lane_count(dig_port, crtc_state->lane_count);
|
|
|
|
else if (IS_GEN9_LP(dev_priv))
|
2018-11-01 14:04:24 +00:00
|
|
|
bxt_ddi_phy_set_lane_optim_mask(encoder,
|
|
|
|
crtc_state->lane_lat_optim_mask);
|
|
|
|
}
|
|
|
|
|
2019-06-04 14:02:13 +00:00
|
|
|
static void intel_ddi_prepare_link_retrain(struct intel_dp *intel_dp)
|
2012-10-15 18:51:41 +00:00
|
|
|
{
|
2020-07-01 04:50:54 +00:00
|
|
|
struct intel_digital_port *dig_port = dp_to_dig_port(intel_dp);
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
|
|
|
|
enum port port = dig_port->base.port;
|
2019-10-30 01:24:47 +00:00
|
|
|
u32 dp_tp_ctl, ddi_buf_ctl;
|
2013-02-24 22:35:38 +00:00
|
|
|
bool wait = false;
|
2012-10-15 18:51:41 +00:00
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
dp_tp_ctl = intel_de_read(dev_priv, intel_dp->regs.dp_tp_ctl);
|
2019-10-30 01:24:47 +00:00
|
|
|
|
|
|
|
if (dp_tp_ctl & DP_TP_CTL_ENABLE) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
ddi_buf_ctl = intel_de_read(dev_priv, DDI_BUF_CTL(port));
|
2019-10-30 01:24:47 +00:00
|
|
|
if (ddi_buf_ctl & DDI_BUF_CTL_ENABLE) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_BUF_CTL(port),
|
|
|
|
ddi_buf_ctl & ~DDI_BUF_CTL_ENABLE);
|
2012-10-15 18:51:41 +00:00
|
|
|
wait = true;
|
|
|
|
}
|
|
|
|
|
2019-10-30 01:24:47 +00:00
|
|
|
dp_tp_ctl &= ~(DP_TP_CTL_ENABLE | DP_TP_CTL_LINK_TRAIN_MASK);
|
|
|
|
dp_tp_ctl |= DP_TP_CTL_LINK_TRAIN_PAT1;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, intel_dp->regs.dp_tp_ctl, dp_tp_ctl);
|
|
|
|
intel_de_posting_read(dev_priv, intel_dp->regs.dp_tp_ctl);
|
2012-10-15 18:51:41 +00:00
|
|
|
|
|
|
|
if (wait)
|
|
|
|
intel_wait_ddi_buf_idle(dev_priv, port);
|
|
|
|
}
|
|
|
|
|
2019-10-30 01:24:47 +00:00
|
|
|
dp_tp_ctl = DP_TP_CTL_ENABLE |
|
|
|
|
DP_TP_CTL_LINK_TRAIN_PAT1 | DP_TP_CTL_SCRAMBLE_DISABLE;
|
2016-07-28 14:50:39 +00:00
|
|
|
if (intel_dp->link_mst)
|
2019-10-30 01:24:47 +00:00
|
|
|
dp_tp_ctl |= DP_TP_CTL_MODE_MST;
|
2014-05-02 04:02:48 +00:00
|
|
|
else {
|
2019-10-30 01:24:47 +00:00
|
|
|
dp_tp_ctl |= DP_TP_CTL_MODE_SST;
|
2014-05-02 04:02:48 +00:00
|
|
|
if (drm_dp_enhanced_frame_cap(intel_dp->dpcd))
|
2019-10-30 01:24:47 +00:00
|
|
|
dp_tp_ctl |= DP_TP_CTL_ENHANCED_FRAME_ENABLE;
|
2014-05-02 04:02:48 +00:00
|
|
|
}
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, intel_dp->regs.dp_tp_ctl, dp_tp_ctl);
|
|
|
|
intel_de_posting_read(dev_priv, intel_dp->regs.dp_tp_ctl);
|
2012-10-15 18:51:41 +00:00
|
|
|
|
|
|
|
intel_dp->DP |= DDI_BUF_CTL_ENABLE;
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_write(dev_priv, DDI_BUF_CTL(port), intel_dp->DP);
|
|
|
|
intel_de_posting_read(dev_priv, DDI_BUF_CTL(port));
|
2012-10-15 18:51:41 +00:00
|
|
|
|
2020-07-01 22:10:52 +00:00
|
|
|
intel_wait_ddi_buf_active(dev_priv, port);
|
2012-10-15 18:51:41 +00:00
|
|
|
}
|
2012-10-26 21:05:52 +00:00
|
|
|
|
2020-04-20 20:06:07 +00:00
|
|
|
static void intel_ddi_set_link_train(struct intel_dp *intel_dp,
|
|
|
|
u8 dp_train_pat)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = dp_to_i915(intel_dp);
|
|
|
|
u8 train_pat_mask = drm_dp_training_pattern_mask(intel_dp->dpcd);
|
|
|
|
enum port port = dp_to_dig_port(intel_dp)->base.port;
|
|
|
|
u32 temp;
|
|
|
|
|
|
|
|
temp = intel_de_read(dev_priv, intel_dp->regs.dp_tp_ctl);
|
|
|
|
|
|
|
|
if (dp_train_pat & DP_LINK_SCRAMBLING_DISABLE)
|
|
|
|
temp |= DP_TP_CTL_SCRAMBLE_DISABLE;
|
|
|
|
else
|
|
|
|
temp &= ~DP_TP_CTL_SCRAMBLE_DISABLE;
|
|
|
|
|
|
|
|
temp &= ~DP_TP_CTL_LINK_TRAIN_MASK;
|
|
|
|
switch (dp_train_pat & train_pat_mask) {
|
|
|
|
case DP_TRAINING_PATTERN_DISABLE:
|
|
|
|
temp |= DP_TP_CTL_LINK_TRAIN_NORMAL;
|
|
|
|
break;
|
|
|
|
case DP_TRAINING_PATTERN_1:
|
|
|
|
temp |= DP_TP_CTL_LINK_TRAIN_PAT1;
|
|
|
|
break;
|
|
|
|
case DP_TRAINING_PATTERN_2:
|
|
|
|
temp |= DP_TP_CTL_LINK_TRAIN_PAT2;
|
|
|
|
break;
|
|
|
|
case DP_TRAINING_PATTERN_3:
|
|
|
|
temp |= DP_TP_CTL_LINK_TRAIN_PAT3;
|
|
|
|
break;
|
|
|
|
case DP_TRAINING_PATTERN_4:
|
|
|
|
temp |= DP_TP_CTL_LINK_TRAIN_PAT4;
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
intel_de_write(dev_priv, intel_dp->regs.dp_tp_ctl, temp);
|
|
|
|
|
|
|
|
intel_de_write(dev_priv, DDI_BUF_CTL(port), intel_dp->DP);
|
|
|
|
intel_de_posting_read(dev_priv, DDI_BUF_CTL(port));
|
|
|
|
}
|
|
|
|
|
2020-04-20 20:06:09 +00:00
|
|
|
static void intel_ddi_set_idle_link_train(struct intel_dp *intel_dp)
|
|
|
|
{
|
|
|
|
struct intel_encoder *encoder = &dp_to_dig_port(intel_dp)->base;
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
|
|
|
enum port port = encoder->port;
|
|
|
|
u32 val;
|
|
|
|
|
|
|
|
val = intel_de_read(dev_priv, intel_dp->regs.dp_tp_ctl);
|
|
|
|
val &= ~DP_TP_CTL_LINK_TRAIN_MASK;
|
|
|
|
val |= DP_TP_CTL_LINK_TRAIN_IDLE;
|
|
|
|
intel_de_write(dev_priv, intel_dp->regs.dp_tp_ctl, val);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Until TGL on PORT_A we can have only eDP in SST mode. There the only
|
|
|
|
* reason we need to set idle transmission mode is to work around a HW
|
|
|
|
* issue where we enable the pipe while not in idle link-training mode.
|
|
|
|
* In this case there is requirement to wait for a minimum number of
|
|
|
|
* idle patterns to be sent.
|
|
|
|
*/
|
|
|
|
if (port == PORT_A && INTEL_GEN(dev_priv) < 12)
|
|
|
|
return;
|
|
|
|
|
|
|
|
if (intel_de_wait_for_set(dev_priv, intel_dp->regs.dp_tp_status,
|
|
|
|
DP_TP_STATUS_IDLE_DONE, 1))
|
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"Timed out waiting for DP idle patterns\n");
|
|
|
|
}
|
|
|
|
|
2017-11-29 16:43:03 +00:00
|
|
|
static bool intel_ddi_is_audio_enabled(struct drm_i915_private *dev_priv,
|
|
|
|
enum transcoder cpu_transcoder)
|
2016-11-28 12:07:06 +00:00
|
|
|
{
|
2017-11-29 16:43:03 +00:00
|
|
|
if (cpu_transcoder == TRANSCODER_EDP)
|
|
|
|
return false;
|
2016-11-28 12:07:06 +00:00
|
|
|
|
2017-11-29 16:43:03 +00:00
|
|
|
if (!intel_display_power_is_enabled(dev_priv, POWER_DOMAIN_AUDIO))
|
|
|
|
return false;
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
return intel_de_read(dev_priv, HSW_AUD_PIN_ELD_CP_VLD) &
|
2017-11-29 16:43:03 +00:00
|
|
|
AUDIO_OUTPUT_ENABLE(cpu_transcoder);
|
2016-11-28 12:07:06 +00:00
|
|
|
}
|
|
|
|
|
2017-10-24 09:52:14 +00:00
|
|
|
void intel_ddi_compute_min_voltage_level(struct drm_i915_private *dev_priv,
|
|
|
|
struct intel_crtc_state *crtc_state)
|
|
|
|
{
|
2020-02-07 00:14:17 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12 && crtc_state->port_clock > 594000)
|
|
|
|
crtc_state->min_voltage_level = 2;
|
|
|
|
else if (IS_ELKHARTLAKE(dev_priv) && crtc_state->port_clock > 594000)
|
2020-02-07 00:14:16 +00:00
|
|
|
crtc_state->min_voltage_level = 3;
|
|
|
|
else if (INTEL_GEN(dev_priv) >= 11 && crtc_state->port_clock > 594000)
|
2018-06-14 22:10:17 +00:00
|
|
|
crtc_state->min_voltage_level = 1;
|
2018-10-22 17:15:23 +00:00
|
|
|
else if (IS_CANNONLAKE(dev_priv) && crtc_state->port_clock > 594000)
|
|
|
|
crtc_state->min_voltage_level = 2;
|
2017-10-24 09:52:14 +00:00
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
static enum transcoder bdw_transcoder_master_readout(struct drm_i915_private *dev_priv,
|
|
|
|
enum transcoder cpu_transcoder)
|
2020-03-13 16:48:22 +00:00
|
|
|
{
|
2020-03-13 16:48:26 +00:00
|
|
|
u32 master_select;
|
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 11) {
|
|
|
|
u32 ctl2 = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL2(cpu_transcoder));
|
2020-03-13 16:48:22 +00:00
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
if ((ctl2 & PORT_SYNC_MODE_ENABLE) == 0)
|
|
|
|
return INVALID_TRANSCODER;
|
2020-03-13 16:48:22 +00:00
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
master_select = REG_FIELD_GET(PORT_SYNC_MODE_MASTER_SELECT_MASK, ctl2);
|
|
|
|
} else {
|
|
|
|
u32 ctl = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder));
|
2020-03-13 16:48:22 +00:00
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
if ((ctl & TRANS_DDI_PORT_SYNC_ENABLE) == 0)
|
|
|
|
return INVALID_TRANSCODER;
|
|
|
|
|
|
|
|
master_select = REG_FIELD_GET(TRANS_DDI_PORT_SYNC_MASTER_SELECT_MASK, ctl);
|
|
|
|
}
|
2020-03-13 16:48:22 +00:00
|
|
|
|
|
|
|
if (master_select == 0)
|
|
|
|
return TRANSCODER_EDP;
|
|
|
|
else
|
|
|
|
return master_select - 1;
|
|
|
|
}
|
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
static void bdw_get_trans_port_sync_config(struct intel_crtc_state *crtc_state)
|
2020-03-13 16:48:22 +00:00
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(crtc_state->uapi.crtc->dev);
|
|
|
|
u32 transcoders = BIT(TRANSCODER_A) | BIT(TRANSCODER_B) |
|
|
|
|
BIT(TRANSCODER_C) | BIT(TRANSCODER_D);
|
|
|
|
enum transcoder cpu_transcoder;
|
|
|
|
|
|
|
|
crtc_state->master_transcoder =
|
2020-03-13 16:48:26 +00:00
|
|
|
bdw_transcoder_master_readout(dev_priv, crtc_state->cpu_transcoder);
|
2020-03-13 16:48:22 +00:00
|
|
|
|
|
|
|
for_each_cpu_transcoder_masked(dev_priv, cpu_transcoder, transcoders) {
|
|
|
|
enum intel_display_power_domain power_domain;
|
|
|
|
intel_wakeref_t trans_wakeref;
|
|
|
|
|
|
|
|
power_domain = POWER_DOMAIN_TRANSCODER(cpu_transcoder);
|
|
|
|
trans_wakeref = intel_display_power_get_if_enabled(dev_priv,
|
|
|
|
power_domain);
|
|
|
|
|
|
|
|
if (!trans_wakeref)
|
|
|
|
continue;
|
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
if (bdw_transcoder_master_readout(dev_priv, cpu_transcoder) ==
|
2020-03-13 16:48:22 +00:00
|
|
|
crtc_state->cpu_transcoder)
|
|
|
|
crtc_state->sync_mode_slaves_mask |= BIT(cpu_transcoder);
|
|
|
|
|
|
|
|
intel_display_power_put(dev_priv, power_domain, trans_wakeref);
|
|
|
|
}
|
|
|
|
|
|
|
|
drm_WARN_ON(&dev_priv->drm,
|
|
|
|
crtc_state->master_transcoder != INVALID_TRANSCODER &&
|
|
|
|
crtc_state->sync_mode_slaves_mask);
|
|
|
|
}
|
|
|
|
|
2013-09-24 11:24:05 +00:00
|
|
|
void intel_ddi_get_config(struct intel_encoder *encoder,
|
2015-01-15 12:55:21 +00:00
|
|
|
struct intel_crtc_state *pipe_config)
|
2013-05-15 00:08:26 +00:00
|
|
|
{
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-10-31 11:26:03 +00:00
|
|
|
struct intel_crtc *intel_crtc = to_intel_crtc(pipe_config->uapi.crtc);
|
2015-01-30 10:17:23 +00:00
|
|
|
enum transcoder cpu_transcoder = pipe_config->cpu_transcoder;
|
2020-04-14 23:04:40 +00:00
|
|
|
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
|
2013-05-15 00:08:26 +00:00
|
|
|
u32 temp, flags = 0;
|
|
|
|
|
2016-03-18 15:05:42 +00:00
|
|
|
/* XXX: DSI transcoder paranoia */
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
if (drm_WARN_ON(&dev_priv->drm, transcoder_is_dsi(cpu_transcoder)))
|
2016-03-18 15:05:42 +00:00
|
|
|
return;
|
|
|
|
|
2019-12-10 10:50:52 +00:00
|
|
|
intel_dsc_get_config(encoder, pipe_config);
|
|
|
|
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
temp = intel_de_read(dev_priv, TRANS_DDI_FUNC_CTL(cpu_transcoder));
|
2013-05-15 00:08:26 +00:00
|
|
|
if (temp & TRANS_DDI_PHSYNC)
|
|
|
|
flags |= DRM_MODE_FLAG_PHSYNC;
|
|
|
|
else
|
|
|
|
flags |= DRM_MODE_FLAG_NHSYNC;
|
|
|
|
if (temp & TRANS_DDI_PVSYNC)
|
|
|
|
flags |= DRM_MODE_FLAG_PVSYNC;
|
|
|
|
else
|
|
|
|
flags |= DRM_MODE_FLAG_NVSYNC;
|
|
|
|
|
2019-10-31 11:26:02 +00:00
|
|
|
pipe_config->hw.adjusted_mode.flags |= flags;
|
2013-09-06 20:29:00 +00:00
|
|
|
|
|
|
|
switch (temp & TRANS_DDI_BPC_MASK) {
|
|
|
|
case TRANS_DDI_BPC_6:
|
|
|
|
pipe_config->pipe_bpp = 18;
|
|
|
|
break;
|
|
|
|
case TRANS_DDI_BPC_8:
|
|
|
|
pipe_config->pipe_bpp = 24;
|
|
|
|
break;
|
|
|
|
case TRANS_DDI_BPC_10:
|
|
|
|
pipe_config->pipe_bpp = 30;
|
|
|
|
break;
|
|
|
|
case TRANS_DDI_BPC_12:
|
|
|
|
pipe_config->pipe_bpp = 36;
|
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2013-09-10 14:02:54 +00:00
|
|
|
|
|
|
|
switch (temp & TRANS_DDI_MODE_SELECT_MASK) {
|
|
|
|
case TRANS_DDI_MODE_SELECT_HDMI:
|
2014-04-24 21:54:47 +00:00
|
|
|
pipe_config->has_hdmi_sink = true;
|
2014-11-20 21:33:59 +00:00
|
|
|
|
2019-02-25 17:41:00 +00:00
|
|
|
pipe_config->infoframes.enable |=
|
|
|
|
intel_hdmi_infoframes_enabled(encoder, pipe_config);
|
|
|
|
|
|
|
|
if (pipe_config->infoframes.enable)
|
2014-11-20 21:33:59 +00:00
|
|
|
pipe_config->has_infoframe = true;
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 11:24:03 +00:00
|
|
|
|
2018-12-10 22:52:54 +00:00
|
|
|
if (temp & TRANS_DDI_HDMI_SCRAMBLING)
|
drm/i915: enable scrambling
Geminilake platform sports a native HDMI 2.0 controller, and is
capable of driving pixel-clocks upto 594Mhz. HDMI 2.0 spec
mendates scrambling for these higher clocks, for reduced RF footprint.
This patch checks if the monitor supports scrambling, and if required,
enables it during the modeset.
V2: Addressed review comments from Ville:
- Do not track scrambling status in DRM layer, track somewhere in
driver like in intel_crtc_state.
- Don't talk to monitor at such a low layer, set monitor scrambling
in intel_enable_ddi() before enabling the port.
V3: Addressed review comments from Jani
- In comments, function names, use "sink" instead of "monitor",
so that the implementation could be close to the language of
HDMI spec.
V4: Addressed review comment from Maarten
- scrambling -> hdmi_scrambling
- high_tmds_clock_ratio -> hdmi_high_tmds_clock_ratio
V5: Addressed review comments from Ville and Ander
- Do not modifiy the crtc_state after compute_config. Move all
scrambling and tmds_clock_ratio calcutations to compute_config.
- While setting scrambling for source/sink, do not check the
conditions again, just go by the crtc_state flags. This will
simplyfy the condition checks.
V6: Addressed review comments from Ville
- Do not add IS_GLK check in disable/enable function, instead add it
in compute_config, while setting state flags.
- Remove unnecessary paranthesis.
- Simplyfy handle_sink_scrambling function as suggested.
- Add readout code for scrambling status in get_ddi_config and add a
check for the same in pipe_config_compare.
V7: Addressed review comments from Ander/Ville
- No separate function for source scrambling, make it inline
- Align the last line of the macro TRANS_DDI_HDMI_SCRAMBLING_MASK
- Do not add platform check while setting source scrambling
- Use pipe_config instead of crtc->config to set sink scrambling
- To readout scrambling status, Compare with SCRAMBLING_MASK
not any of its bits
- Remove platform check in intel_pipe_config_compare while checking
scrambling status
V8: Fixed mege conflict, Addressed review comments from Ander
- Remove the desciption/comment about scrambling fom the caller, move
it to the function
- Move the IS_GLK check into scrambling function
- Fix alignment
V9: Fixed review comments from Ville, Ander
- Pass the scrambling state variables as bool input to the sink_scrambling
function and let the disable call be unconditional.
- Fix alignments in function calls and debug messages.
- Add kernel doc for function intel_hdmi_handle_sink_scrambling
V10: Rebase
Signed-off-by: Shashank Sharma <shashank.sharma@intel.com>
Reviewed-by: Ander Conselvan de Oliveira <conselvan2@gmail.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: http://patchwork.freedesktop.org/patch/msgid/1489404244-16608-6-git-send-email-shashank.sharma@intel.com
2017-03-13 11:24:03 +00:00
|
|
|
pipe_config->hdmi_scrambling = true;
|
|
|
|
if (temp & TRANS_DDI_HIGH_TMDS_CHAR_RATE)
|
|
|
|
pipe_config->hdmi_high_tmds_clock_ratio = true;
|
2016-04-27 12:44:16 +00:00
|
|
|
/* fall through */
|
2013-09-10 14:02:54 +00:00
|
|
|
case TRANS_DDI_MODE_SELECT_DVI:
|
2017-10-27 19:31:23 +00:00
|
|
|
pipe_config->output_types |= BIT(INTEL_OUTPUT_HDMI);
|
2016-04-27 12:44:16 +00:00
|
|
|
pipe_config->lane_count = 4;
|
|
|
|
break;
|
2013-09-10 14:02:54 +00:00
|
|
|
case TRANS_DDI_MODE_SELECT_FDI:
|
2017-10-27 19:31:23 +00:00
|
|
|
pipe_config->output_types |= BIT(INTEL_OUTPUT_ANALOG);
|
2013-09-10 14:02:54 +00:00
|
|
|
break;
|
|
|
|
case TRANS_DDI_MODE_SELECT_DP_SST:
|
2017-10-27 19:31:23 +00:00
|
|
|
if (encoder->type == INTEL_OUTPUT_EDP)
|
|
|
|
pipe_config->output_types |= BIT(INTEL_OUTPUT_EDP);
|
|
|
|
else
|
|
|
|
pipe_config->output_types |= BIT(INTEL_OUTPUT_DP);
|
|
|
|
pipe_config->lane_count =
|
|
|
|
((temp & DDI_PORT_WIDTH_MASK) >> DDI_PORT_WIDTH_SHIFT) + 1;
|
|
|
|
intel_dp_get_m_n(intel_crtc, pipe_config);
|
2019-09-25 08:21:10 +00:00
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 11) {
|
|
|
|
i915_reg_t dp_tp_ctl;
|
|
|
|
|
|
|
|
if (IS_GEN(dev_priv, 11))
|
|
|
|
dp_tp_ctl = DP_TP_CTL(encoder->port);
|
|
|
|
else
|
|
|
|
dp_tp_ctl = TGL_DP_TP_CTL(pipe_config->cpu_transcoder);
|
|
|
|
|
|
|
|
pipe_config->fec_enable =
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
intel_de_read(dev_priv, dp_tp_ctl) & DP_TP_CTL_FEC_ENABLE;
|
2019-09-25 08:21:10 +00:00
|
|
|
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"[ENCODER:%d:%s] Fec status: %u\n",
|
|
|
|
encoder->base.base.id, encoder->base.name,
|
|
|
|
pipe_config->fec_enable);
|
2019-09-25 08:21:10 +00:00
|
|
|
}
|
|
|
|
|
2020-05-14 06:07:26 +00:00
|
|
|
pipe_config->infoframes.enable |=
|
|
|
|
intel_hdmi_infoframes_enabled(encoder, pipe_config);
|
|
|
|
|
2017-10-27 19:31:23 +00:00
|
|
|
break;
|
2013-09-10 14:02:54 +00:00
|
|
|
case TRANS_DDI_MODE_SELECT_DP_MST:
|
2017-10-27 19:31:23 +00:00
|
|
|
pipe_config->output_types |= BIT(INTEL_OUTPUT_DP_MST);
|
2015-07-06 13:39:15 +00:00
|
|
|
pipe_config->lane_count =
|
|
|
|
((temp & DDI_PORT_WIDTH_MASK) >> DDI_PORT_WIDTH_SHIFT) + 1;
|
2019-12-23 01:06:49 +00:00
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 12)
|
|
|
|
pipe_config->mst_master_transcoder =
|
|
|
|
REG_FIELD_GET(TRANS_DDI_MST_TRANSPORT_SELECT_MASK, temp);
|
|
|
|
|
2013-09-10 14:02:54 +00:00
|
|
|
intel_dp_get_m_n(intel_crtc, pipe_config);
|
2020-05-14 06:07:26 +00:00
|
|
|
|
|
|
|
pipe_config->infoframes.enable |=
|
|
|
|
intel_hdmi_infoframes_enabled(encoder, pipe_config);
|
2013-09-10 14:02:54 +00:00
|
|
|
break;
|
|
|
|
default:
|
|
|
|
break;
|
|
|
|
}
|
2013-11-18 06:38:16 +00:00
|
|
|
|
2020-06-16 21:11:44 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12) {
|
|
|
|
enum transcoder transcoder =
|
|
|
|
intel_dp_mst_is_slave_trans(pipe_config) ?
|
|
|
|
pipe_config->mst_master_transcoder :
|
|
|
|
pipe_config->cpu_transcoder;
|
|
|
|
|
|
|
|
intel_dp->regs.dp_tp_ctl = TGL_DP_TP_CTL(transcoder);
|
|
|
|
intel_dp->regs.dp_tp_status = TGL_DP_TP_STATUS(transcoder);
|
|
|
|
}
|
|
|
|
|
2016-11-28 12:07:06 +00:00
|
|
|
pipe_config->has_audio =
|
2017-11-29 16:43:03 +00:00
|
|
|
intel_ddi_is_audio_enabled(dev_priv, cpu_transcoder);
|
2014-04-24 21:54:52 +00:00
|
|
|
|
2016-03-24 15:50:20 +00:00
|
|
|
if (encoder->type == INTEL_OUTPUT_EDP && dev_priv->vbt.edp.bpp &&
|
|
|
|
pipe_config->pipe_bpp > dev_priv->vbt.edp.bpp) {
|
2013-11-18 06:38:16 +00:00
|
|
|
/*
|
|
|
|
* This is a big fat ugly hack.
|
|
|
|
*
|
|
|
|
* Some machines in UEFI boot mode provide us a VBT that has 18
|
|
|
|
* bpp and 1.62 GHz link bandwidth for eDP, which for reasons
|
|
|
|
* unknown we fail to light up. Yet the same BIOS boots up with
|
|
|
|
* 24 bpp and 2.7 GHz link. Use the same bpp as the BIOS uses as
|
|
|
|
* max, not what it tells us to use.
|
|
|
|
*
|
|
|
|
* Note: This will still be broken if the eDP panel is not lit
|
|
|
|
* up by the BIOS, and thus we can't get the mode at module
|
|
|
|
* load.
|
|
|
|
*/
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"pipe has %d bpp for eDP panel, overriding BIOS-provided max %d bpp\n",
|
|
|
|
pipe_config->pipe_bpp, dev_priv->vbt.edp.bpp);
|
2016-03-24 15:50:20 +00:00
|
|
|
dev_priv->vbt.edp.bpp = pipe_config->pipe_bpp;
|
2013-11-18 06:38:16 +00:00
|
|
|
}
|
2014-01-21 20:42:10 +00:00
|
|
|
|
2014-12-12 14:26:57 +00:00
|
|
|
intel_ddi_clock_get(encoder, pipe_config);
|
2016-06-13 13:44:35 +00:00
|
|
|
|
2016-12-02 08:23:49 +00:00
|
|
|
if (IS_GEN9_LP(dev_priv))
|
2016-06-13 13:44:35 +00:00
|
|
|
pipe_config->lane_lat_optim_mask =
|
|
|
|
bxt_ddi_phy_get_lane_lat_optim_mask(encoder);
|
2017-10-24 09:52:14 +00:00
|
|
|
|
|
|
|
intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);
|
2019-02-25 17:41:02 +00:00
|
|
|
|
|
|
|
intel_hdmi_read_gcp_infoframe(encoder, pipe_config);
|
|
|
|
|
|
|
|
intel_read_infoframe(encoder, pipe_config,
|
|
|
|
HDMI_INFOFRAME_TYPE_AVI,
|
|
|
|
&pipe_config->infoframes.avi);
|
|
|
|
intel_read_infoframe(encoder, pipe_config,
|
|
|
|
HDMI_INFOFRAME_TYPE_SPD,
|
|
|
|
&pipe_config->infoframes.spd);
|
|
|
|
intel_read_infoframe(encoder, pipe_config,
|
|
|
|
HDMI_INFOFRAME_TYPE_VENDOR,
|
|
|
|
&pipe_config->infoframes.hdmi);
|
2019-05-16 14:10:17 +00:00
|
|
|
intel_read_infoframe(encoder, pipe_config,
|
|
|
|
HDMI_INFOFRAME_TYPE_DRM,
|
|
|
|
&pipe_config->infoframes.drm);
|
2020-03-13 16:48:22 +00:00
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 8)
|
|
|
|
bdw_get_trans_port_sync_config(pipe_config);
|
2020-05-14 06:07:26 +00:00
|
|
|
|
|
|
|
intel_read_dp_sdp(encoder, pipe_config, HDMI_PACKET_TYPE_GAMUT_METADATA);
|
2020-05-14 06:07:27 +00:00
|
|
|
intel_read_dp_sdp(encoder, pipe_config, DP_SDP_VSC);
|
2013-05-15 00:08:26 +00:00
|
|
|
}
|
|
|
|
|
2017-10-27 19:31:24 +00:00
|
|
|
static enum intel_output_type
|
|
|
|
intel_ddi_compute_output_type(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state,
|
|
|
|
struct drm_connector_state *conn_state)
|
|
|
|
{
|
|
|
|
switch (conn_state->connector->connector_type) {
|
|
|
|
case DRM_MODE_CONNECTOR_HDMIA:
|
|
|
|
return INTEL_OUTPUT_HDMI;
|
|
|
|
case DRM_MODE_CONNECTOR_eDP:
|
|
|
|
return INTEL_OUTPUT_EDP;
|
|
|
|
case DRM_MODE_CONNECTOR_DisplayPort:
|
|
|
|
return INTEL_OUTPUT_DP;
|
|
|
|
default:
|
|
|
|
MISSING_CASE(conn_state->connector->connector_type);
|
|
|
|
return INTEL_OUTPUT_UNUSED;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2019-01-15 20:08:00 +00:00
|
|
|
static int intel_ddi_compute_config(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *pipe_config,
|
|
|
|
struct drm_connector_state *conn_state)
|
2012-10-26 21:05:52 +00:00
|
|
|
{
|
2019-10-31 11:26:03 +00:00
|
|
|
struct intel_crtc *crtc = to_intel_crtc(pipe_config->uapi.crtc);
|
2016-07-04 10:34:36 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2017-10-27 19:31:25 +00:00
|
|
|
enum port port = encoder->port;
|
2016-06-13 13:44:35 +00:00
|
|
|
int ret;
|
2012-10-26 21:05:52 +00:00
|
|
|
|
2020-03-18 17:02:35 +00:00
|
|
|
if (HAS_TRANSCODER(dev_priv, TRANSCODER_EDP) && port == PORT_A)
|
2013-05-21 22:50:22 +00:00
|
|
|
pipe_config->cpu_transcoder = TRANSCODER_EDP;
|
|
|
|
|
2019-10-03 08:17:36 +00:00
|
|
|
if (intel_crtc_has_type(pipe_config, INTEL_OUTPUT_HDMI)) {
|
2016-08-09 15:04:05 +00:00
|
|
|
ret = intel_hdmi_compute_config(encoder, pipe_config, conn_state);
|
2019-10-03 08:17:36 +00:00
|
|
|
} else {
|
2016-08-09 15:04:05 +00:00
|
|
|
ret = intel_dp_compute_config(encoder, pipe_config, conn_state);
|
2019-10-03 08:17:36 +00:00
|
|
|
}
|
|
|
|
|
2019-04-11 16:49:25 +00:00
|
|
|
if (ret)
|
|
|
|
return ret;
|
2016-06-13 13:44:35 +00:00
|
|
|
|
2019-04-25 16:29:06 +00:00
|
|
|
if (IS_HASWELL(dev_priv) && crtc->pipe == PIPE_A &&
|
|
|
|
pipe_config->cpu_transcoder == TRANSCODER_EDP)
|
|
|
|
pipe_config->pch_pfit.force_thru =
|
|
|
|
pipe_config->pch_pfit.enabled ||
|
|
|
|
pipe_config->crc_enabled;
|
|
|
|
|
2019-04-11 16:49:25 +00:00
|
|
|
if (IS_GEN9_LP(dev_priv))
|
2016-06-13 13:44:35 +00:00
|
|
|
pipe_config->lane_lat_optim_mask =
|
2017-10-27 13:43:48 +00:00
|
|
|
bxt_ddi_phy_calc_lane_lat_optim_mask(pipe_config->lane_count);
|
2016-06-13 13:44:35 +00:00
|
|
|
|
2017-10-24 09:52:14 +00:00
|
|
|
intel_ddi_compute_min_voltage_level(dev_priv, pipe_config);
|
|
|
|
|
2019-04-11 16:49:25 +00:00
|
|
|
return 0;
|
2012-10-26 21:05:52 +00:00
|
|
|
}
|
|
|
|
|
2020-02-14 11:41:25 +00:00
|
|
|
static bool mode_equal(const struct drm_display_mode *mode1,
|
|
|
|
const struct drm_display_mode *mode2)
|
|
|
|
{
|
|
|
|
return drm_mode_match(mode1, mode2,
|
|
|
|
DRM_MODE_MATCH_TIMINGS |
|
|
|
|
DRM_MODE_MATCH_FLAGS |
|
|
|
|
DRM_MODE_MATCH_3D_FLAGS) &&
|
|
|
|
mode1->clock == mode2->clock; /* we want an exact match */
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool m_n_equal(const struct intel_link_m_n *m_n_1,
|
|
|
|
const struct intel_link_m_n *m_n_2)
|
|
|
|
{
|
|
|
|
return m_n_1->tu == m_n_2->tu &&
|
|
|
|
m_n_1->gmch_m == m_n_2->gmch_m &&
|
|
|
|
m_n_1->gmch_n == m_n_2->gmch_n &&
|
|
|
|
m_n_1->link_m == m_n_2->link_m &&
|
|
|
|
m_n_1->link_n == m_n_2->link_n;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool crtcs_port_sync_compatible(const struct intel_crtc_state *crtc_state1,
|
|
|
|
const struct intel_crtc_state *crtc_state2)
|
|
|
|
{
|
|
|
|
return crtc_state1->hw.active && crtc_state2->hw.active &&
|
|
|
|
crtc_state1->output_types == crtc_state2->output_types &&
|
|
|
|
crtc_state1->output_format == crtc_state2->output_format &&
|
|
|
|
crtc_state1->lane_count == crtc_state2->lane_count &&
|
|
|
|
crtc_state1->port_clock == crtc_state2->port_clock &&
|
|
|
|
mode_equal(&crtc_state1->hw.adjusted_mode,
|
|
|
|
&crtc_state2->hw.adjusted_mode) &&
|
|
|
|
m_n_equal(&crtc_state1->dp_m_n, &crtc_state2->dp_m_n);
|
|
|
|
}
|
|
|
|
|
|
|
|
static u8
|
|
|
|
intel_ddi_port_sync_transcoders(const struct intel_crtc_state *ref_crtc_state,
|
|
|
|
int tile_group_id)
|
|
|
|
{
|
|
|
|
struct drm_connector *connector;
|
|
|
|
const struct drm_connector_state *conn_state;
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(ref_crtc_state->uapi.crtc->dev);
|
|
|
|
struct intel_atomic_state *state =
|
|
|
|
to_intel_atomic_state(ref_crtc_state->uapi.state);
|
|
|
|
u8 transcoders = 0;
|
|
|
|
int i;
|
|
|
|
|
2020-03-13 16:48:26 +00:00
|
|
|
/*
|
|
|
|
* We don't enable port sync on BDW due to missing w/as and
|
|
|
|
* due to not having adjusted the modeset sequence appropriately.
|
|
|
|
*/
|
|
|
|
if (INTEL_GEN(dev_priv) < 9)
|
2020-02-14 11:41:25 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!intel_crtc_has_type(ref_crtc_state, INTEL_OUTPUT_DP))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
for_each_new_connector_in_state(&state->base, connector, conn_state, i) {
|
|
|
|
struct intel_crtc *crtc = to_intel_crtc(conn_state->crtc);
|
|
|
|
const struct intel_crtc_state *crtc_state;
|
|
|
|
|
|
|
|
if (!crtc)
|
|
|
|
continue;
|
|
|
|
|
|
|
|
if (!connector->has_tile ||
|
|
|
|
connector->tile_group->id !=
|
|
|
|
tile_group_id)
|
|
|
|
continue;
|
|
|
|
crtc_state = intel_atomic_get_new_crtc_state(state,
|
|
|
|
crtc);
|
|
|
|
if (!crtcs_port_sync_compatible(ref_crtc_state,
|
|
|
|
crtc_state))
|
|
|
|
continue;
|
|
|
|
transcoders |= BIT(crtc_state->cpu_transcoder);
|
|
|
|
}
|
|
|
|
|
|
|
|
return transcoders;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int intel_ddi_compute_config_late(struct intel_encoder *encoder,
|
|
|
|
struct intel_crtc_state *crtc_state,
|
|
|
|
struct drm_connector_state *conn_state)
|
|
|
|
{
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
|
2020-02-14 11:41:25 +00:00
|
|
|
struct drm_connector *connector = conn_state->connector;
|
|
|
|
u8 port_sync_transcoders = 0;
|
|
|
|
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&i915->drm, "[ENCODER:%d:%s] [CRTC:%d:%s]",
|
|
|
|
encoder->base.base.id, encoder->base.name,
|
|
|
|
crtc_state->uapi.crtc->base.id, crtc_state->uapi.crtc->name);
|
2020-02-14 11:41:25 +00:00
|
|
|
|
|
|
|
if (connector->has_tile)
|
|
|
|
port_sync_transcoders = intel_ddi_port_sync_transcoders(crtc_state,
|
|
|
|
connector->tile_group->id);
|
|
|
|
|
|
|
|
/*
|
|
|
|
* EDP Transcoders cannot be ensalved
|
|
|
|
* make them a master always when present
|
|
|
|
*/
|
|
|
|
if (port_sync_transcoders & BIT(TRANSCODER_EDP))
|
|
|
|
crtc_state->master_transcoder = TRANSCODER_EDP;
|
|
|
|
else
|
|
|
|
crtc_state->master_transcoder = ffs(port_sync_transcoders) - 1;
|
|
|
|
|
|
|
|
if (crtc_state->master_transcoder == crtc_state->cpu_transcoder) {
|
|
|
|
crtc_state->master_transcoder = INVALID_TRANSCODER;
|
|
|
|
crtc_state->sync_mode_slaves_mask =
|
|
|
|
port_sync_transcoders & ~BIT(crtc_state->cpu_transcoder);
|
|
|
|
}
|
|
|
|
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2018-12-14 18:27:02 +00:00
|
|
|
static void intel_ddi_encoder_destroy(struct drm_encoder *encoder)
|
|
|
|
{
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(to_intel_encoder(encoder));
|
2018-12-14 18:27:02 +00:00
|
|
|
|
|
|
|
intel_dp_encoder_flush_work(encoder);
|
|
|
|
|
|
|
|
drm_encoder_cleanup(encoder);
|
|
|
|
kfree(dig_port);
|
|
|
|
}
|
|
|
|
|
2012-10-26 21:05:52 +00:00
|
|
|
static const struct drm_encoder_funcs intel_ddi_funcs = {
|
2019-06-28 14:36:25 +00:00
|
|
|
.reset = intel_dp_encoder_reset,
|
2018-12-14 18:27:02 +00:00
|
|
|
.destroy = intel_ddi_encoder_destroy,
|
2012-10-26 21:05:52 +00:00
|
|
|
};
|
|
|
|
|
2013-10-09 16:52:36 +00:00
|
|
|
static struct intel_connector *
|
2020-07-01 04:50:54 +00:00
|
|
|
intel_ddi_init_dp_connector(struct intel_digital_port *dig_port)
|
2013-10-09 16:52:36 +00:00
|
|
|
{
|
2020-07-01 04:50:54 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
|
2013-10-09 16:52:36 +00:00
|
|
|
struct intel_connector *connector;
|
2020-07-01 04:50:54 +00:00
|
|
|
enum port port = dig_port->base.port;
|
2013-10-09 16:52:36 +00:00
|
|
|
|
2015-04-10 07:59:10 +00:00
|
|
|
connector = intel_connector_alloc();
|
2013-10-09 16:52:36 +00:00
|
|
|
if (!connector)
|
|
|
|
return NULL;
|
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->dp.output_reg = DDI_BUF_CTL(port);
|
|
|
|
dig_port->dp.prepare_link_retrain = intel_ddi_prepare_link_retrain;
|
|
|
|
dig_port->dp.set_link_train = intel_ddi_set_link_train;
|
|
|
|
dig_port->dp.set_idle_link_train = intel_ddi_set_idle_link_train;
|
2020-04-20 20:06:07 +00:00
|
|
|
|
2020-04-20 20:06:08 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 12)
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->dp.set_signal_levels = tgl_set_signal_levels;
|
2020-04-20 20:06:08 +00:00
|
|
|
else if (INTEL_GEN(dev_priv) >= 11)
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->dp.set_signal_levels = icl_set_signal_levels;
|
2020-04-20 20:06:08 +00:00
|
|
|
else if (IS_CANNONLAKE(dev_priv))
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->dp.set_signal_levels = cnl_set_signal_levels;
|
2020-04-20 20:06:08 +00:00
|
|
|
else if (IS_GEN9_LP(dev_priv))
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->dp.set_signal_levels = bxt_set_signal_levels;
|
2020-04-20 20:06:08 +00:00
|
|
|
else
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->dp.set_signal_levels = hsw_set_signal_levels;
|
2020-04-20 20:06:08 +00:00
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->dp.voltage_max = intel_ddi_dp_voltage_max;
|
|
|
|
dig_port->dp.preemph_max = intel_ddi_dp_preemph_max;
|
2020-05-12 17:41:42 +00:00
|
|
|
|
2020-04-14 23:04:40 +00:00
|
|
|
if (INTEL_GEN(dev_priv) < 12) {
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->dp.regs.dp_tp_ctl = DP_TP_CTL(port);
|
|
|
|
dig_port->dp.regs.dp_tp_status = DP_TP_STATUS(port);
|
2020-04-14 23:04:40 +00:00
|
|
|
}
|
2019-06-04 14:02:13 +00:00
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
if (!intel_dp_init_connector(dig_port, connector)) {
|
2013-10-09 16:52:36 +00:00
|
|
|
kfree(connector);
|
|
|
|
return NULL;
|
|
|
|
}
|
|
|
|
|
|
|
|
return connector;
|
|
|
|
}
|
|
|
|
|
2018-01-17 19:21:46 +00:00
|
|
|
static int modeset_pipe(struct drm_crtc *crtc,
|
|
|
|
struct drm_modeset_acquire_ctx *ctx)
|
|
|
|
{
|
|
|
|
struct drm_atomic_state *state;
|
|
|
|
struct drm_crtc_state *crtc_state;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
state = drm_atomic_state_alloc(crtc->dev);
|
|
|
|
if (!state)
|
|
|
|
return -ENOMEM;
|
|
|
|
|
|
|
|
state->acquire_ctx = ctx;
|
|
|
|
|
|
|
|
crtc_state = drm_atomic_get_crtc_state(state, crtc);
|
|
|
|
if (IS_ERR(crtc_state)) {
|
|
|
|
ret = PTR_ERR(crtc_state);
|
|
|
|
goto out;
|
|
|
|
}
|
|
|
|
|
2019-03-02 00:33:49 +00:00
|
|
|
crtc_state->connectors_changed = true;
|
2018-01-17 19:21:46 +00:00
|
|
|
|
|
|
|
ret = drm_atomic_commit(state);
|
2019-03-02 00:33:47 +00:00
|
|
|
out:
|
2018-01-17 19:21:46 +00:00
|
|
|
drm_atomic_state_put(state);
|
|
|
|
|
|
|
|
return ret;
|
|
|
|
}
|
|
|
|
|
|
|
|
static int intel_hdmi_reset_link(struct intel_encoder *encoder,
|
|
|
|
struct drm_modeset_acquire_ctx *ctx)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_hdmi *hdmi = enc_to_intel_hdmi(encoder);
|
2018-01-17 19:21:46 +00:00
|
|
|
struct intel_connector *connector = hdmi->attached_connector;
|
|
|
|
struct i2c_adapter *adapter =
|
|
|
|
intel_gmbus_get_adapter(dev_priv, hdmi->ddc_bus);
|
|
|
|
struct drm_connector_state *conn_state;
|
|
|
|
struct intel_crtc_state *crtc_state;
|
|
|
|
struct intel_crtc *crtc;
|
|
|
|
u8 config;
|
|
|
|
int ret;
|
|
|
|
|
|
|
|
if (!connector || connector->base.status != connector_status_connected)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = drm_modeset_lock(&dev_priv->drm.mode_config.connection_mutex,
|
|
|
|
ctx);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
conn_state = connector->base.state;
|
|
|
|
|
|
|
|
crtc = to_intel_crtc(conn_state->crtc);
|
|
|
|
if (!crtc)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = drm_modeset_lock(&crtc->base.mutex, ctx);
|
|
|
|
if (ret)
|
|
|
|
return ret;
|
|
|
|
|
|
|
|
crtc_state = to_intel_crtc_state(crtc->base.state);
|
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm,
|
|
|
|
!intel_crtc_has_type(crtc_state, INTEL_OUTPUT_HDMI));
|
2018-01-17 19:21:46 +00:00
|
|
|
|
2019-10-31 11:26:02 +00:00
|
|
|
if (!crtc_state->hw.active)
|
2018-01-17 19:21:46 +00:00
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (!crtc_state->hdmi_high_tmds_clock_ratio &&
|
|
|
|
!crtc_state->hdmi_scrambling)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
if (conn_state->commit &&
|
|
|
|
!try_wait_for_completion(&conn_state->commit->hw_done))
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
ret = drm_scdc_readb(adapter, SCDC_TMDS_CONFIG, &config);
|
|
|
|
if (ret < 0) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_err(&dev_priv->drm, "Failed to read TMDS config: %d\n",
|
|
|
|
ret);
|
2018-01-17 19:21:46 +00:00
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!!(config & SCDC_TMDS_BIT_CLOCK_RATIO_BY_40) ==
|
|
|
|
crtc_state->hdmi_high_tmds_clock_ratio &&
|
|
|
|
!!(config & SCDC_SCRAMBLING_ENABLE) ==
|
|
|
|
crtc_state->hdmi_scrambling)
|
|
|
|
return 0;
|
|
|
|
|
|
|
|
/*
|
|
|
|
* HDMI 2.0 says that one should not send scrambled data
|
|
|
|
* prior to configuring the sink scrambling, and that
|
|
|
|
* TMDS clock/data transmission should be suspended when
|
|
|
|
* changing the TMDS clock rate in the sink. So let's
|
|
|
|
* just do a full modeset here, even though some sinks
|
|
|
|
* would be perfectly happy if were to just reconfigure
|
|
|
|
* the SCDC settings on the fly.
|
|
|
|
*/
|
|
|
|
return modeset_pipe(&crtc->base, ctx);
|
|
|
|
}
|
|
|
|
|
2019-07-12 00:53:42 +00:00
|
|
|
static enum intel_hotplug_state
|
|
|
|
intel_ddi_hotplug(struct intel_encoder *encoder,
|
2020-03-30 09:54:24 +00:00
|
|
|
struct intel_connector *connector)
|
2018-01-17 19:21:46 +00:00
|
|
|
{
|
2020-03-30 09:54:25 +00:00
|
|
|
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
|
2019-12-04 18:05:43 +00:00
|
|
|
struct intel_digital_port *dig_port = enc_to_dig_port(encoder);
|
2020-03-30 09:54:25 +00:00
|
|
|
enum phy phy = intel_port_to_phy(i915, encoder->port);
|
|
|
|
bool is_tc = intel_phy_is_tc(i915, phy);
|
2018-01-17 19:21:46 +00:00
|
|
|
struct drm_modeset_acquire_ctx ctx;
|
2019-07-12 00:53:42 +00:00
|
|
|
enum intel_hotplug_state state;
|
2018-01-17 19:21:46 +00:00
|
|
|
int ret;
|
|
|
|
|
2020-03-30 09:54:24 +00:00
|
|
|
state = intel_encoder_hotplug(encoder, connector);
|
2018-01-17 19:21:46 +00:00
|
|
|
|
|
|
|
drm_modeset_acquire_init(&ctx, 0);
|
|
|
|
|
|
|
|
for (;;) {
|
2018-01-17 19:21:47 +00:00
|
|
|
if (connector->base.connector_type == DRM_MODE_CONNECTOR_HDMIA)
|
|
|
|
ret = intel_hdmi_reset_link(encoder, &ctx);
|
|
|
|
else
|
|
|
|
ret = intel_dp_retrain_link(encoder, &ctx);
|
2018-01-17 19:21:46 +00:00
|
|
|
|
|
|
|
if (ret == -EDEADLK) {
|
|
|
|
drm_modeset_backoff(&ctx);
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
|
|
|
|
break;
|
|
|
|
}
|
|
|
|
|
|
|
|
drm_modeset_drop_locks(&ctx);
|
|
|
|
drm_modeset_acquire_fini(&ctx);
|
drm/i915/display: Make WARN* drm specific where encoder ptr is available
Drm specific drm_WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where intel_encoder struct pointer is available.
The conversion was done automatically with below coccinelle semantic
patch.
@@
identifier func, T;
@@
func(...) {
...
struct intel_encoder *T = ...;
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
@@
identifier func, T;
@@
func(struct intel_encoder *T,...) {
<...
(
-WARN(
+drm_WARN(T->base.dev,
...)
|
-WARN_ON(
+drm_WARN_ON(T->base.dev,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T->base.dev,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T->base.dev,
...)
)
...>
}
command: spatch --sp-file <script> --dir drivers/gpu/drm/i915/display \
--linux-spacing --in-place
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200115034455.17658-5-pankaj.laxminarayan.bharadiya@intel.com
2020-01-15 03:44:48 +00:00
|
|
|
drm_WARN(encoder->base.dev, ret,
|
|
|
|
"Acquiring modeset locks failed with %i\n", ret);
|
2018-01-17 19:21:46 +00:00
|
|
|
|
2019-07-12 00:53:43 +00:00
|
|
|
/*
|
|
|
|
* Unpowered type-c dongles can take some time to boot and be
|
|
|
|
* responsible, so here giving some time to those dongles to power up
|
|
|
|
* and then retrying the probe.
|
|
|
|
*
|
|
|
|
* On many platforms the HDMI live state signal is known to be
|
|
|
|
* unreliable, so we can't use it to detect if a sink is connected or
|
|
|
|
* not. Instead we detect if it's connected based on whether we can
|
|
|
|
* read the EDID or not. That in turn has a problem during disconnect,
|
|
|
|
* since the HPD interrupt may be raised before the DDC lines get
|
|
|
|
* disconnected (due to how the required length of DDC vs. HPD
|
|
|
|
* connector pins are specified) and so we'll still be able to get a
|
|
|
|
* valid EDID. To solve this schedule another detection cycle if this
|
|
|
|
* time around we didn't detect any change in the sink's connection
|
|
|
|
* status.
|
2020-03-30 09:54:25 +00:00
|
|
|
*
|
|
|
|
* Type-c connectors which get their HPD signal deasserted then
|
|
|
|
* reasserted, without unplugging/replugging the sink from the
|
|
|
|
* connector, introduce a delay until the AUX channel communication
|
|
|
|
* becomes functional. Retry the detection for 5 seconds on type-c
|
|
|
|
* connectors to account for this delay.
|
2019-07-12 00:53:43 +00:00
|
|
|
*/
|
2020-03-30 09:54:25 +00:00
|
|
|
if (state == INTEL_HOTPLUG_UNCHANGED &&
|
|
|
|
connector->hotplug_retries < (is_tc ? 5 : 1) &&
|
2019-07-12 00:53:43 +00:00
|
|
|
!dig_port->dp.is_mst)
|
|
|
|
state = INTEL_HOTPLUG_RETRY;
|
|
|
|
|
2019-07-12 00:53:42 +00:00
|
|
|
return state;
|
2018-01-17 19:21:46 +00:00
|
|
|
}
|
|
|
|
|
2020-03-11 15:54:20 +00:00
|
|
|
static bool lpt_digital_port_connected(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2020-03-11 15:54:22 +00:00
|
|
|
u32 bit = dev_priv->hotplug.pch_hpd[encoder->hpd_pin];
|
2020-03-11 15:54:20 +00:00
|
|
|
|
|
|
|
return intel_de_read(dev_priv, SDEISR) & bit;
|
|
|
|
}
|
|
|
|
|
|
|
|
static bool hsw_digital_port_connected(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2020-03-11 15:54:22 +00:00
|
|
|
u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin];
|
2020-03-11 15:54:20 +00:00
|
|
|
|
2020-03-11 15:54:22 +00:00
|
|
|
return intel_de_read(dev_priv, DEISR) & bit;
|
2020-03-11 15:54:20 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
static bool bdw_digital_port_connected(struct intel_encoder *encoder)
|
|
|
|
{
|
|
|
|
struct drm_i915_private *dev_priv = to_i915(encoder->base.dev);
|
2020-03-11 15:54:22 +00:00
|
|
|
u32 bit = dev_priv->hotplug.hpd[encoder->hpd_pin];
|
2020-03-11 15:54:20 +00:00
|
|
|
|
|
|
|
return intel_de_read(dev_priv, GEN8_DE_PORT_ISR) & bit;
|
|
|
|
}
|
|
|
|
|
2013-10-09 16:52:36 +00:00
|
|
|
static struct intel_connector *
|
2020-07-01 04:50:54 +00:00
|
|
|
intel_ddi_init_hdmi_connector(struct intel_digital_port *dig_port)
|
2013-10-09 16:52:36 +00:00
|
|
|
{
|
|
|
|
struct intel_connector *connector;
|
2020-07-01 04:50:54 +00:00
|
|
|
enum port port = dig_port->base.port;
|
2013-10-09 16:52:36 +00:00
|
|
|
|
2015-04-10 07:59:10 +00:00
|
|
|
connector = intel_connector_alloc();
|
2013-10-09 16:52:36 +00:00
|
|
|
if (!connector)
|
|
|
|
return NULL;
|
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->hdmi.hdmi_reg = DDI_BUF_CTL(port);
|
|
|
|
intel_hdmi_init_connector(dig_port, connector);
|
2013-10-09 16:52:36 +00:00
|
|
|
|
|
|
|
return connector;
|
|
|
|
}
|
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
static bool intel_ddi_a_force_4_lanes(struct intel_digital_port *dig_port)
|
2017-10-23 17:39:20 +00:00
|
|
|
{
|
2020-07-01 04:50:54 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
|
2017-10-23 17:39:20 +00:00
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
if (dig_port->base.port != PORT_A)
|
2017-10-23 17:39:20 +00:00
|
|
|
return false;
|
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
if (dig_port->saved_port_bits & DDI_A_4_LANES)
|
2017-10-23 17:39:20 +00:00
|
|
|
return false;
|
|
|
|
|
|
|
|
/* Broxton/Geminilake: Bspec says that DDI_A_4_LANES is the only
|
|
|
|
* supported configuration
|
|
|
|
*/
|
|
|
|
if (IS_GEN9_LP(dev_priv))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
/* Cannonlake: Most of SKUs don't support DDI_E, and the only
|
|
|
|
* one who does also have a full A/E split called
|
|
|
|
* DDI_F what makes DDI_E useless. However for this
|
|
|
|
* case let's trust VBT info.
|
|
|
|
*/
|
|
|
|
if (IS_CANNONLAKE(dev_priv) &&
|
|
|
|
!intel_bios_is_port_present(dev_priv, PORT_E))
|
|
|
|
return true;
|
|
|
|
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2018-02-06 06:08:55 +00:00
|
|
|
static int
|
2020-07-01 04:50:54 +00:00
|
|
|
intel_ddi_max_lanes(struct intel_digital_port *dig_port)
|
2018-02-06 06:08:55 +00:00
|
|
|
{
|
2020-07-01 04:50:54 +00:00
|
|
|
struct drm_i915_private *dev_priv = to_i915(dig_port->base.base.dev);
|
|
|
|
enum port port = dig_port->base.port;
|
2018-02-06 06:08:55 +00:00
|
|
|
int max_lanes = 4;
|
|
|
|
|
|
|
|
if (INTEL_GEN(dev_priv) >= 11)
|
|
|
|
return max_lanes;
|
|
|
|
|
|
|
|
if (port == PORT_A || port == PORT_E) {
|
drm/i915/ddi: use intel_de_*() functions for register access
The implicit "dev_priv" local variable use has been a long-standing pain
point in the register access macros I915_READ(), I915_WRITE(),
POSTING_READ(), I915_READ_FW(), and I915_WRITE_FW().
Replace them with the corresponding new display engine register
accessors intel_de_read(), intel_de_write(), intel_de_posting_read(),
intel_de_read_fw(), and intel_de_write_fw().
No functional changes.
Generated using the following semantic patch:
@@
expression REG, OFFSET;
@@
- I915_READ(REG)
+ intel_de_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- POSTING_READ(REG)
+ intel_de_posting_read(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE(REG, OFFSET)
+ intel_de_write(dev_priv, REG, OFFSET)
@@
expression REG;
@@
- I915_READ_FW(REG)
+ intel_de_read_fw(dev_priv, REG)
@@
expression REG, OFFSET;
@@
- I915_WRITE_FW(REG, OFFSET)
+ intel_de_write_fw(dev_priv, REG, OFFSET)
Acked-by: Chris Wilson <chris@chris-wilson.co.uk>
Acked-by: Rodrigo Vivi <rodrigo.vivi@intel.com>
Acked-by: Joonas Lahtinen <joonas.lahtinen@linux.intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/2c6050201849484a7f4681ce6e2f69cb7cb26756.1580149467.git.jani.nikula@intel.com
2020-01-27 18:26:05 +00:00
|
|
|
if (intel_de_read(dev_priv, DDI_BUF_CTL(PORT_A)) & DDI_A_4_LANES)
|
2018-02-06 06:08:55 +00:00
|
|
|
max_lanes = port == PORT_A ? 4 : 0;
|
|
|
|
else
|
|
|
|
/* Both A and E share 2 lanes */
|
|
|
|
max_lanes = 2;
|
|
|
|
}
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Some BIOS might fail to set this bit on port A if eDP
|
|
|
|
* wasn't lit up at boot. Force this bit set when needed
|
|
|
|
* so we use the proper lane count for our calculations.
|
|
|
|
*/
|
2020-07-01 04:50:54 +00:00
|
|
|
if (intel_ddi_a_force_4_lanes(dig_port)) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"Forcing DDI_A_4_LANES for port A\n");
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->saved_port_bits |= DDI_A_4_LANES;
|
2018-02-06 06:08:55 +00:00
|
|
|
max_lanes = 4;
|
|
|
|
}
|
|
|
|
|
|
|
|
return max_lanes;
|
|
|
|
}
|
|
|
|
|
2016-11-23 14:21:44 +00:00
|
|
|
void intel_ddi_init(struct drm_i915_private *dev_priv, enum port port)
|
2012-10-26 21:05:52 +00:00
|
|
|
{
|
2020-07-01 04:50:54 +00:00
|
|
|
struct intel_digital_port *dig_port;
|
2019-11-06 07:17:17 +00:00
|
|
|
struct intel_encoder *encoder;
|
2016-10-14 14:26:51 +00:00
|
|
|
bool init_hdmi, init_dp, init_lspcon = false;
|
2019-07-09 18:39:33 +00:00
|
|
|
enum phy phy = intel_port_to_phy(dev_priv, port);
|
2015-12-08 17:59:37 +00:00
|
|
|
|
2020-01-17 14:29:27 +00:00
|
|
|
init_hdmi = intel_bios_port_supports_dvi(dev_priv, port) ||
|
|
|
|
intel_bios_port_supports_hdmi(dev_priv, port);
|
|
|
|
init_dp = intel_bios_port_supports_dp(dev_priv, port);
|
2016-10-14 14:26:51 +00:00
|
|
|
|
|
|
|
if (intel_bios_is_lspcon_present(dev_priv, port)) {
|
|
|
|
/*
|
|
|
|
* Lspcon device needs to be driven with DP connector
|
|
|
|
* with special detection sequence. So make sure DP
|
|
|
|
* is initialized before lspcon.
|
|
|
|
*/
|
|
|
|
init_dp = true;
|
|
|
|
init_lspcon = true;
|
|
|
|
init_hdmi = false;
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm, "VBT says port %c has lspcon\n",
|
|
|
|
port_name(port));
|
2016-10-14 14:26:51 +00:00
|
|
|
}
|
|
|
|
|
2013-09-12 20:12:18 +00:00
|
|
|
if (!init_dp && !init_hdmi) {
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"VBT says port %c is not DVI/HDMI/DP compatible, respect it\n",
|
|
|
|
port_name(port));
|
2015-08-08 00:01:16 +00:00
|
|
|
return;
|
2013-09-12 20:12:18 +00:00
|
|
|
}
|
2012-10-26 21:05:52 +00:00
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port = kzalloc(sizeof(*dig_port), GFP_KERNEL);
|
|
|
|
if (!dig_port)
|
2012-10-26 21:05:52 +00:00
|
|
|
return;
|
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
encoder = &dig_port->base;
|
2012-10-26 21:05:52 +00:00
|
|
|
|
2019-11-06 07:17:17 +00:00
|
|
|
drm_encoder_init(&dev_priv->drm, &encoder->base, &intel_ddi_funcs,
|
2016-05-27 17:59:24 +00:00
|
|
|
DRM_MODE_ENCODER_TMDS, "DDI %c", port_name(port));
|
2012-10-26 21:05:52 +00:00
|
|
|
|
2019-11-06 07:17:17 +00:00
|
|
|
encoder->hotplug = intel_ddi_hotplug;
|
|
|
|
encoder->compute_output_type = intel_ddi_compute_output_type;
|
|
|
|
encoder->compute_config = intel_ddi_compute_config;
|
2020-02-14 11:41:25 +00:00
|
|
|
encoder->compute_config_late = intel_ddi_compute_config_late;
|
2019-11-06 07:17:17 +00:00
|
|
|
encoder->enable = intel_enable_ddi;
|
|
|
|
encoder->pre_pll_enable = intel_ddi_pre_pll_enable;
|
|
|
|
encoder->pre_enable = intel_ddi_pre_enable;
|
|
|
|
encoder->disable = intel_disable_ddi;
|
|
|
|
encoder->post_disable = intel_ddi_post_disable;
|
|
|
|
encoder->update_pipe = intel_ddi_update_pipe;
|
|
|
|
encoder->get_hw_state = intel_ddi_get_hw_state;
|
|
|
|
encoder->get_config = intel_ddi_get_config;
|
|
|
|
encoder->suspend = intel_dp_encoder_suspend;
|
|
|
|
encoder->get_power_domains = intel_ddi_get_power_domains;
|
|
|
|
|
|
|
|
encoder->type = INTEL_OUTPUT_DDI;
|
|
|
|
encoder->power_domain = intel_port_to_power_domain(port);
|
|
|
|
encoder->port = port;
|
|
|
|
encoder->cloneable = 0;
|
|
|
|
encoder->pipe_mask = ~0;
|
2012-10-26 21:05:52 +00:00
|
|
|
|
2018-03-06 10:41:55 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 11)
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->saved_port_bits =
|
|
|
|
intel_de_read(dev_priv, DDI_BUF_CTL(port))
|
|
|
|
& DDI_BUF_PORT_REVERSAL;
|
2018-03-06 10:41:55 +00:00
|
|
|
else
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->saved_port_bits =
|
|
|
|
intel_de_read(dev_priv, DDI_BUF_CTL(port))
|
|
|
|
& (DDI_BUF_PORT_REVERSAL | DDI_A_4_LANES);
|
2019-11-06 07:17:17 +00:00
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->dp.output_reg = INVALID_MMIO_REG;
|
|
|
|
dig_port->max_lanes = intel_ddi_max_lanes(dig_port);
|
|
|
|
dig_port->aux_ch = intel_bios_port_aux_ch(dev_priv, port);
|
2012-10-26 21:05:52 +00:00
|
|
|
|
2019-07-09 18:39:33 +00:00
|
|
|
if (intel_phy_is_tc(dev_priv, phy)) {
|
2020-01-17 14:29:27 +00:00
|
|
|
bool is_legacy =
|
|
|
|
!intel_bios_port_supports_typec_usb(dev_priv, port) &&
|
|
|
|
!intel_bios_port_supports_tbt(dev_priv, port);
|
2019-06-28 14:36:20 +00:00
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
intel_tc_port_init(dig_port, is_legacy);
|
2019-06-28 14:36:32 +00:00
|
|
|
|
2019-11-06 07:17:17 +00:00
|
|
|
encoder->update_prepare = intel_ddi_update_prepare;
|
|
|
|
encoder->update_complete = intel_ddi_update_complete;
|
2019-06-28 14:36:20 +00:00
|
|
|
}
|
2018-12-14 18:27:02 +00:00
|
|
|
|
drm/i915/display/ddi: Make WARN* drm specific where drm_device ptr is available
drm specific WARN* calls include device information in the
backtrace, so we know what device the warnings originate from.
Covert all the calls of WARN* with device specific drm_WARN*
variants in functions where drm_device or drm_i915_private struct
pointer is readily available.
The conversion was done automatically with below coccinelle semantic
patch. checkpatch errors/warnings are fixed manually.
@rule1@
identifier func, T;
@@
func(...) {
...
struct drm_device *T = ...;
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule2@
identifier func, T;
@@
func(struct drm_device *T,...) {
<...
(
-WARN(
+drm_WARN(T,
...)
|
-WARN_ON(
+drm_WARN_ON(T,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(T,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(T,
...)
)
...>
}
@rule3@
identifier func, T;
@@
func(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
@rule4@
identifier func, T;
@@
func(struct drm_i915_private *T,...) {
<+...
(
-WARN(
+drm_WARN(&T->drm,
...)
|
-WARN_ON(
+drm_WARN_ON(&T->drm,
...)
|
-WARN_ONCE(
+drm_WARN_ONCE(&T->drm,
...)
|
-WARN_ON_ONCE(
+drm_WARN_ON_ONCE(&T->drm,
...)
)
...+>
}
Signed-off-by: Pankaj Bharadiya <pankaj.laxminarayan.bharadiya@intel.com>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20200220165507.16823-3-pankaj.laxminarayan.bharadiya@intel.com
2020-02-20 16:55:01 +00:00
|
|
|
drm_WARN_ON(&dev_priv->drm, port > PORT_I);
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->ddi_io_power_domain = POWER_DOMAIN_PORT_DDI_A_IO +
|
2019-10-11 01:09:01 +00:00
|
|
|
port - PORT_A;
|
2017-02-24 14:19:59 +00:00
|
|
|
|
2014-08-04 06:15:09 +00:00
|
|
|
if (init_dp) {
|
2020-07-01 04:50:54 +00:00
|
|
|
if (!intel_ddi_init_dp_connector(dig_port))
|
2014-08-04 06:15:09 +00:00
|
|
|
goto err;
|
2014-06-18 01:29:35 +00:00
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->hpd_pulse = intel_dp_hpd_pulse;
|
2014-08-04 06:15:09 +00:00
|
|
|
}
|
2013-04-10 21:28:35 +00:00
|
|
|
|
2013-09-12 20:12:18 +00:00
|
|
|
/* In theory we don't need the encoder->type check, but leave it just in
|
|
|
|
* case we have some really bad VBTs... */
|
2019-11-06 07:17:17 +00:00
|
|
|
if (encoder->type != INTEL_OUTPUT_EDP && init_hdmi) {
|
2020-07-01 04:50:54 +00:00
|
|
|
if (!intel_ddi_init_hdmi_connector(dig_port))
|
2014-08-04 06:15:09 +00:00
|
|
|
goto err;
|
2013-04-10 21:28:35 +00:00
|
|
|
}
|
2014-08-04 06:15:09 +00:00
|
|
|
|
2016-10-14 14:26:51 +00:00
|
|
|
if (init_lspcon) {
|
2020-07-01 04:50:54 +00:00
|
|
|
if (lspcon_init(dig_port))
|
2016-10-14 14:26:51 +00:00
|
|
|
/* TODO: handle hdmi info frame part */
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_dbg_kms(&dev_priv->drm,
|
|
|
|
"LSPCON init success on port %c\n",
|
|
|
|
port_name(port));
|
2016-10-14 14:26:51 +00:00
|
|
|
else
|
|
|
|
/*
|
|
|
|
* LSPCON init faied, but DP init was success, so
|
|
|
|
* lets try to drive as DP++ port.
|
|
|
|
*/
|
drm/i915/ddi: use struct drm_device based logging
Convert all the DRM_* logging macros to the struct drm_device based
macros to provide device specific logging.
No functional changes.
Generated using the following semantic patch, originally written by
Wambui Karuga <wambui.karugax@gmail.com>, with manual fixups on top:
@@
identifier fn, T;
@@
fn(...,struct drm_i915_private *T,...) {
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
@@
identifier fn, T;
@@
fn(...) {
...
struct drm_i915_private *T = ...;
<+...
(
-DRM_INFO(
+drm_info(&T->drm,
...)
|
-DRM_NOTE(
+drm_notice(&T->drm,
...)
|
-DRM_ERROR(
+drm_err(&T->drm,
...)
|
-DRM_WARN(
+drm_warn(&T->drm,
...)
|
-DRM_DEBUG_DRIVER(
+drm_dbg(&T->drm,
...)
|
-DRM_DEBUG_KMS(
+drm_dbg_kms(&T->drm,
...)
|
-DRM_DEBUG_ATOMIC(
+drm_dbg_atomic(&T->drm,
...)
)
...+>
}
Cc: Wambui Karuga <wambui.karugax@gmail.com>
Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
Link: https://patchwork.freedesktop.org/patch/msgid/e09bb6e97b2fbc44303acce0523dc35e3e74a456.1584714939.git.jani.nikula@intel.com
2020-03-20 14:36:26 +00:00
|
|
|
drm_err(&dev_priv->drm,
|
|
|
|
"LSPCON init failed on port %c\n",
|
2016-10-14 14:26:51 +00:00
|
|
|
port_name(port));
|
|
|
|
}
|
|
|
|
|
2020-03-11 15:54:20 +00:00
|
|
|
if (INTEL_GEN(dev_priv) >= 11) {
|
|
|
|
if (intel_phy_is_tc(dev_priv, phy))
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->connected = intel_tc_port_connected;
|
2020-03-11 15:54:20 +00:00
|
|
|
else
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->connected = lpt_digital_port_connected;
|
2020-03-11 15:54:22 +00:00
|
|
|
} else if (INTEL_GEN(dev_priv) >= 8) {
|
|
|
|
if (port == PORT_A || IS_GEN9_LP(dev_priv))
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->connected = bdw_digital_port_connected;
|
2020-03-11 15:54:20 +00:00
|
|
|
else
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->connected = lpt_digital_port_connected;
|
2020-03-11 15:54:20 +00:00
|
|
|
} else {
|
2020-03-11 15:54:22 +00:00
|
|
|
if (port == PORT_A)
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->connected = hsw_digital_port_connected;
|
2020-03-11 15:54:20 +00:00
|
|
|
else
|
2020-07-01 04:50:54 +00:00
|
|
|
dig_port->connected = lpt_digital_port_connected;
|
2020-03-11 15:54:20 +00:00
|
|
|
}
|
|
|
|
|
2020-07-01 04:50:54 +00:00
|
|
|
intel_infoframe_init(dig_port);
|
2018-12-14 18:27:02 +00:00
|
|
|
|
2014-08-04 06:15:09 +00:00
|
|
|
return;
|
|
|
|
|
|
|
|
err:
|
2019-11-06 07:17:17 +00:00
|
|
|
drm_encoder_cleanup(&encoder->base);
|
2020-07-01 04:50:54 +00:00
|
|
|
kfree(dig_port);
|
2012-10-26 21:05:52 +00:00
|
|
|
}
|