Skip to content

Commit 421ae44

Browse files
committed
drm/i915/panel: add panel register/unregister
Add panel register/unregister functions, and handle backlight register/unregister from there. This is in preparation for adding more panel specific register/unregister functionality. Cc: Lee Shawn C <[email protected]> Tested-by: Lee Shawn C <[email protected]> Reviewed-by: Arun R Murthy <[email protected]> Reviewed-by: Maxime Ripard <[email protected]> Link: https://lore.kernel.org/r/b737d4bc8b91df630cd4db4648f3a3571989cfd8.1749199013.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <[email protected]>
1 parent 946540a commit 421ae44

File tree

3 files changed

+23
-12
lines changed

3 files changed

+23
-12
lines changed

drivers/gpu/drm/i915/display/intel_connector.c

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@
3232

3333
#include "i915_drv.h"
3434
#include "i915_utils.h"
35-
#include "intel_backlight.h"
3635
#include "intel_connector.h"
3736
#include "intel_display_core.h"
3837
#include "intel_display_debugfs.h"
@@ -153,36 +152,36 @@ void intel_connector_destroy(struct drm_connector *connector)
153152
kfree(connector);
154153
}
155154

156-
int intel_connector_register(struct drm_connector *connector)
155+
int intel_connector_register(struct drm_connector *_connector)
157156
{
158-
struct intel_connector *intel_connector = to_intel_connector(connector);
159-
struct drm_i915_private *i915 = to_i915(connector->dev);
157+
struct intel_connector *connector = to_intel_connector(_connector);
158+
struct drm_i915_private *i915 = to_i915(_connector->dev);
160159
int ret;
161160

162-
ret = intel_backlight_device_register(intel_connector);
161+
ret = intel_panel_register(connector);
163162
if (ret)
164163
goto err;
165164

166165
if (i915_inject_probe_failure(i915)) {
167166
ret = -EFAULT;
168-
goto err_backlight;
167+
goto err_panel;
169168
}
170169

171-
intel_connector_debugfs_add(intel_connector);
170+
intel_connector_debugfs_add(connector);
172171

173172
return 0;
174173

175-
err_backlight:
176-
intel_backlight_device_unregister(intel_connector);
174+
err_panel:
175+
intel_panel_unregister(connector);
177176
err:
178177
return ret;
179178
}
180179

181-
void intel_connector_unregister(struct drm_connector *connector)
180+
void intel_connector_unregister(struct drm_connector *_connector)
182181
{
183-
struct intel_connector *intel_connector = to_intel_connector(connector);
182+
struct intel_connector *connector = to_intel_connector(_connector);
184183

185-
intel_backlight_device_unregister(intel_connector);
184+
intel_panel_unregister(connector);
186185
}
187186

188187
void intel_connector_attach_encoder(struct intel_connector *connector,

drivers/gpu/drm/i915/display/intel_panel.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -462,3 +462,13 @@ void intel_panel_fini(struct intel_connector *connector)
462462
drm_mode_destroy(connector->base.dev, fixed_mode);
463463
}
464464
}
465+
466+
int intel_panel_register(struct intel_connector *connector)
467+
{
468+
return intel_backlight_device_register(connector);
469+
}
470+
471+
void intel_panel_unregister(struct intel_connector *connector)
472+
{
473+
intel_backlight_device_unregister(connector);
474+
}

drivers/gpu/drm/i915/display/intel_panel.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@ void intel_panel_init_alloc(struct intel_connector *connector);
2323
int intel_panel_init(struct intel_connector *connector,
2424
const struct drm_edid *fixed_edid);
2525
void intel_panel_fini(struct intel_connector *connector);
26+
int intel_panel_register(struct intel_connector *connector);
27+
void intel_panel_unregister(struct intel_connector *connector);
2628
enum drm_connector_status
2729
intel_panel_detect(struct drm_connector *connector, bool force);
2830
bool intel_panel_use_ssc(struct intel_display *display);

0 commit comments

Comments
 (0)