samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

disp: msm: update parameters for drm_bridge_attach

Browse Source 
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>
This commit is contained in:
Samantha Tran
2020-09-17 13:05:48 -07:00
committed by orion brody
parent e68e102598
commit 0c08cb1fb5
9 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
msm/dp/dp_drm.c
View File

@@ -59,7 +59,8 @@ void convert_to_drm_mode(const struct dp_display_mode *dp_mode,
drm_mode_set_name(drm_mode); drm_mode_set_name(drm_mode);
} }
static int dp_bridge_attach(struct drm_bridge *dp_bridge) static int dp_bridge_attach(struct drm_bridge *dp_bridge,
enum drm_bridge_attach_flags flags)
{ {
struct dp_bridge *bridge = to_dp_bridge(dp_bridge); struct dp_bridge *bridge = to_dp_bridge(dp_bridge);
@@ -616,7 +617,7 @@ int dp_drm_bridge_init(void *data, struct drm_encoder *encoder,
priv = dev->dev_private; priv = dev->dev_private;
rc = drm_bridge_attach(encoder, &bridge->base, NULL); rc = drm_bridge_attach(encoder, &bridge->base, NULL, 0);
if (rc) { if (rc) {
DP_ERR("failed to attach bridge, rc=%d\n", rc); DP_ERR("failed to attach bridge, rc=%d\n", rc);
goto error_free_bridge; goto error_free_bridge;

1
msm/dp/dp_drm.h
View File

@@ -9,6 +9,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_bridge.h>
#include "msm_drv.h" #include "msm_drv.h"
#include "dp_display.h" #include "dp_display.h"

5
msm/dp/dp_mst_drm.c
View File

@@ -734,7 +734,8 @@ static const struct dp_drm_mst_fw_helper_ops drm_dp_sim_mst_fw_helper_ops = {
/* DP MST Bridge OPs */ /* DP MST Bridge OPs */
static int dp_mst_bridge_attach(struct drm_bridge *dp_bridge) static int dp_mst_bridge_attach(struct drm_bridge *dp_bridge,
enum drm_bridge_attach_flags flags)
{ {
struct dp_mst_bridge *bridge; struct dp_mst_bridge *bridge;
@@ -1294,7 +1295,7 @@ int dp_mst_drm_bridge_init(void *data, struct drm_encoder *encoder)
priv = dev->dev_private; priv = dev->dev_private;
rc = drm_bridge_attach(encoder, &bridge->base, NULL); rc = drm_bridge_attach(encoder, &bridge->base, NULL, 0);
if (rc) { if (rc) {
DP_ERR("failed to attach bridge, rc=%d\n", rc); DP_ERR("failed to attach bridge, rc=%d\n", rc);
goto end; goto end;

1
msm/dp/dp_mst_drm.h
View File

@@ -9,6 +9,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_bridge.h>
#include "dp_display.h" #include "dp_display.h"

2
msm/dsi/dsi_display.c
View File

@@ -6419,7 +6419,7 @@ int dsi_display_drm_ext_bridge_init(struct dsi_display *display,
ext_bridge->funcs = &ext_bridge_info->bridge_funcs; 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) { if (rc) {
DSI_ERR("[%s] ext brige attach failed, %d\n", DSI_ERR("[%s] ext brige attach failed, %d\n",
display->name, rc); display->name, rc);

1
msm/dsi/dsi_display.h
View File

@@ -13,6 +13,7 @@
#include <linux/firmware.h> #include <linux/firmware.h>
#include <drm/drmP.h> #include <drm/drmP.h>
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_bridge.h>
#include "msm_drv.h" #include "msm_drv.h"
#include "dsi_defs.h" #include "dsi_defs.h"

5
msm/dsi/dsi_drm.c
View File

@@ -149,7 +149,8 @@ void dsi_convert_to_drm_mode(const struct dsi_display_mode *dsi_mode,
video_mode ? "vid" : "cmd"); 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); 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.funcs = &dsi_bridge_ops;
bridge->base.encoder = encoder; bridge->base.encoder = encoder;
rc = drm_bridge_attach(encoder, &bridge->base, NULL); rc = drm_bridge_attach(encoder, &bridge->base, NULL, 0);
if (rc) { if (rc) {
DSI_ERR("failed to attach bridge, rc=%d\n", rc); DSI_ERR("failed to attach bridge, rc=%d\n", rc);
goto error_free_bridge; goto error_free_bridge;

1
msm/msm_drv.h
View File

@@ -47,6 +47,7 @@
#include <drm/sde_drm.h> #include <drm/sde_drm.h>
#include <drm/drm_gem.h> #include <drm/drm_gem.h>
#include <drm/drm_dsc.h> #include <drm/drm_dsc.h>
#include <drm/drm_bridge.h>
#include "sde_power_handle.h" #include "sde_power_handle.h"

1
msm/sde/sde_encoder.h
View File

@@ -20,6 +20,7 @@
#define __SDE_ENCODER_H__ #define __SDE_ENCODER_H__
#include <drm/drm_crtc.h> #include <drm/drm_crtc.h>
#include <drm/drm_bridge.h>
#include <linux/sde_rsc.h> #include <linux/sde_rsc.h>
#include "msm_prop.h" #include "msm_prop.h"