* [PATCH 1/7] drm/i915: replace drm_get_connector_name() with direct name field use
2014-05-26 13:35 [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
@ 2014-05-26 13:35 ` Jani Nikula
2014-05-26 13:35 ` [PATCH 2/7] drm/nouveau: " Jani Nikula
` (7 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2014-05-26 13:35 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, intel-gfx, David Herrmann
Generated using semantic patch:
@@
expression E;
@@
- drm_get_connector_name(E)
+ E->name
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 4 ++--
drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
drivers/gpu/drm/i915/intel_crt.c | 2 +-
drivers/gpu/drm/i915/intel_display.c | 16 ++++++++--------
drivers/gpu/drm/i915/intel_dp.c | 2 +-
drivers/gpu/drm/i915/intel_dvo.c | 2 +-
drivers/gpu/drm/i915/intel_fbdev.c | 14 +++++++-------
drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
drivers/gpu/drm/i915/intel_lvds.c | 2 +-
drivers/gpu/drm/i915/intel_panel.c | 2 +-
drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++----
drivers/gpu/drm/i915/intel_tv.c | 2 +-
12 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 333dd12d62f4..8f49a2964ed5 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2202,7 +2202,7 @@ static void intel_encoder_info(struct seq_file *m,
struct drm_connector *connector = &intel_connector->base;
seq_printf(m, "\t\tconnector %d: type: %s, status: %s",
connector->base.id,
- drm_get_connector_name(connector),
+ connector->name,
drm_get_connector_status_name(connector->status));
if (connector->status == connector_status_connected) {
struct drm_display_mode *mode = &crtc->mode;
@@ -2273,7 +2273,7 @@ static void intel_connector_info(struct seq_file *m,
struct drm_display_mode *mode;
seq_printf(m, "connector %d: type %s, status: %s\n",
- connector->base.id, drm_get_connector_name(connector),
+ connector->base.id, connector->name,
drm_get_connector_status_name(connector->status));
if (connector->status == connector_status_connected) {
seq_printf(m, "\tname: %s\n", connector->display_info.name);
diff --git a/drivers/gpu/drm/i915/i915_irq.c b/drivers/gpu/drm/i915/i915_irq.c
index 28bae6e4a424..cbf31cbfa084 100644
--- a/drivers/gpu/drm/i915/i915_irq.c
+++ b/drivers/gpu/drm/i915/i915_irq.c
@@ -1089,7 +1089,7 @@ static bool intel_hpd_irq_event(struct drm_device *dev,
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n",
connector->base.id,
- drm_get_connector_name(connector),
+ connector->name,
drm_get_connector_status_name(old_status),
drm_get_connector_status_name(connector->status));
@@ -1134,7 +1134,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
connector->polled == DRM_CONNECTOR_POLL_HPD) {
DRM_INFO("HPD interrupt storm detected on connector %s: "
"switching from hotplug detection to polling\n",
- drm_get_connector_name(connector));
+ connector->name);
dev_priv->hpd_stats[intel_encoder->hpd_pin].hpd_mark = HPD_DISABLED;
connector->polled = DRM_CONNECTOR_POLL_CONNECT
| DRM_CONNECTOR_POLL_DISCONNECT;
@@ -1142,7 +1142,7 @@ static void i915_hotplug_work_func(struct work_struct *work)
}
if (hpd_event_bits & (1 << intel_encoder->hpd_pin)) {
DRM_DEBUG_KMS("Connector %s (pin %i) received hotplug event.\n",
- drm_get_connector_name(connector), intel_encoder->hpd_pin);
+ connector->name, intel_encoder->hpd_pin);
}
}
/* if there were no outputs to poll, poll was disabled,
@@ -4321,7 +4321,7 @@ static void intel_hpd_irq_reenable(unsigned long data)
if (intel_connector->encoder->hpd_pin == i) {
if (connector->polled != intel_connector->polled)
DRM_DEBUG_DRIVER("Reenabling HPD on connector %s\n",
- drm_get_connector_name(connector));
+ connector->name);
connector->polled = intel_connector->polled;
if (!connector->polled)
connector->polled = DRM_CONNECTOR_POLL_HPD;
diff --git a/drivers/gpu/drm/i915/intel_crt.c b/drivers/gpu/drm/i915/intel_crt.c
index 22d8347f7838..1fc91df58296 100644
--- a/drivers/gpu/drm/i915/intel_crt.c
+++ b/drivers/gpu/drm/i915/intel_crt.c
@@ -634,7 +634,7 @@ intel_crt_detect(struct drm_connector *connector, bool force)
intel_runtime_pm_get(dev_priv);
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",
- connector->base.id, drm_get_connector_name(connector),
+ connector->base.id, connector->name,
force);
power_domain = intel_display_port_power_domain(intel_encoder);
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 3da73efedc80..982f4da17ac1 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -4929,7 +4929,7 @@ static void intel_connector_check_state(struct intel_connector *connector)
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
connector->base.base.id,
- drm_get_connector_name(&connector->base));
+ (&connector->base)->name);
WARN(connector->base.dpms == DRM_MODE_DPMS_OFF,
"wrong connector dpms state\n");
@@ -7853,7 +7853,7 @@ void intel_write_eld(struct drm_encoder *encoder,
DRM_DEBUG_DRIVER("ELD on [CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
connector->base.id,
- drm_get_connector_name(connector),
+ connector->name,
connector->encoder->base.id,
drm_get_encoder_name(connector->encoder));
@@ -8315,7 +8315,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
int i = -1;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector),
+ connector->base.id, connector->name,
encoder->base.id, drm_get_encoder_name(encoder));
/*
@@ -8427,7 +8427,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
struct intel_crtc *intel_crtc = to_intel_crtc(crtc);
DRM_DEBUG_KMS("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector),
+ connector->base.id, connector->name,
encoder->base.id, drm_get_encoder_name(encoder));
if (old->load_detect_temp) {
@@ -9399,7 +9399,7 @@ connected_sink_compute_bpp(struct intel_connector *connector,
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] checking for sink bpp constrains\n",
connector->base.base.id,
- drm_get_connector_name(&connector->base));
+ (&connector->base)->name);
/* Don't use an invalid EDID bpc value */
if (connector->base.display_info.bpc &&
@@ -10612,7 +10612,7 @@ intel_modeset_stage_output_state(struct drm_device *dev,
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [NOCRTC]\n",
connector->base.base.id,
- drm_get_connector_name(&connector->base));
+ (&connector->base)->name);
}
@@ -10647,7 +10647,7 @@ intel_modeset_stage_output_state(struct drm_device *dev,
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [CRTC:%d]\n",
connector->base.base.id,
- drm_get_connector_name(&connector->base),
+ (&connector->base)->name,
new_crtc->base.id);
}
@@ -12100,7 +12100,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
}
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] hw state readout: %s\n",
connector->base.base.id,
- drm_get_connector_name(&connector->base),
+ (&connector->base)->name,
connector->base.encoder ? "enabled" : "disabled");
}
}
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index b67474f9617a..e94170843c28 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3491,7 +3491,7 @@ intel_dp_detect(struct drm_connector *connector, bool force)
intel_display_power_get(dev_priv, power_domain);
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
intel_dp->has_audio = false;
diff --git a/drivers/gpu/drm/i915/intel_dvo.c b/drivers/gpu/drm/i915/intel_dvo.c
index 1604235d58e6..a3631c0a5c28 100644
--- a/drivers/gpu/drm/i915/intel_dvo.c
+++ b/drivers/gpu/drm/i915/intel_dvo.c
@@ -343,7 +343,7 @@ intel_dvo_detect(struct drm_connector *connector, bool force)
{
struct intel_dvo *intel_dvo = intel_attached_dvo(connector);
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
return intel_dvo->dev.dev_ops->detect(&intel_dvo->dev);
}
diff --git a/drivers/gpu/drm/i915/intel_fbdev.c b/drivers/gpu/drm/i915/intel_fbdev.c
index f6f26a339c5a..b5448d8ccbc7 100644
--- a/drivers/gpu/drm/i915/intel_fbdev.c
+++ b/drivers/gpu/drm/i915/intel_fbdev.c
@@ -344,14 +344,14 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
if (!enabled[i]) {
DRM_DEBUG_KMS("connector %s not enabled, skipping\n",
- drm_get_connector_name(connector));
+ connector->name);
continue;
}
encoder = connector->encoder;
if (!encoder || WARN_ON(!encoder->crtc)) {
DRM_DEBUG_KMS("connector %s has no encoder or crtc, skipping\n",
- drm_get_connector_name(connector));
+ connector->name);
enabled[i] = false;
continue;
}
@@ -374,7 +374,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
}
DRM_DEBUG_KMS("looking for cmdline mode on connector %s\n",
- drm_get_connector_name(connector));
+ connector->name);
/* go for command line mode first */
modes[i] = drm_pick_cmdline_mode(fb_conn, width, height);
@@ -382,7 +382,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
/* try for preferred next */
if (!modes[i]) {
DRM_DEBUG_KMS("looking for preferred mode on connector %s\n",
- drm_get_connector_name(connector));
+ connector->name);
modes[i] = drm_has_preferred_mode(fb_conn, width,
height);
}
@@ -390,7 +390,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
/* No preferred mode marked by the EDID? Are there any modes? */
if (!modes[i] && !list_empty(&connector->modes)) {
DRM_DEBUG_KMS("using first mode listed on connector %s\n",
- drm_get_connector_name(connector));
+ connector->name);
modes[i] = list_first_entry(&connector->modes,
struct drm_display_mode,
head);
@@ -410,7 +410,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
* something we own.
*/
DRM_DEBUG_KMS("looking for current mode on connector %s\n",
- drm_get_connector_name(connector));
+ connector->name);
intel_mode_from_pipe_config(&encoder->crtc->hwmode,
&to_intel_crtc(encoder->crtc)->config);
modes[i] = &encoder->crtc->hwmode;
@@ -418,7 +418,7 @@ static bool intel_fb_initial_config(struct drm_fb_helper *fb_helper,
crtcs[i] = new_crtc;
DRM_DEBUG_KMS("connector %s on pipe %d [CRTC:%d]: %dx%d%s\n",
- drm_get_connector_name(connector),
+ connector->name,
pipe_name(to_intel_crtc(encoder->crtc)->pipe),
encoder->crtc->base.id,
modes[i]->hdisplay, modes[i]->vdisplay,
diff --git a/drivers/gpu/drm/i915/intel_hdmi.c b/drivers/gpu/drm/i915/intel_hdmi.c
index 171d0dd0239a..eee2bbec2958 100644
--- a/drivers/gpu/drm/i915/intel_hdmi.c
+++ b/drivers/gpu/drm/i915/intel_hdmi.c
@@ -973,7 +973,7 @@ intel_hdmi_detect(struct drm_connector *connector, bool force)
enum drm_connector_status status = connector_status_disconnected;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
power_domain = intel_display_port_power_domain(intel_encoder);
intel_display_power_get(dev_priv, power_domain);
diff --git a/drivers/gpu/drm/i915/intel_lvds.c b/drivers/gpu/drm/i915/intel_lvds.c
index d1539f3efe44..23126023aeba 100644
--- a/drivers/gpu/drm/i915/intel_lvds.c
+++ b/drivers/gpu/drm/i915/intel_lvds.c
@@ -334,7 +334,7 @@ intel_lvds_detect(struct drm_connector *connector, bool force)
enum drm_connector_status status;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
status = intel_panel_detect(dev);
if (status != connector_status_unknown)
diff --git a/drivers/gpu/drm/i915/intel_panel.c b/drivers/gpu/drm/i915/intel_panel.c
index 934091c60884..d0c6b465f77c 100644
--- a/drivers/gpu/drm/i915/intel_panel.c
+++ b/drivers/gpu/drm/i915/intel_panel.c
@@ -1130,7 +1130,7 @@ int intel_panel_setup_backlight(struct drm_connector *connector)
if (ret) {
DRM_DEBUG_KMS("failed to setup backlight for connector %s\n",
- drm_get_connector_name(connector));
+ connector->name);
return ret;
}
diff --git a/drivers/gpu/drm/i915/intel_sdvo.c b/drivers/gpu/drm/i915/intel_sdvo.c
index aa2c609fccf1..6a4d5bc17697 100644
--- a/drivers/gpu/drm/i915/intel_sdvo.c
+++ b/drivers/gpu/drm/i915/intel_sdvo.c
@@ -1743,7 +1743,7 @@ intel_sdvo_detect(struct drm_connector *connector, bool force)
enum drm_connector_status ret;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
if (!intel_sdvo_get_value(intel_sdvo,
SDVO_CMD_GET_ATTACHED_DISPLAYS,
@@ -1805,7 +1805,7 @@ static void intel_sdvo_get_ddc_modes(struct drm_connector *connector)
struct edid *edid;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
/* set the bus switch and get the modes */
edid = intel_sdvo_get_edid(connector);
@@ -1903,7 +1903,7 @@ static void intel_sdvo_get_tv_modes(struct drm_connector *connector)
int i;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
/* Read the list of supported input resolutions for the selected TV
* format.
@@ -1940,7 +1940,7 @@ static void intel_sdvo_get_lvds_modes(struct drm_connector *connector)
struct drm_display_mode *newmode;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
/*
* Fetch modes from VBT. For SDVO prefer the VBT mode since some
diff --git a/drivers/gpu/drm/i915/intel_tv.c b/drivers/gpu/drm/i915/intel_tv.c
index e0193e8020b8..25850a86d70c 100644
--- a/drivers/gpu/drm/i915/intel_tv.c
+++ b/drivers/gpu/drm/i915/intel_tv.c
@@ -1314,7 +1314,7 @@ intel_tv_detect(struct drm_connector *connector, bool force)
int type;
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] force=%d\n",
- connector->base.id, drm_get_connector_name(connector),
+ connector->base.id, connector->name,
force);
mode = reported_modes[0];
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 2/7] drm/nouveau: replace drm_get_connector_name() with direct name field use
2014-05-26 13:35 [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
2014-05-26 13:35 ` [PATCH 1/7] drm/i915: replace drm_get_connector_name() with direct name field use Jani Nikula
@ 2014-05-26 13:35 ` Jani Nikula
2014-05-26 15:50 ` Ilia Mirkin
2014-05-26 13:35 ` [PATCH 3/7] drm/radeon: " Jani Nikula
` (6 subsequent siblings)
8 siblings, 1 reply; 15+ messages in thread
From: Jani Nikula @ 2014-05-26 13:35 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, intel-gfx, David Herrmann
Generated using semantic patch:
@@
expression E;
@@
- drm_get_connector_name(E)
+ E->name
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +-
drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 3 ++-
drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +--
drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
7 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
index 434b920f6bd4..d4d95df2b3c6 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
@@ -414,7 +414,7 @@ static void nv04_dac_commit(struct drm_encoder *encoder)
helper->dpms(encoder, DRM_MODE_DPMS_ON);
NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
- drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
+ (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
}
diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
index a2d669b4acf2..0615efde05ad 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
@@ -477,7 +477,7 @@ static void nv04_dfp_commit(struct drm_encoder *encoder)
helper->dpms(encoder, DRM_MODE_DPMS_ON);
NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
- drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
+ (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
}
diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c
index 2f1ed61f7c8c..4342fdaee707 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/disp.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c
@@ -115,7 +115,7 @@ nv04_display_create(struct drm_device *dev)
&dev->mode_config.connector_list, head) {
if (!connector->encoder_ids[0]) {
NV_WARN(drm, "%s has no encoders, removing\n",
- drm_get_connector_name(connector));
+ connector->name);
connector->funcs->destroy(connector);
}
}
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
index 244822df8ffc..6b13e1d3c570 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
@@ -171,7 +171,8 @@ static void nv04_tv_commit(struct drm_encoder *encoder)
helper->dpms(encoder, DRM_MODE_DPMS_ON);
NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
- drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
+ (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
+ nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
}
static void nv04_tv_destroy(struct drm_encoder *encoder)
diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
index acef48f4a4ea..9026ab97098f 100644
--- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
+++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
@@ -612,8 +612,7 @@ static void nv17_tv_commit(struct drm_encoder *encoder)
helper->dpms(encoder, DRM_MODE_DPMS_ON);
NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n",
- drm_get_connector_name(
- &nouveau_encoder_connector_get(nv_encoder)->base),
+ (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
}
diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index d07ce028af51..6ecea9b2b15a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -265,14 +265,14 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
nv_connector->edid);
if (!nv_connector->edid) {
NV_ERROR(drm, "DDC responded, but no EDID for %s\n",
- drm_get_connector_name(connector));
+ connector->name);
goto detect_analog;
}
if (nv_encoder->dcb->type == DCB_OUTPUT_DP &&
!nouveau_dp_detect(to_drm_encoder(nv_encoder))) {
NV_ERROR(drm, "Detected %s, but failed init\n",
- drm_get_connector_name(connector));
+ connector->name);
conn_status = connector_status_disconnected;
goto out;
}
@@ -437,7 +437,7 @@ nouveau_connector_force(struct drm_connector *connector)
nv_encoder = find_encoder(connector, type);
if (!nv_encoder) {
NV_ERROR(drm, "can't find encoder to force %s on!\n",
- drm_get_connector_name(connector));
+ connector->name);
connector->status = connector_status_disconnected;
return;
}
@@ -923,7 +923,7 @@ nouveau_connector_hotplug_work(struct work_struct *work)
bool plugged = gpio->get(gpio, 0, nv_connector->hpd.func, 0xff);
NV_DEBUG(drm, "%splugged %s\n", plugged ? "" : "un",
- drm_get_connector_name(connector));
+ connector->name);
if (plugged)
drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index 58af547b0b93..79f6dc724a85 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -2295,7 +2295,7 @@ nv50_display_create(struct drm_device *dev)
continue;
NV_WARN(drm, "%s has no encoders, removing\n",
- drm_get_connector_name(connector));
+ connector->name);
connector->funcs->destroy(connector);
}
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 2/7] drm/nouveau: replace drm_get_connector_name() with direct name field use
2014-05-26 13:35 ` [PATCH 2/7] drm/nouveau: " Jani Nikula
@ 2014-05-26 15:50 ` Ilia Mirkin
2014-05-26 18:41 ` Jani Nikula
0 siblings, 1 reply; 15+ messages in thread
From: Ilia Mirkin @ 2014-05-26 15:50 UTC (permalink / raw)
To: Jani Nikula; +Cc: intel-gfx, dri-devel@lists.freedesktop.org
On Mon, May 26, 2014 at 9:35 AM, Jani Nikula <jani.nikula@intel.com> wrote:
> Generated using semantic patch:
>
> @@
> expression E;
> @@
>
> - drm_get_connector_name(E)
> + E->name
>
> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
> ---
> drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 3 ++-
> drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +--
> drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
> drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
> 7 files changed, 11 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
> index 434b920f6bd4..d4d95df2b3c6 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
> @@ -414,7 +414,7 @@ static void nv04_dac_commit(struct drm_encoder *encoder)
> helper->dpms(encoder, DRM_MODE_DPMS_ON);
>
> NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
> - drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
> + (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
That looks pretty vile... how about
nouveau_encoder_connector_get(nv_encoder)->base.name
Here and below.
> nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
> }
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/dfp.c b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> index a2d669b4acf2..0615efde05ad 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/dfp.c
> @@ -477,7 +477,7 @@ static void nv04_dfp_commit(struct drm_encoder *encoder)
> helper->dpms(encoder, DRM_MODE_DPMS_ON);
>
> NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
> - drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
> + (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
> nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
> }
>
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/disp.c b/drivers/gpu/drm/nouveau/dispnv04/disp.c
> index 2f1ed61f7c8c..4342fdaee707 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/disp.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/disp.c
> @@ -115,7 +115,7 @@ nv04_display_create(struct drm_device *dev)
> &dev->mode_config.connector_list, head) {
> if (!connector->encoder_ids[0]) {
> NV_WARN(drm, "%s has no encoders, removing\n",
> - drm_get_connector_name(connector));
> + connector->name);
> connector->funcs->destroy(connector);
> }
> }
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
> index 244822df8ffc..6b13e1d3c570 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv04.c
> @@ -171,7 +171,8 @@ static void nv04_tv_commit(struct drm_encoder *encoder)
> helper->dpms(encoder, DRM_MODE_DPMS_ON);
>
> NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
> - drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base), nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
> + (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
> + nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
> }
>
> static void nv04_tv_destroy(struct drm_encoder *encoder)
> diff --git a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
> index acef48f4a4ea..9026ab97098f 100644
> --- a/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
> +++ b/drivers/gpu/drm/nouveau/dispnv04/tvnv17.c
> @@ -612,8 +612,7 @@ static void nv17_tv_commit(struct drm_encoder *encoder)
> helper->dpms(encoder, DRM_MODE_DPMS_ON);
>
> NV_INFO(drm, "Output %s is running on CRTC %d using output %c\n",
> - drm_get_connector_name(
> - &nouveau_encoder_connector_get(nv_encoder)->base),
> + (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
> nv_crtc->index, '@' + ffs(nv_encoder->dcb->or));
> }
>
> diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
> index d07ce028af51..6ecea9b2b15a 100644
> --- a/drivers/gpu/drm/nouveau/nouveau_connector.c
> +++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
> @@ -265,14 +265,14 @@ nouveau_connector_detect(struct drm_connector *connector, bool force)
> nv_connector->edid);
> if (!nv_connector->edid) {
> NV_ERROR(drm, "DDC responded, but no EDID for %s\n",
> - drm_get_connector_name(connector));
> + connector->name);
> goto detect_analog;
> }
>
> if (nv_encoder->dcb->type == DCB_OUTPUT_DP &&
> !nouveau_dp_detect(to_drm_encoder(nv_encoder))) {
> NV_ERROR(drm, "Detected %s, but failed init\n",
> - drm_get_connector_name(connector));
> + connector->name);
> conn_status = connector_status_disconnected;
> goto out;
> }
> @@ -437,7 +437,7 @@ nouveau_connector_force(struct drm_connector *connector)
> nv_encoder = find_encoder(connector, type);
> if (!nv_encoder) {
> NV_ERROR(drm, "can't find encoder to force %s on!\n",
> - drm_get_connector_name(connector));
> + connector->name);
> connector->status = connector_status_disconnected;
> return;
> }
> @@ -923,7 +923,7 @@ nouveau_connector_hotplug_work(struct work_struct *work)
> bool plugged = gpio->get(gpio, 0, nv_connector->hpd.func, 0xff);
>
> NV_DEBUG(drm, "%splugged %s\n", plugged ? "" : "un",
> - drm_get_connector_name(connector));
> + connector->name);
>
> if (plugged)
> drm_helper_connector_dpms(connector, DRM_MODE_DPMS_ON);
> diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
> index 58af547b0b93..79f6dc724a85 100644
> --- a/drivers/gpu/drm/nouveau/nv50_display.c
> +++ b/drivers/gpu/drm/nouveau/nv50_display.c
> @@ -2295,7 +2295,7 @@ nv50_display_create(struct drm_device *dev)
> continue;
>
> NV_WARN(drm, "%s has no encoders, removing\n",
> - drm_get_connector_name(connector));
> + connector->name);
> connector->funcs->destroy(connector);
> }
>
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 2/7] drm/nouveau: replace drm_get_connector_name() with direct name field use
2014-05-26 15:50 ` Ilia Mirkin
@ 2014-05-26 18:41 ` Jani Nikula
0 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2014-05-26 18:41 UTC (permalink / raw)
To: Ilia Mirkin; +Cc: intel-gfx, dri-devel@lists.freedesktop.org
On Mon, 26 May 2014, Ilia Mirkin <imirkin@alum.mit.edu> wrote:
> On Mon, May 26, 2014 at 9:35 AM, Jani Nikula <jani.nikula@intel.com> wrote:
>> Generated using semantic patch:
>>
>> @@
>> expression E;
>> @@
>>
>> - drm_get_connector_name(E)
>> + E->name
>>
>> Signed-off-by: Jani Nikula <jani.nikula@intel.com>
>> ---
>> drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 3 ++-
>> drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +--
>> drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
>> drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
>> 7 files changed, 11 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/gpu/drm/nouveau/dispnv04/dac.c b/drivers/gpu/drm/nouveau/dispnv04/dac.c
>> index 434b920f6bd4..d4d95df2b3c6 100644
>> --- a/drivers/gpu/drm/nouveau/dispnv04/dac.c
>> +++ b/drivers/gpu/drm/nouveau/dispnv04/dac.c
>> @@ -414,7 +414,7 @@ static void nv04_dac_commit(struct drm_encoder *encoder)
>> helper->dpms(encoder, DRM_MODE_DPMS_ON);
>>
>> NV_DEBUG(drm, "Output %s is running on CRTC %d using output %c\n",
>> - drm_get_connector_name(&nouveau_encoder_connector_get(nv_encoder)->base),
>> + (&nouveau_encoder_connector_get(nv_encoder)->base)->name,
>
> That looks pretty vile... how about
>
> nouveau_encoder_connector_get(nv_encoder)->base.name
Ugh, agreed. Let me see if I can tweak the semantic patch, or if I need
to do it manually.
Thanks,
Jani.
--
Jani Nikula, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 3/7] drm/radeon: replace drm_get_connector_name() with direct name field use
2014-05-26 13:35 [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
2014-05-26 13:35 ` [PATCH 1/7] drm/i915: replace drm_get_connector_name() with direct name field use Jani Nikula
2014-05-26 13:35 ` [PATCH 2/7] drm/nouveau: " Jani Nikula
@ 2014-05-26 13:35 ` Jani Nikula
2014-05-26 13:35 ` [PATCH 4/7] drm: " Jani Nikula
` (5 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2014-05-26 13:35 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, intel-gfx
Generated using semantic patch:
@@
expression E;
@@
- drm_get_connector_name(E)
+ E->name
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/radeon/radeon_connectors.c | 19 ++++++++++++-------
drivers/gpu/drm/radeon/radeon_display.c | 2 +-
2 files changed, 13 insertions(+), 8 deletions(-)
diff --git a/drivers/gpu/drm/radeon/radeon_connectors.c b/drivers/gpu/drm/radeon/radeon_connectors.c
index ea50e0ae7bf7..19e733d5a7a4 100644
--- a/drivers/gpu/drm/radeon/radeon_connectors.c
+++ b/drivers/gpu/drm/radeon/radeon_connectors.c
@@ -260,13 +260,17 @@ radeon_connector_analog_encoder_conflict_solve(struct drm_connector *connector,
continue;
if (priority == true) {
- DRM_DEBUG_KMS("1: conflicting encoders switching off %s\n", drm_get_connector_name(conflict));
- DRM_DEBUG_KMS("in favor of %s\n", drm_get_connector_name(connector));
+ DRM_DEBUG_KMS("1: conflicting encoders switching off %s\n",
+ conflict->name);
+ DRM_DEBUG_KMS("in favor of %s\n",
+ connector->name);
conflict->status = connector_status_disconnected;
radeon_connector_update_scratch_regs(conflict, connector_status_disconnected);
} else {
- DRM_DEBUG_KMS("2: conflicting encoders switching off %s\n", drm_get_connector_name(connector));
- DRM_DEBUG_KMS("in favor of %s\n", drm_get_connector_name(conflict));
+ DRM_DEBUG_KMS("2: conflicting encoders switching off %s\n",
+ connector->name);
+ DRM_DEBUG_KMS("in favor of %s\n",
+ conflict->name);
current_status = connector_status_disconnected;
}
break;
@@ -787,7 +791,7 @@ radeon_vga_detect(struct drm_connector *connector, bool force)
if (!radeon_connector->edid) {
DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
- drm_get_connector_name(connector));
+ connector->name);
ret = connector_status_connected;
} else {
radeon_connector->use_digital = !!(radeon_connector->edid->input & DRM_EDID_INPUT_DIGITAL);
@@ -1010,12 +1014,13 @@ radeon_dvi_detect(struct drm_connector *connector, bool force)
if (!radeon_connector->edid) {
DRM_ERROR("%s: probed a monitor but no|invalid EDID\n",
- drm_get_connector_name(connector));
+ connector->name);
/* rs690 seems to have a problem with connectors not existing and always
* return a block of 0's. If we see this just stop polling on this output */
if ((rdev->family == CHIP_RS690 || rdev->family == CHIP_RS740) && radeon_connector->base.null_edid_counter) {
ret = connector_status_disconnected;
- DRM_ERROR("%s: detected RS690 floating bus bug, stopping ddc detect\n", drm_get_connector_name(connector));
+ DRM_ERROR("%s: detected RS690 floating bus bug, stopping ddc detect\n",
+ connector->name);
radeon_connector->ddc_bus = NULL;
} else {
ret = connector_status_connected;
diff --git a/drivers/gpu/drm/radeon/radeon_display.c b/drivers/gpu/drm/radeon/radeon_display.c
index f00dbbf4d806..7c63d082ba73 100644
--- a/drivers/gpu/drm/radeon/radeon_display.c
+++ b/drivers/gpu/drm/radeon/radeon_display.c
@@ -661,7 +661,7 @@ static void radeon_print_display_setup(struct drm_device *dev)
list_for_each_entry(connector, &dev->mode_config.connector_list, head) {
radeon_connector = to_radeon_connector(connector);
DRM_INFO("Connector %d:\n", i);
- DRM_INFO(" %s\n", drm_get_connector_name(connector));
+ DRM_INFO(" %s\n", connector->name);
if (radeon_connector->hpd.hpd != RADEON_HPD_NONE)
DRM_INFO(" %s\n", hpd_names[radeon_connector->hpd.hpd]);
if (radeon_connector->ddc_bus) {
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 4/7] drm: replace drm_get_connector_name() with direct name field use
2014-05-26 13:35 [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
` (2 preceding siblings ...)
2014-05-26 13:35 ` [PATCH 3/7] drm/radeon: " Jani Nikula
@ 2014-05-26 13:35 ` Jani Nikula
2014-05-26 13:35 ` [PATCH 5/7] drm/i915: replace drm_get_encoder_name() " Jani Nikula
` (4 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2014-05-26 13:35 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, intel-gfx, David Herrmann
Generated using semantic patch:
@@
expression E;
@@
- drm_get_connector_name(E)
+ E->name
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/drm_crtc.c | 4 ++--
drivers/gpu/drm/drm_crtc_helper.c | 6 +++---
drivers/gpu/drm/drm_edid.c | 6 +++---
drivers/gpu/drm/drm_edid_load.c | 2 +-
drivers/gpu/drm/drm_fb_helper.c | 6 +++---
drivers/gpu/drm/drm_probe_helper.c | 10 +++++-----
drivers/gpu/drm/drm_sysfs.c | 6 +++---
7 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 37a3e0791ddf..d24b2175ad5b 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1662,7 +1662,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
head) {
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
connector->base.id,
- drm_get_connector_name(connector));
+ connector->name);
if (put_user(connector->base.id,
connector_id + copied)) {
ret = -EFAULT;
@@ -2457,7 +2457,7 @@ int drm_mode_setcrtc(struct drm_device *dev, void *data,
connector = obj_to_connector(obj);
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n",
connector->base.id,
- drm_get_connector_name(connector));
+ connector->name);
connector_set[i] = connector;
}
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index a8b78e7bde50..d33c0cdcab64 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -600,11 +600,11 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
}
if (new_crtc) {
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [CRTC:%d]\n",
- connector->base.id, drm_get_connector_name(connector),
+ connector->base.id, connector->name,
new_crtc->base.id);
} else {
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] to [NOCRTC]\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
}
}
@@ -630,7 +630,7 @@ int drm_crtc_helper_set_config(struct drm_mode_set *set)
DRM_DEBUG_KMS("Setting connector DPMS state to on\n");
for (i = 0; i < set->num_connectors; i++) {
DRM_DEBUG_KMS("\t[CONNECTOR:%d:%s] set DPMS on\n", set->connectors[i]->base.id,
- drm_get_connector_name(set->connectors[i]));
+ set->connectors[i]->name);
set->connectors[i]->funcs->dpms(set->connectors[i], DRM_MODE_DPMS_ON);
}
}
diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c
index 7a4fd2ed1280..c94053223d64 100644
--- a/drivers/gpu/drm/drm_edid.c
+++ b/drivers/gpu/drm/drm_edid.c
@@ -1227,7 +1227,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
if (i == 4 && print_bad_edid) {
dev_warn(connector->dev->dev,
"%s: Ignoring invalid EDID block %d.\n",
- drm_get_connector_name(connector), j);
+ connector->name, j);
connector->bad_edid_counter++;
}
@@ -1247,7 +1247,7 @@ drm_do_get_edid(struct drm_connector *connector, struct i2c_adapter *adapter)
carp:
if (print_bad_edid) {
dev_warn(connector->dev->dev, "%s: EDID block %d invalid.\n",
- drm_get_connector_name(connector), j);
+ connector->name, j);
}
connector->bad_edid_counter++;
@@ -3518,7 +3518,7 @@ int drm_add_edid_modes(struct drm_connector *connector, struct edid *edid)
}
if (!drm_edid_is_valid(edid)) {
dev_warn(connector->dev->dev, "%s: EDID invalid.\n",
- drm_get_connector_name(connector));
+ connector->name);
return 0;
}
diff --git a/drivers/gpu/drm/drm_edid_load.c b/drivers/gpu/drm/drm_edid_load.c
index 1b4c7a5442c5..8d88d53e28a9 100644
--- a/drivers/gpu/drm/drm_edid_load.c
+++ b/drivers/gpu/drm/drm_edid_load.c
@@ -242,7 +242,7 @@ out:
int drm_load_edid_firmware(struct drm_connector *connector)
{
- const char *connector_name = drm_get_connector_name(connector);
+ const char *connector_name = connector->name;
char *edidname = edid_firmware, *last, *colon;
int ret;
struct edid *edid;
diff --git a/drivers/gpu/drm/drm_fb_helper.c b/drivers/gpu/drm/drm_fb_helper.c
index e95ed5805f07..1ddc17464250 100644
--- a/drivers/gpu/drm/drm_fb_helper.c
+++ b/drivers/gpu/drm/drm_fb_helper.c
@@ -120,7 +120,7 @@ static int drm_fb_helper_parse_command_line(struct drm_fb_helper *fb_helper)
mode = &fb_helper_conn->cmdline_mode;
/* do something on return - turn off connector maybe */
- if (fb_get_options(drm_get_connector_name(connector), &option))
+ if (fb_get_options(connector->name, &option))
continue;
if (drm_mode_parse_command_line_for_connector(option,
@@ -142,12 +142,12 @@ static int drm_fb_helper_parse_command_line(struct drm_fb_helper *fb_helper)
}
DRM_INFO("forcing %s connector %s\n",
- drm_get_connector_name(connector), s);
+ connector->name, s);
connector->force = mode->force;
}
DRM_DEBUG_KMS("cmdline mode for connector %s %dx%d@%dHz%s%s%s\n",
- drm_get_connector_name(connector),
+ connector->name,
mode->xres, mode->yres,
mode->refresh_specified ? mode->refresh : 60,
mode->rb ? " reduced blanking" : "",
diff --git a/drivers/gpu/drm/drm_probe_helper.c b/drivers/gpu/drm/drm_probe_helper.c
index 79f07f2c13d3..d22676b89cbb 100644
--- a/drivers/gpu/drm/drm_probe_helper.c
+++ b/drivers/gpu/drm/drm_probe_helper.c
@@ -96,7 +96,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect
WARN_ON(!mutex_is_locked(&dev->mode_config.mutex));
DRM_DEBUG_KMS("[CONNECTOR:%d:%s]\n", connector->base.id,
- drm_get_connector_name(connector));
+ connector->name);
/* set all modes to the unverified state */
list_for_each_entry(mode, &connector->modes, head)
mode->status = MODE_UNVERIFIED;
@@ -120,7 +120,7 @@ static int drm_helper_probe_single_connector_modes_merge_bits(struct drm_connect
if (connector->status == connector_status_disconnected) {
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] disconnected\n",
- connector->base.id, drm_get_connector_name(connector));
+ connector->base.id, connector->name);
drm_mode_connector_update_edid_property(connector, NULL);
verbose_prune = false;
goto prune;
@@ -168,7 +168,7 @@ prune:
drm_mode_sort(&connector->modes);
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] probed modes :\n", connector->base.id,
- drm_get_connector_name(connector));
+ connector->name);
list_for_each_entry(mode, &connector->modes, head) {
drm_mode_set_crtcinfo(mode, CRTC_INTERLACE_HALVE_V);
drm_mode_debug_printmodeline(mode);
@@ -286,7 +286,7 @@ static void output_poll_execute(struct work_struct *work)
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] "
"status updated from %s to %s\n",
connector->base.id,
- drm_get_connector_name(connector),
+ connector->name,
old, new);
changed = true;
@@ -431,7 +431,7 @@ bool drm_helper_hpd_irq_event(struct drm_device *dev)
connector->status = connector->funcs->detect(connector, false);
DRM_DEBUG_KMS("[CONNECTOR:%d:%s] status updated from %s to %s\n",
connector->base.id,
- drm_get_connector_name(connector),
+ connector->name,
drm_get_connector_status_name(old_status),
drm_get_connector_status_name(connector->status));
if (old_status != connector->status)
diff --git a/drivers/gpu/drm/drm_sysfs.c b/drivers/gpu/drm/drm_sysfs.c
index c22c3097c3e8..369b26278e76 100644
--- a/drivers/gpu/drm/drm_sysfs.c
+++ b/drivers/gpu/drm/drm_sysfs.c
@@ -380,9 +380,9 @@ int drm_sysfs_connector_add(struct drm_connector *connector)
connector->kdev = device_create(drm_class, dev->primary->kdev,
0, connector, "card%d-%s",
- dev->primary->index, drm_get_connector_name(connector));
+ dev->primary->index, connector->name);
DRM_DEBUG("adding \"%s\" to sysfs\n",
- drm_get_connector_name(connector));
+ connector->name);
if (IS_ERR(connector->kdev)) {
DRM_ERROR("failed to register connector device: %ld\n", PTR_ERR(connector->kdev));
@@ -460,7 +460,7 @@ void drm_sysfs_connector_remove(struct drm_connector *connector)
if (!connector->kdev)
return;
DRM_DEBUG("removing \"%s\" from sysfs\n",
- drm_get_connector_name(connector));
+ connector->name);
for (i = 0; i < ARRAY_SIZE(connector_attrs); i++)
device_remove_file(connector->kdev, &connector_attrs[i]);
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 5/7] drm/i915: replace drm_get_encoder_name() with direct name field use
2014-05-26 13:35 [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
` (3 preceding siblings ...)
2014-05-26 13:35 ` [PATCH 4/7] drm: " Jani Nikula
@ 2014-05-26 13:35 ` Jani Nikula
2014-05-26 13:35 ` [PATCH 6/7] drm: " Jani Nikula
` (3 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2014-05-26 13:35 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, intel-gfx, David Herrmann
Generated using semantic patch:
@@
expression E;
@@
- drm_get_encoder_name(E)
+ E->name
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/i915/i915_debugfs.c | 2 +-
drivers/gpu/drm/i915/intel_display.c | 14 +++++++-------
drivers/gpu/drm/i915/intel_dp.c | 2 +-
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/gpu/drm/i915/i915_debugfs.c b/drivers/gpu/drm/i915/i915_debugfs.c
index 8f49a2964ed5..36f4c15f538b 100644
--- a/drivers/gpu/drm/i915/i915_debugfs.c
+++ b/drivers/gpu/drm/i915/i915_debugfs.c
@@ -2197,7 +2197,7 @@ static void intel_encoder_info(struct seq_file *m,
encoder = &intel_encoder->base;
seq_printf(m, "\tencoder %d: type: %s, connectors:\n",
- encoder->base.id, drm_get_encoder_name(encoder));
+ encoder->base.id, encoder->name);
for_each_connector_on_encoder(dev, encoder, intel_connector) {
struct drm_connector *connector = &intel_connector->base;
seq_printf(m, "\t\tconnector %d: type: %s, status: %s",
diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
index 982f4da17ac1..c3cf6aab22c3 100644
--- a/drivers/gpu/drm/i915/intel_display.c
+++ b/drivers/gpu/drm/i915/intel_display.c
@@ -7855,7 +7855,7 @@ void intel_write_eld(struct drm_encoder *encoder,
connector->base.id,
connector->name,
connector->encoder->base.id,
- drm_get_encoder_name(connector->encoder));
+ connector->encoder->name);
connector->eld[6] = drm_av_sync_delay(connector, mode) / 2;
@@ -8316,7 +8316,7 @@ bool intel_get_load_detect_pipe(struct drm_connector *connector,
DRM_DEBUG_KMS("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
connector->base.id, connector->name,
- encoder->base.id, drm_get_encoder_name(encoder));
+ encoder->base.id, encoder->name);
/*
* Algorithm gets a little messy:
@@ -8428,7 +8428,7 @@ void intel_release_load_detect_pipe(struct drm_connector *connector,
DRM_DEBUG_KMS("[CONNECTOR:%d:%s], [ENCODER:%d:%s]\n",
connector->base.id, connector->name,
- encoder->base.id, drm_get_encoder_name(encoder));
+ encoder->base.id, encoder->name);
if (old->load_detect_temp) {
to_intel_connector(connector)->new_encoder = NULL;
@@ -10045,7 +10045,7 @@ check_encoder_state(struct drm_device *dev)
DRM_DEBUG_KMS("[ENCODER:%d:%s]\n",
encoder->base.base.id,
- drm_get_encoder_name(&encoder->base));
+ (&encoder->base)->name);
WARN(&encoder->new_crtc->base != encoder->base.crtc,
"encoder's stage crtc doesn't match current crtc\n");
@@ -11955,7 +11955,7 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
if (encoder->connectors_active && !has_active_crtc) {
DRM_DEBUG_KMS("[ENCODER:%d:%s] has active connectors but no active pipe!\n",
encoder->base.base.id,
- drm_get_encoder_name(&encoder->base));
+ (&encoder->base)->name);
/* Connector is active, but has no active pipe. This is
* fallout from our resume register restoring. Disable
@@ -11963,7 +11963,7 @@ static void intel_sanitize_encoder(struct intel_encoder *encoder)
if (encoder->base.crtc) {
DRM_DEBUG_KMS("[ENCODER:%d:%s] manually disabled\n",
encoder->base.base.id,
- drm_get_encoder_name(&encoder->base));
+ (&encoder->base)->name);
encoder->disable(encoder);
}
encoder->base.crtc = NULL;
@@ -12083,7 +12083,7 @@ static void intel_modeset_readout_hw_state(struct drm_device *dev)
encoder->connectors_active = false;
DRM_DEBUG_KMS("[ENCODER:%d:%s] hw state readout: %s, pipe %c\n",
encoder->base.base.id,
- drm_get_encoder_name(&encoder->base),
+ (&encoder->base)->name,
encoder->base.crtc ? "enabled" : "disabled",
pipe_name(pipe));
}
diff --git a/drivers/gpu/drm/i915/intel_dp.c b/drivers/gpu/drm/i915/intel_dp.c
index e94170843c28..8b19dc402b1d 100644
--- a/drivers/gpu/drm/i915/intel_dp.c
+++ b/drivers/gpu/drm/i915/intel_dp.c
@@ -3305,7 +3305,7 @@ intel_dp_check_link_status(struct intel_dp *intel_dp)
if (!drm_dp_channel_eq_ok(link_status, intel_dp->lane_count)) {
DRM_DEBUG_KMS("%s: channel EQ not ok, retraining\n",
- drm_get_encoder_name(&intel_encoder->base));
+ (&intel_encoder->base)->name);
intel_dp_start_link_train(intel_dp);
intel_dp_complete_link_train(intel_dp);
intel_dp_stop_link_train(intel_dp);
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 6/7] drm: replace drm_get_encoder_name() with direct name field use
2014-05-26 13:35 [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
` (4 preceding siblings ...)
2014-05-26 13:35 ` [PATCH 5/7] drm/i915: replace drm_get_encoder_name() " Jani Nikula
@ 2014-05-26 13:35 ` Jani Nikula
2014-05-26 13:35 ` [PATCH 7/7] drm: drop drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
` (2 subsequent siblings)
8 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2014-05-26 13:35 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, intel-gfx, David Herrmann
Generated using semantic patch:
@@
expression E;
@@
- drm_get_encoder_name(E)
+ E->name
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/drm_crtc.c | 2 +-
drivers/gpu/drm/drm_crtc_helper.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index d24b2175ad5b..d986b3fe82a4 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1630,7 +1630,7 @@ int drm_mode_getresources(struct drm_device *dev, void *data,
&dev->mode_config.encoder_list,
head) {
DRM_DEBUG_KMS("[ENCODER:%d:%s]\n", encoder->base.id,
- drm_get_encoder_name(encoder));
+ encoder->name);
if (put_user(encoder->base.id, encoder_id +
copied)) {
ret = -EFAULT;
diff --git a/drivers/gpu/drm/drm_crtc_helper.c b/drivers/gpu/drm/drm_crtc_helper.c
index d33c0cdcab64..22466917a2b4 100644
--- a/drivers/gpu/drm/drm_crtc_helper.c
+++ b/drivers/gpu/drm/drm_crtc_helper.c
@@ -330,7 +330,7 @@ bool drm_crtc_helper_set_mode(struct drm_crtc *crtc,
continue;
DRM_DEBUG_KMS("[ENCODER:%d:%s] set [MODE:%d:%s]\n",
- encoder->base.id, drm_get_encoder_name(encoder),
+ encoder->base.id, encoder->name,
mode->base.id, mode->name);
encoder_funcs = encoder->helper_private;
encoder_funcs->mode_set(encoder, mode, adjusted_mode);
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* [PATCH 7/7] drm: drop drm_get_connector_name() and drm_get_encoder_name()
2014-05-26 13:35 [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
` (5 preceding siblings ...)
2014-05-26 13:35 ` [PATCH 6/7] drm: " Jani Nikula
@ 2014-05-26 13:35 ` Jani Nikula
2014-05-26 13:52 ` [PATCH 0/7] drm & drivers: kill " Daniel Vetter
2014-05-26 15:00 ` David Herrmann
8 siblings, 0 replies; 15+ messages in thread
From: Jani Nikula @ 2014-05-26 13:35 UTC (permalink / raw)
To: dri-devel; +Cc: jani.nikula, intel-gfx, David Herrmann
No longer used or needed as the structs have a name field.
Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---
drivers/gpu/drm/drm_crtc.c | 20 --------------------
include/drm/drm_crtc.h | 2 --
2 files changed, 22 deletions(-)
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index d986b3fe82a4..d0fb1e4eed11 100644
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -256,26 +256,6 @@ void drm_connector_ida_destroy(void)
}
/**
- * drm_get_encoder_name - return a string for encoder
- * @encoder: the encoder to get name for
- */
-const char *drm_get_encoder_name(const struct drm_encoder *encoder)
-{
- return encoder->name;
-}
-EXPORT_SYMBOL(drm_get_encoder_name);
-
-/**
- * drm_get_connector_name - return a string for connector
- * @connector: the connector to get name for
- */
-const char *drm_get_connector_name(const struct drm_connector *connector)
-{
- return connector->name;
-}
-EXPORT_SYMBOL(drm_get_connector_name);
-
-/**
* drm_get_connector_status_name - return a string for connector status
* @status: connector status to compute name of
*
diff --git a/include/drm/drm_crtc.h b/include/drm/drm_crtc.h
index 5c1c31cc11cd..e8fe9d8e135c 100644
--- a/include/drm/drm_crtc.h
+++ b/include/drm/drm_crtc.h
@@ -909,7 +909,6 @@ extern int drm_crtc_check_viewport(const struct drm_crtc *crtc,
extern void drm_encoder_cleanup(struct drm_encoder *encoder);
-extern const char *drm_get_connector_name(const struct drm_connector *connector);
extern const char *drm_get_connector_status_name(enum drm_connector_status status);
extern const char *drm_get_subpixel_order_name(enum subpixel_order order);
extern const char *drm_get_dpms_name(int val);
@@ -972,7 +971,6 @@ extern int drm_mode_create_tv_properties(struct drm_device *dev, int num_formats
char *formats[]);
extern int drm_mode_create_scaling_mode_property(struct drm_device *dev);
extern int drm_mode_create_dirty_info_property(struct drm_device *dev);
-extern const char *drm_get_encoder_name(const struct drm_encoder *encoder);
extern int drm_mode_connector_attach_encoder(struct drm_connector *connector,
struct drm_encoder *encoder);
--
1.9.1
^ permalink raw reply related [flat|nested] 15+ messages in thread* Re: [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name()
2014-05-26 13:35 [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
` (6 preceding siblings ...)
2014-05-26 13:35 ` [PATCH 7/7] drm: drop drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
@ 2014-05-26 13:52 ` Daniel Vetter
2014-05-26 13:52 ` Daniel Vetter
2014-05-27 15:35 ` Alex Deucher
2014-05-26 15:00 ` David Herrmann
8 siblings, 2 replies; 15+ messages in thread
From: Daniel Vetter @ 2014-05-26 13:52 UTC (permalink / raw)
To: Jani Nikula, Ben Skeggs, alexander.deucher@amd.com,
Christian König
Cc: intel-gfx, dri-devel
On Mon, May 26, 2014 at 04:35:39PM +0300, Jani Nikula wrote:
> As requested by David [1],[2].
>
> These are on top of drm-intel-nightly which carries the required core
> patches adding ->name field to drm_connector and drm_encoder. The i915
> patches could go in right away, the last patch need to wait for radeon
> and nouveau patches to get merged, obviously.
For easier merging I'd might be best to throw them all into the
topic/core-stuff branch I have, since that's where your previous patch
also landed. I.e. I can't merge the i915 patches right away.
Ben, Alex/Christian, Dave: Ack for this plan (and the patches)?
-Daniel
>
> BR,
> Jani.
>
>
> [1] http://mid.gmane.org/CANq1E4SBLr32kimS=Cxe5=sjZJJ9AVt7yxp3LfiOuMKSNC-CCA@mail.gmail.com
> [2] http://mid.gmane.org/CANq1E4QifeSoQ4pMfi1K+fgeCWYkvuBGDpjwand_Grabn+9Jow@mail.gmail.com
>
> Jani Nikula (7):
> drm/i915: replace drm_get_connector_name() with direct name field use
> drm/nouveau: replace drm_get_connector_name() with direct name field
> use
> drm/radeon: replace drm_get_connector_name() with direct name field
> use
> drm: replace drm_get_connector_name() with direct name field use
> drm/i915: replace drm_get_encoder_name() with direct name field use
> drm: replace drm_get_encoder_name() with direct name field use
> drm: drop drm_get_connector_name() and drm_get_encoder_name()
>
> drivers/gpu/drm/drm_crtc.c | 26 +++----------------------
> drivers/gpu/drm/drm_crtc_helper.c | 8 ++++----
> drivers/gpu/drm/drm_edid.c | 6 +++---
> drivers/gpu/drm/drm_edid_load.c | 2 +-
> drivers/gpu/drm/drm_fb_helper.c | 6 +++---
> drivers/gpu/drm/drm_probe_helper.c | 10 +++++-----
> drivers/gpu/drm/drm_sysfs.c | 6 +++---
> drivers/gpu/drm/i915/i915_debugfs.c | 6 +++---
> drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
> drivers/gpu/drm/i915/intel_crt.c | 2 +-
> drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++---------------
> drivers/gpu/drm/i915/intel_dp.c | 4 ++--
> drivers/gpu/drm/i915/intel_dvo.c | 2 +-
> drivers/gpu/drm/i915/intel_fbdev.c | 14 +++++++-------
> drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
> drivers/gpu/drm/i915/intel_lvds.c | 2 +-
> drivers/gpu/drm/i915/intel_panel.c | 2 +-
> drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++----
> drivers/gpu/drm/i915/intel_tv.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +-
> drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 3 ++-
> drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +--
> drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
> drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
> drivers/gpu/drm/radeon/radeon_connectors.c | 19 +++++++++++-------
> drivers/gpu/drm/radeon/radeon_display.c | 2 +-
> include/drm/drm_crtc.h | 2 --
> 29 files changed, 87 insertions(+), 104 deletions(-)
>
> --
> 1.9.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 15+ messages in thread* Re: [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name()
2014-05-26 13:52 ` [PATCH 0/7] drm & drivers: kill " Daniel Vetter
@ 2014-05-26 13:52 ` Daniel Vetter
2014-05-26 14:10 ` Christian König
2014-05-27 15:35 ` Alex Deucher
1 sibling, 1 reply; 15+ messages in thread
From: Daniel Vetter @ 2014-05-26 13:52 UTC (permalink / raw)
To: Jani Nikula, Ben Skeggs, alexander.deucher@amd.com,
Christian König, Dave Airlie
Cc: intel-gfx, dri-devel
On Mon, May 26, 2014 at 3:52 PM, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Mon, May 26, 2014 at 04:35:39PM +0300, Jani Nikula wrote:
>> As requested by David [1],[2].
>>
>> These are on top of drm-intel-nightly which carries the required core
>> patches adding ->name field to drm_connector and drm_encoder. The i915
>> patches could go in right away, the last patch need to wait for radeon
>> and nouveau patches to get merged, obviously.
>
> For easier merging I'd might be best to throw them all into the
> topic/core-stuff branch I have, since that's where your previous patch
> also landed. I.e. I can't merge the i915 patches right away.
>
> Ben, Alex/Christian, Dave: Ack for this plan (and the patches)?
Blergh, forgotten to put Dave onto the recipient list.
-Daniel
> -Daniel
>
>>
>> BR,
>> Jani.
>>
>>
>> [1] http://mid.gmane.org/CANq1E4SBLr32kimS=Cxe5=sjZJJ9AVt7yxp3LfiOuMKSNC-CCA@mail.gmail.com
>> [2] http://mid.gmane.org/CANq1E4QifeSoQ4pMfi1K+fgeCWYkvuBGDpjwand_Grabn+9Jow@mail.gmail.com
>>
>> Jani Nikula (7):
>> drm/i915: replace drm_get_connector_name() with direct name field use
>> drm/nouveau: replace drm_get_connector_name() with direct name field
>> use
>> drm/radeon: replace drm_get_connector_name() with direct name field
>> use
>> drm: replace drm_get_connector_name() with direct name field use
>> drm/i915: replace drm_get_encoder_name() with direct name field use
>> drm: replace drm_get_encoder_name() with direct name field use
>> drm: drop drm_get_connector_name() and drm_get_encoder_name()
>>
>> drivers/gpu/drm/drm_crtc.c | 26 +++----------------------
>> drivers/gpu/drm/drm_crtc_helper.c | 8 ++++----
>> drivers/gpu/drm/drm_edid.c | 6 +++---
>> drivers/gpu/drm/drm_edid_load.c | 2 +-
>> drivers/gpu/drm/drm_fb_helper.c | 6 +++---
>> drivers/gpu/drm/drm_probe_helper.c | 10 +++++-----
>> drivers/gpu/drm/drm_sysfs.c | 6 +++---
>> drivers/gpu/drm/i915/i915_debugfs.c | 6 +++---
>> drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
>> drivers/gpu/drm/i915/intel_crt.c | 2 +-
>> drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++---------------
>> drivers/gpu/drm/i915/intel_dp.c | 4 ++--
>> drivers/gpu/drm/i915/intel_dvo.c | 2 +-
>> drivers/gpu/drm/i915/intel_fbdev.c | 14 +++++++-------
>> drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
>> drivers/gpu/drm/i915/intel_lvds.c | 2 +-
>> drivers/gpu/drm/i915/intel_panel.c | 2 +-
>> drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++----
>> drivers/gpu/drm/i915/intel_tv.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 3 ++-
>> drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +--
>> drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
>> drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
>> drivers/gpu/drm/radeon/radeon_connectors.c | 19 +++++++++++-------
>> drivers/gpu/drm/radeon/radeon_display.c | 2 +-
>> include/drm/drm_crtc.h | 2 --
>> 29 files changed, 87 insertions(+), 104 deletions(-)
>>
>> --
>> 1.9.1
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
--
Daniel Vetter
Software Engineer, Intel Corporation
+41 (0) 79 365 57 48 - http://blog.ffwll.ch
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name()
2014-05-26 13:52 ` Daniel Vetter
@ 2014-05-26 14:10 ` Christian König
0 siblings, 0 replies; 15+ messages in thread
From: Christian König @ 2014-05-26 14:10 UTC (permalink / raw)
To: Daniel Vetter, Jani Nikula, Ben Skeggs, alexander.deucher@amd.com,
Dave Airlie
Cc: intel-gfx, dri-devel
Am 26.05.2014 15:52, schrieb Daniel Vetter:
> On Mon, May 26, 2014 at 3:52 PM, Daniel Vetter <daniel@ffwll.ch> wrote:
>> On Mon, May 26, 2014 at 04:35:39PM +0300, Jani Nikula wrote:
>>> As requested by David [1],[2].
>>>
>>> These are on top of drm-intel-nightly which carries the required core
>>> patches adding ->name field to drm_connector and drm_encoder. The i915
>>> patches could go in right away, the last patch need to wait for radeon
>>> and nouveau patches to get merged, obviously.
>> For easier merging I'd might be best to throw them all into the
>> topic/core-stuff branch I have, since that's where your previous patch
>> also landed. I.e. I can't merge the i915 patches right away.
>>
>> Ben, Alex/Christian, Dave: Ack for this plan (and the patches)?
In general sounds like a good idea to me, no need for the wrappers when
they just retrieve a structure field.
Christian.
> Blergh, forgotten to put Dave onto the recipient list.
> -Daniel
>
>> -Daniel
>>
>>> BR,
>>> Jani.
>>>
>>>
>>> [1] http://mid.gmane.org/CANq1E4SBLr32kimS=Cxe5=sjZJJ9AVt7yxp3LfiOuMKSNC-CCA@mail.gmail.com
>>> [2] http://mid.gmane.org/CANq1E4QifeSoQ4pMfi1K+fgeCWYkvuBGDpjwand_Grabn+9Jow@mail.gmail.com
>>>
>>> Jani Nikula (7):
>>> drm/i915: replace drm_get_connector_name() with direct name field use
>>> drm/nouveau: replace drm_get_connector_name() with direct name field
>>> use
>>> drm/radeon: replace drm_get_connector_name() with direct name field
>>> use
>>> drm: replace drm_get_connector_name() with direct name field use
>>> drm/i915: replace drm_get_encoder_name() with direct name field use
>>> drm: replace drm_get_encoder_name() with direct name field use
>>> drm: drop drm_get_connector_name() and drm_get_encoder_name()
>>>
>>> drivers/gpu/drm/drm_crtc.c | 26 +++----------------------
>>> drivers/gpu/drm/drm_crtc_helper.c | 8 ++++----
>>> drivers/gpu/drm/drm_edid.c | 6 +++---
>>> drivers/gpu/drm/drm_edid_load.c | 2 +-
>>> drivers/gpu/drm/drm_fb_helper.c | 6 +++---
>>> drivers/gpu/drm/drm_probe_helper.c | 10 +++++-----
>>> drivers/gpu/drm/drm_sysfs.c | 6 +++---
>>> drivers/gpu/drm/i915/i915_debugfs.c | 6 +++---
>>> drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
>>> drivers/gpu/drm/i915/intel_crt.c | 2 +-
>>> drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++---------------
>>> drivers/gpu/drm/i915/intel_dp.c | 4 ++--
>>> drivers/gpu/drm/i915/intel_dvo.c | 2 +-
>>> drivers/gpu/drm/i915/intel_fbdev.c | 14 +++++++-------
>>> drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
>>> drivers/gpu/drm/i915/intel_lvds.c | 2 +-
>>> drivers/gpu/drm/i915/intel_panel.c | 2 +-
>>> drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++----
>>> drivers/gpu/drm/i915/intel_tv.c | 2 +-
>>> drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
>>> drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
>>> drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +-
>>> drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 3 ++-
>>> drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +--
>>> drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
>>> drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
>>> drivers/gpu/drm/radeon/radeon_connectors.c | 19 +++++++++++-------
>>> drivers/gpu/drm/radeon/radeon_display.c | 2 +-
>>> include/drm/drm_crtc.h | 2 --
>>> 29 files changed, 87 insertions(+), 104 deletions(-)
>>>
>>> --
>>> 1.9.1
>>>
>>> _______________________________________________
>>> dri-devel mailing list
>>> dri-devel@lists.freedesktop.org
>>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>> --
>> Daniel Vetter
>> Software Engineer, Intel Corporation
>> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
>
>
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name()
2014-05-26 13:52 ` [PATCH 0/7] drm & drivers: kill " Daniel Vetter
2014-05-26 13:52 ` Daniel Vetter
@ 2014-05-27 15:35 ` Alex Deucher
1 sibling, 0 replies; 15+ messages in thread
From: Alex Deucher @ 2014-05-27 15:35 UTC (permalink / raw)
To: Daniel Vetter
Cc: Jani Nikula, intel-gfx, dri-devel, Ben Skeggs,
alexander.deucher@amd.com
On Mon, May 26, 2014 at 9:52 AM, Daniel Vetter <daniel@ffwll.ch> wrote:
> On Mon, May 26, 2014 at 04:35:39PM +0300, Jani Nikula wrote:
>> As requested by David [1],[2].
>>
>> These are on top of drm-intel-nightly which carries the required core
>> patches adding ->name field to drm_connector and drm_encoder. The i915
>> patches could go in right away, the last patch need to wait for radeon
>> and nouveau patches to get merged, obviously.
>
> For easier merging I'd might be best to throw them all into the
> topic/core-stuff branch I have, since that's where your previous patch
> also landed. I.e. I can't merge the i915 patches right away.
>
> Ben, Alex/Christian, Dave: Ack for this plan (and the patches)?
Looks fine to me.
Acked-by: Alex Deucher <alexander.deucher@amd.com>
Alex
> -Daniel
>
>>
>> BR,
>> Jani.
>>
>>
>> [1] http://mid.gmane.org/CANq1E4SBLr32kimS=Cxe5=sjZJJ9AVt7yxp3LfiOuMKSNC-CCA@mail.gmail.com
>> [2] http://mid.gmane.org/CANq1E4QifeSoQ4pMfi1K+fgeCWYkvuBGDpjwand_Grabn+9Jow@mail.gmail.com
>>
>> Jani Nikula (7):
>> drm/i915: replace drm_get_connector_name() with direct name field use
>> drm/nouveau: replace drm_get_connector_name() with direct name field
>> use
>> drm/radeon: replace drm_get_connector_name() with direct name field
>> use
>> drm: replace drm_get_connector_name() with direct name field use
>> drm/i915: replace drm_get_encoder_name() with direct name field use
>> drm: replace drm_get_encoder_name() with direct name field use
>> drm: drop drm_get_connector_name() and drm_get_encoder_name()
>>
>> drivers/gpu/drm/drm_crtc.c | 26 +++----------------------
>> drivers/gpu/drm/drm_crtc_helper.c | 8 ++++----
>> drivers/gpu/drm/drm_edid.c | 6 +++---
>> drivers/gpu/drm/drm_edid_load.c | 2 +-
>> drivers/gpu/drm/drm_fb_helper.c | 6 +++---
>> drivers/gpu/drm/drm_probe_helper.c | 10 +++++-----
>> drivers/gpu/drm/drm_sysfs.c | 6 +++---
>> drivers/gpu/drm/i915/i915_debugfs.c | 6 +++---
>> drivers/gpu/drm/i915/i915_irq.c | 8 ++++----
>> drivers/gpu/drm/i915/intel_crt.c | 2 +-
>> drivers/gpu/drm/i915/intel_display.c | 30 ++++++++++++++---------------
>> drivers/gpu/drm/i915/intel_dp.c | 4 ++--
>> drivers/gpu/drm/i915/intel_dvo.c | 2 +-
>> drivers/gpu/drm/i915/intel_fbdev.c | 14 +++++++-------
>> drivers/gpu/drm/i915/intel_hdmi.c | 2 +-
>> drivers/gpu/drm/i915/intel_lvds.c | 2 +-
>> drivers/gpu/drm/i915/intel_panel.c | 2 +-
>> drivers/gpu/drm/i915/intel_sdvo.c | 8 ++++----
>> drivers/gpu/drm/i915/intel_tv.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +-
>> drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 3 ++-
>> drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 3 +--
>> drivers/gpu/drm/nouveau/nouveau_connector.c | 8 ++++----
>> drivers/gpu/drm/nouveau/nv50_display.c | 2 +-
>> drivers/gpu/drm/radeon/radeon_connectors.c | 19 +++++++++++-------
>> drivers/gpu/drm/radeon/radeon_display.c | 2 +-
>> include/drm/drm_crtc.h | 2 --
>> 29 files changed, 87 insertions(+), 104 deletions(-)
>>
>> --
>> 1.9.1
>>
>> _______________________________________________
>> dri-devel mailing list
>> dri-devel@lists.freedesktop.org
>> http://lists.freedesktop.org/mailman/listinfo/dri-devel
>
> --
> Daniel Vetter
> Software Engineer, Intel Corporation
> +41 (0) 79 365 57 48 - http://blog.ffwll.ch
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name()
2014-05-26 13:35 [PATCH 0/7] drm & drivers: kill drm_get_connector_name() and drm_get_encoder_name() Jani Nikula
` (7 preceding siblings ...)
2014-05-26 13:52 ` [PATCH 0/7] drm & drivers: kill " Daniel Vetter
@ 2014-05-26 15:00 ` David Herrmann
8 siblings, 0 replies; 15+ messages in thread
From: David Herrmann @ 2014-05-26 15:00 UTC (permalink / raw)
To: Jani Nikula
Cc: Daniel Vetter, Intel Graphics Development,
dri-devel@lists.freedesktop.org
Hi
On Mon, May 26, 2014 at 3:35 PM, Jani Nikula <jani.nikula@intel.com> wrote:
> As requested by David [1],[2].
>
> These are on top of drm-intel-nightly which carries the required core
> patches adding ->name field to drm_connector and drm_encoder. The i915
> patches could go in right away, the last patch need to wait for radeon
> and nouveau patches to get merged, obviously.
I tried reviewing these, but it doesn't apply on drm-intel-next.
Trusting in coccinelle, this is:
Acked-by: David Herrmann <dh.herrmann@gmail.com>
Thanks
David
^ permalink raw reply [flat|nested] 15+ messages in thread