summaryrefslogtreecommitdiff
path: root/drivers/gpu/drm/omapdrm/omap_encoder.c
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2018-09-04 23:53:34 +0300
committerTomi Valkeinen <tomi.valkeinen@ti.com>2019-03-18 12:42:11 +0300
commitb49a2139ba67da43915a483a2a7e8490ba6c2b57 (patch)
treeb73ef84772f0226b70fc1cca50cda3963b0c272a /drivers/gpu/drm/omapdrm/omap_encoder.c
parentf8a8eabb273b6810d0eb7546896e5da7974189a5 (diff)
downloadlinux-b49a2139ba67da43915a483a2a7e8490ba6c2b57.tar.xz
drm/omap: Remove connection checks from display .enable() and .remove()
The displays (connectors, panels and encoders) return an error from their .enable() handler when the dss device is not connected. They also disconnect the dss device explicitly from their .remove() handler if it is still connected. Those safety checks are not needed: - The .enable() handler is called from code paths that access the dss devices chain from the display device, which is set to NULL when the device isn't connected. - The .remove() handler can only be called when unloading the module as the driver has the suppress_bind_attrs attribute set, and a reference to the module is taken when constructing the dss devices chain, so the module can only be unloaded when the dss device is disconnected. Remove the safety checks. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Sebastian Reichel <sebastian.reichel@collabora.com> Tested-by: Sebastian Reichel <sebastian.reichel@collabora.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/omapdrm/omap_encoder.c')
-rw-r--r--drivers/gpu/drm/omapdrm/omap_encoder.c17
1 files changed, 5 insertions, 12 deletions
diff --git a/drivers/gpu/drm/omapdrm/omap_encoder.c b/drivers/gpu/drm/omapdrm/omap_encoder.c
index 5427c0b3ff9e..3c3d88e1df38 100644
--- a/drivers/gpu/drm/omapdrm/omap_encoder.c
+++ b/drivers/gpu/drm/omapdrm/omap_encoder.c
@@ -168,24 +168,17 @@ static void omap_encoder_enable(struct drm_encoder *encoder)
dev_dbg(dev->dev, "enable(%s)\n", dssdev->name);
- if (!omapdss_device_is_connected(dssdev)) {
- r = -ENODEV;
- goto error;
- }
-
if (omapdss_device_is_enabled(dssdev))
return;
r = dssdev->ops->enable(dssdev);
- if (r)
- goto error;
+ if (r) {
+ dev_err(dev->dev, "Failed to enable display '%s': %d\n",
+ dssdev->name, r);
+ return;
+ }
dssdev->state = OMAP_DSS_DISPLAY_ACTIVE;
- return;
-
-error:
- dev_err(dev->dev, "Failed to enable display '%s': %d\n",
- dssdev->name, r);
}
static int omap_encoder_atomic_check(struct drm_encoder *encoder,