Skip to content

Commit 77bdb83

Browse files
jnikulajnikula
committed
drm/i915: pass struct intel_connector to connector debugfs fops
Prefer struct intel_connector over struct drm_connector, and unify the declarations in the fops. Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com> Link: https://patchwork.freedesktop.org/patch/msgid/20231205134143.2427661-2-jani.nikula@intel.com
1 parent 922181a commit 77bdb83

1 file changed

Lines changed: 66 additions & 68 deletions

File tree

‎drivers/gpu/drm/i915/display/intel_display_debugfs.c‎

Lines changed: 66 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -1117,11 +1117,10 @@ void intel_display_debugfs_register(struct drm_i915_private *i915)
11171117

11181118
static int i915_panel_show(struct seq_file *m, void *data)
11191119
{
1120-
struct drm_connector *connector = m->private;
1121-
struct intel_dp *intel_dp =
1122-
intel_attached_dp(to_intel_connector(connector));
1120+
struct intel_connector *connector = m->private;
1121+
struct intel_dp *intel_dp = intel_attached_dp(connector);
11231122

1124-
if (connector->status != connector_status_connected)
1123+
if (connector->base.status != connector_status_connected)
11251124
return -ENODEV;
11261125

11271126
seq_printf(m, "Panel power up delay: %d\n",
@@ -1139,23 +1138,23 @@ DEFINE_SHOW_ATTRIBUTE(i915_panel);
11391138

11401139
static int i915_hdcp_sink_capability_show(struct seq_file *m, void *data)
11411140
{
1142-
struct drm_connector *connector = m->private;
1143-
struct drm_i915_private *i915 = to_i915(connector->dev);
1144-
struct intel_connector *intel_connector = to_intel_connector(connector);
1141+
struct intel_connector *connector = m->private;
1142+
struct drm_i915_private *i915 = to_i915(connector->base.dev);
11451143
int ret;
11461144

11471145
ret = drm_modeset_lock_single_interruptible(&i915->drm.mode_config.connection_mutex);
11481146
if (ret)
11491147
return ret;
11501148

1151-
if (!connector->encoder || connector->status != connector_status_connected) {
1149+
if (!connector->base.encoder ||
1150+
connector->base.status != connector_status_connected) {
11521151
ret = -ENODEV;
11531152
goto out;
11541153
}
11551154

1156-
seq_printf(m, "%s:%d HDCP version: ", connector->name,
1157-
connector->base.id);
1158-
intel_hdcp_info(m, intel_connector);
1155+
seq_printf(m, "%s:%d HDCP version: ", connector->base.name,
1156+
connector->base.base.id);
1157+
intel_hdcp_info(m, connector);
11591158

11601159
out:
11611160
drm_modeset_unlock(&i915->drm.mode_config.connection_mutex);
@@ -1166,16 +1165,16 @@ DEFINE_SHOW_ATTRIBUTE(i915_hdcp_sink_capability);
11661165

11671166
static int i915_lpsp_capability_show(struct seq_file *m, void *data)
11681167
{
1169-
struct drm_connector *connector = m->private;
1170-
struct drm_i915_private *i915 = to_i915(connector->dev);
1171-
struct intel_encoder *encoder;
1168+
struct intel_connector *connector = m->private;
1169+
struct drm_i915_private *i915 = to_i915(connector->base.dev);
1170+
struct intel_encoder *encoder = intel_attached_encoder(connector);
1171+
int connector_type = connector->base.connector_type;
11721172
bool lpsp_capable = false;
11731173

1174-
encoder = intel_attached_encoder(to_intel_connector(connector));
11751174
if (!encoder)
11761175
return -ENODEV;
11771176

1178-
if (connector->status != connector_status_connected)
1177+
if (connector->base.status != connector_status_connected)
11791178
return -ENODEV;
11801179

11811180
if (DISPLAY_VER(i915) >= 13)
@@ -1188,15 +1187,15 @@ static int i915_lpsp_capability_show(struct seq_file *m, void *data)
11881187
*/
11891188
lpsp_capable = encoder->port <= PORT_B;
11901189
else if (DISPLAY_VER(i915) == 11)
1191-
lpsp_capable = (connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
1192-
connector->connector_type == DRM_MODE_CONNECTOR_eDP);
1190+
lpsp_capable = (connector_type == DRM_MODE_CONNECTOR_DSI ||
1191+
connector_type == DRM_MODE_CONNECTOR_eDP);
11931192
else if (IS_DISPLAY_VER(i915, 9, 10))
11941193
lpsp_capable = (encoder->port == PORT_A &&
1195-
(connector->connector_type == DRM_MODE_CONNECTOR_DSI ||
1196-
connector->connector_type == DRM_MODE_CONNECTOR_eDP ||
1197-
connector->connector_type == DRM_MODE_CONNECTOR_DisplayPort));
1194+
(connector_type == DRM_MODE_CONNECTOR_DSI ||
1195+
connector_type == DRM_MODE_CONNECTOR_eDP ||
1196+
connector_type == DRM_MODE_CONNECTOR_DisplayPort));
11981197
else if (IS_HASWELL(i915) || IS_BROADWELL(i915))
1199-
lpsp_capable = connector->connector_type == DRM_MODE_CONNECTOR_eDP;
1198+
lpsp_capable = connector_type == DRM_MODE_CONNECTOR_eDP;
12001199

12011200
seq_printf(m, "LPSP: %s\n", lpsp_capable ? "capable" : "incapable");
12021201

@@ -1206,7 +1205,7 @@ DEFINE_SHOW_ATTRIBUTE(i915_lpsp_capability);
12061205

12071206
static int i915_dsc_fec_support_show(struct seq_file *m, void *data)
12081207
{
1209-
struct intel_connector *connector = to_intel_connector(m->private);
1208+
struct intel_connector *connector = m->private;
12101209
struct drm_i915_private *i915 = to_i915(connector->base.dev);
12111210
struct drm_crtc *crtc;
12121211
struct intel_dp *intel_dp;
@@ -1276,13 +1275,13 @@ static ssize_t i915_dsc_fec_support_write(struct file *file,
12761275
const char __user *ubuf,
12771276
size_t len, loff_t *offp)
12781277
{
1278+
struct seq_file *m = file->private_data;
1279+
struct intel_connector *connector = m->private;
1280+
struct drm_i915_private *i915 = to_i915(connector->base.dev);
1281+
struct intel_encoder *encoder = intel_attached_encoder(connector);
1282+
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
12791283
bool dsc_enable = false;
12801284
int ret;
1281-
struct drm_connector *connector =
1282-
((struct seq_file *)file->private_data)->private;
1283-
struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector));
1284-
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
1285-
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
12861285

12871286
if (len == 0)
12881287
return 0;
@@ -1320,30 +1319,30 @@ static const struct file_operations i915_dsc_fec_support_fops = {
13201319

13211320
static int i915_dsc_bpc_show(struct seq_file *m, void *data)
13221321
{
1323-
struct drm_connector *connector = m->private;
1324-
struct drm_device *dev = connector->dev;
1322+
struct intel_connector *connector = m->private;
1323+
struct drm_i915_private *i915 = to_i915(connector->base.dev);
1324+
struct intel_encoder *encoder = intel_attached_encoder(connector);
13251325
struct drm_crtc *crtc;
13261326
struct intel_crtc_state *crtc_state;
1327-
struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector));
13281327
int ret;
13291328

13301329
if (!encoder)
13311330
return -ENODEV;
13321331

1333-
ret = drm_modeset_lock_single_interruptible(&dev->mode_config.connection_mutex);
1332+
ret = drm_modeset_lock_single_interruptible(&i915->drm.mode_config.connection_mutex);
13341333
if (ret)
13351334
return ret;
13361335

1337-
crtc = connector->state->crtc;
1338-
if (connector->status != connector_status_connected || !crtc) {
1336+
crtc = connector->base.state->crtc;
1337+
if (connector->base.status != connector_status_connected || !crtc) {
13391338
ret = -ENODEV;
13401339
goto out;
13411340
}
13421341

13431342
crtc_state = to_intel_crtc_state(crtc->state);
13441343
seq_printf(m, "Input_BPC: %d\n", crtc_state->dsc.config.bits_per_component);
13451344

1346-
out: drm_modeset_unlock(&dev->mode_config.connection_mutex);
1345+
out: drm_modeset_unlock(&i915->drm.mode_config.connection_mutex);
13471346

13481347
return ret;
13491348
}
@@ -1352,9 +1351,9 @@ static ssize_t i915_dsc_bpc_write(struct file *file,
13521351
const char __user *ubuf,
13531352
size_t len, loff_t *offp)
13541353
{
1355-
struct drm_connector *connector =
1356-
((struct seq_file *)file->private_data)->private;
1357-
struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector));
1354+
struct seq_file *m = file->private_data;
1355+
struct intel_connector *connector = m->private;
1356+
struct intel_encoder *encoder = intel_attached_encoder(connector);
13581357
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
13591358
int dsc_bpc = 0;
13601359
int ret;
@@ -1386,22 +1385,22 @@ static const struct file_operations i915_dsc_bpc_fops = {
13861385

13871386
static int i915_dsc_output_format_show(struct seq_file *m, void *data)
13881387
{
1389-
struct drm_connector *connector = m->private;
1390-
struct drm_device *dev = connector->dev;
1388+
struct intel_connector *connector = m->private;
1389+
struct drm_i915_private *i915 = to_i915(connector->base.dev);
1390+
struct intel_encoder *encoder = intel_attached_encoder(connector);
13911391
struct drm_crtc *crtc;
13921392
struct intel_crtc_state *crtc_state;
1393-
struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector));
13941393
int ret;
13951394

13961395
if (!encoder)
13971396
return -ENODEV;
13981397

1399-
ret = drm_modeset_lock_single_interruptible(&dev->mode_config.connection_mutex);
1398+
ret = drm_modeset_lock_single_interruptible(&i915->drm.mode_config.connection_mutex);
14001399
if (ret)
14011400
return ret;
14021401

1403-
crtc = connector->state->crtc;
1404-
if (connector->status != connector_status_connected || !crtc) {
1402+
crtc = connector->base.state->crtc;
1403+
if (connector->base.status != connector_status_connected || !crtc) {
14051404
ret = -ENODEV;
14061405
goto out;
14071406
}
@@ -1410,7 +1409,7 @@ static int i915_dsc_output_format_show(struct seq_file *m, void *data)
14101409
seq_printf(m, "DSC_Output_Format: %s\n",
14111410
intel_output_format_name(crtc_state->output_format));
14121411

1413-
out: drm_modeset_unlock(&dev->mode_config.connection_mutex);
1412+
out: drm_modeset_unlock(&i915->drm.mode_config.connection_mutex);
14141413

14151414
return ret;
14161415
}
@@ -1419,9 +1418,9 @@ static ssize_t i915_dsc_output_format_write(struct file *file,
14191418
const char __user *ubuf,
14201419
size_t len, loff_t *offp)
14211420
{
1422-
struct drm_connector *connector =
1423-
((struct seq_file *)file->private_data)->private;
1424-
struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector));
1421+
struct seq_file *m = file->private_data;
1422+
struct intel_connector *connector = m->private;
1423+
struct intel_encoder *encoder = intel_attached_encoder(connector);
14251424
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
14261425
int dsc_output_format = 0;
14271426
int ret;
@@ -1453,33 +1452,32 @@ static const struct file_operations i915_dsc_output_format_fops = {
14531452

14541453
static int i915_dsc_fractional_bpp_show(struct seq_file *m, void *data)
14551454
{
1456-
struct drm_connector *connector = m->private;
1457-
struct drm_device *dev = connector->dev;
1455+
struct intel_connector *connector = m->private;
1456+
struct drm_i915_private *i915 = to_i915(connector->base.dev);
1457+
struct intel_encoder *encoder = intel_attached_encoder(connector);
14581458
struct drm_crtc *crtc;
14591459
struct intel_dp *intel_dp;
1460-
struct intel_connector *intel_connector = to_intel_connector(connector);
1461-
struct intel_encoder *encoder = intel_attached_encoder(intel_connector);
14621460
int ret;
14631461

14641462
if (!encoder)
14651463
return -ENODEV;
14661464

1467-
ret = drm_modeset_lock_single_interruptible(&dev->mode_config.connection_mutex);
1465+
ret = drm_modeset_lock_single_interruptible(&i915->drm.mode_config.connection_mutex);
14681466
if (ret)
14691467
return ret;
14701468

1471-
crtc = connector->state->crtc;
1472-
if (connector->status != connector_status_connected || !crtc) {
1469+
crtc = connector->base.state->crtc;
1470+
if (connector->base.status != connector_status_connected || !crtc) {
14731471
ret = -ENODEV;
14741472
goto out;
14751473
}
14761474

1477-
intel_dp = intel_attached_dp(intel_connector);
1475+
intel_dp = intel_attached_dp(connector);
14781476
seq_printf(m, "Force_DSC_Fractional_BPP_Enable: %s\n",
14791477
str_yes_no(intel_dp->force_dsc_fractional_bpp_en));
14801478

14811479
out:
1482-
drm_modeset_unlock(&dev->mode_config.connection_mutex);
1480+
drm_modeset_unlock(&i915->drm.mode_config.connection_mutex);
14831481

14841482
return ret;
14851483
}
@@ -1488,10 +1486,10 @@ static ssize_t i915_dsc_fractional_bpp_write(struct file *file,
14881486
const char __user *ubuf,
14891487
size_t len, loff_t *offp)
14901488
{
1491-
struct drm_connector *connector =
1492-
((struct seq_file *)file->private_data)->private;
1493-
struct intel_encoder *encoder = intel_attached_encoder(to_intel_connector(connector));
1494-
struct drm_i915_private *i915 = to_i915(encoder->base.dev);
1489+
struct seq_file *m = file->private_data;
1490+
struct intel_connector *connector = m->private;
1491+
struct intel_encoder *encoder = intel_attached_encoder(connector);
1492+
struct drm_i915_private *i915 = to_i915(connector->base.dev);
14951493
struct intel_dp *intel_dp = enc_to_intel_dp(encoder);
14961494
bool dsc_fractional_bpp_enable = false;
14971495
int ret;
@@ -1586,29 +1584,29 @@ void intel_connector_debugfs_add(struct intel_connector *connector)
15861584

15871585
if (connector_type == DRM_MODE_CONNECTOR_eDP)
15881586
debugfs_create_file("i915_panel_timings", S_IRUGO, root,
1589-
&connector->base, &i915_panel_fops);
1587+
connector, &i915_panel_fops);
15901588

15911589
if (connector_type == DRM_MODE_CONNECTOR_DisplayPort ||
15921590
connector_type == DRM_MODE_CONNECTOR_HDMIA ||
15931591
connector_type == DRM_MODE_CONNECTOR_HDMIB) {
15941592
debugfs_create_file("i915_hdcp_sink_capability", S_IRUGO, root,
1595-
&connector->base, &i915_hdcp_sink_capability_fops);
1593+
connector, &i915_hdcp_sink_capability_fops);
15961594
}
15971595

15981596
if (DISPLAY_VER(i915) >= 11 &&
15991597
((connector_type == DRM_MODE_CONNECTOR_DisplayPort && !connector->mst_port) ||
16001598
connector_type == DRM_MODE_CONNECTOR_eDP)) {
16011599
debugfs_create_file("i915_dsc_fec_support", 0644, root,
1602-
&connector->base, &i915_dsc_fec_support_fops);
1600+
connector, &i915_dsc_fec_support_fops);
16031601

16041602
debugfs_create_file("i915_dsc_bpc", 0644, root,
1605-
&connector->base, &i915_dsc_bpc_fops);
1603+
connector, &i915_dsc_bpc_fops);
16061604

16071605
debugfs_create_file("i915_dsc_output_format", 0644, root,
1608-
&connector->base, &i915_dsc_output_format_fops);
1606+
connector, &i915_dsc_output_format_fops);
16091607

16101608
debugfs_create_file("i915_dsc_fractional_bpp", 0644, root,
1611-
&connector->base, &i915_dsc_fractional_bpp_fops);
1609+
connector, &i915_dsc_fractional_bpp_fops);
16121610
}
16131611

16141612
if (connector_type == DRM_MODE_CONNECTOR_DSI ||
@@ -1617,7 +1615,7 @@ void intel_connector_debugfs_add(struct intel_connector *connector)
16171615
connector_type == DRM_MODE_CONNECTOR_HDMIA ||
16181616
connector_type == DRM_MODE_CONNECTOR_HDMIB)
16191617
debugfs_create_file("i915_lpsp_capability", 0444, root,
1620-
&connector->base, &i915_lpsp_capability_fops);
1618+
connector, &i915_lpsp_capability_fops);
16211619
}
16221620

16231621
/**

0 commit comments

Comments
 (0)