diff options
| author | Dave Airlie <airlied@redhat.com> | 2021-07-30 04:28:11 +0300 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2021-07-30 04:28:22 +0300 |
| commit | 988dbd25b8ae14de70d2be384f5872d6e22e3434 (patch) | |
| tree | e79e6a7eafd4f9015cc5d9182c3406926f98f94a /drivers/gpu/drm/hisilicon | |
| parent | 15d27b15de965043d6f8e23bc7f34386fcd1a772 (diff) | |
| parent | 6571a76af380290dd9a003a3bc90d4779ec4f8f8 (diff) | |
| download | linux-988dbd25b8ae14de70d2be384f5872d6e22e3434.tar.xz | |
Merge tag 'du-next-20210728' of git://linuxtv.org/pinchartl/media into drm-next
- R-Car DU shutdown fixes
- R-Car DU conversion to bridge connector helper
- Misc small fixes
Signed-off-by: Dave Airlie <airlied@redhat.com>
From: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Link: https://patchwork.freedesktop.org/patch/msgid/YQGHjOSOw2G4+A3x@pendragon.ideasonboard.com
Diffstat (limited to 'drivers/gpu/drm/hisilicon')
| -rw-r--r-- | drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c index 9b565a057340..952cfdb1961d 100644 --- a/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c +++ b/drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c @@ -769,16 +769,9 @@ static int dsi_bridge_init(struct drm_device *dev, struct dw_dsi *dsi) { struct drm_encoder *encoder = &dsi->encoder; struct drm_bridge *bridge = dsi->bridge; - int ret; /* associate the bridge to dsi encoder */ - ret = drm_bridge_attach(encoder, bridge, NULL, 0); - if (ret) { - DRM_ERROR("failed to attach external bridge\n"); - return ret; - } - - return 0; + return drm_bridge_attach(encoder, bridge, NULL, 0); } static int dsi_bind(struct device *dev, struct device *master, void *data) |