disp: msm: update parameters for drm_bridge_attach
Commit a25b988ff83f ("drm/bridge: Extend bridge API to disable connector creation") and commit ee68c743f8d0 ("drm: Stop including drm_bridge.h from drm_crtc.h) add additional input flags. This change adds fixes to the drm bridge attach API and includes relevant drm_bridge header files. Change-Id: I85e84eaff7df2995243896108a217fae81716b63 Signed-off-by: Samantha Tran <samtran@codeaurora.org> Signed-off-by: Nilaan Gunabalachandran <ngunabal@codeaurora.org>
Этот коммит содержится в:

коммит произвёл
orion brody

родитель
e68e102598
Коммит
0c08cb1fb5
@@ -6419,7 +6419,7 @@ int dsi_display_drm_ext_bridge_init(struct dsi_display *display,
|
||||
ext_bridge->funcs = &ext_bridge_info->bridge_funcs;
|
||||
}
|
||||
|
||||
rc = drm_bridge_attach(encoder, ext_bridge, prev_bridge);
|
||||
rc = drm_bridge_attach(encoder, ext_bridge, prev_bridge, 0);
|
||||
if (rc) {
|
||||
DSI_ERR("[%s] ext brige attach failed, %d\n",
|
||||
display->name, rc);
|
||||
|
@@ -13,6 +13,7 @@
|
||||
#include <linux/firmware.h>
|
||||
#include <drm/drmP.h>
|
||||
#include <drm/drm_crtc.h>
|
||||
#include <drm/drm_bridge.h>
|
||||
|
||||
#include "msm_drv.h"
|
||||
#include "dsi_defs.h"
|
||||
|
@@ -149,7 +149,8 @@ void dsi_convert_to_drm_mode(const struct dsi_display_mode *dsi_mode,
|
||||
video_mode ? "vid" : "cmd");
|
||||
}
|
||||
|
||||
static int dsi_bridge_attach(struct drm_bridge *bridge)
|
||||
static int dsi_bridge_attach(struct drm_bridge *bridge,
|
||||
enum drm_bridge_attach_flags flags)
|
||||
{
|
||||
struct dsi_bridge *c_bridge = to_dsi_bridge(bridge);
|
||||
|
||||
@@ -1123,7 +1124,7 @@ struct dsi_bridge *dsi_drm_bridge_init(struct dsi_display *display,
|
||||
bridge->base.funcs = &dsi_bridge_ops;
|
||||
bridge->base.encoder = encoder;
|
||||
|
||||
rc = drm_bridge_attach(encoder, &bridge->base, NULL);
|
||||
rc = drm_bridge_attach(encoder, &bridge->base, NULL, 0);
|
||||
if (rc) {
|
||||
DSI_ERR("failed to attach bridge, rc=%d\n", rc);
|
||||
goto error_free_bridge;
|
||||
|
Ссылка в новой задаче
Block a user