Skip to content

drm/bridge: cdns-mhdp: Update bus_flags based on compatible string #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
yamonkarcdns wants to merge 1 commit into
base: ti-4.19.y
Choose a base branch
from
Open

drm/bridge: cdns-mhdp: Update bus_flags based on compatible string #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 17 additions & 18 deletions drivers/gpu/drm/bridge/cdns-mhdp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,22 +549,19 @@ int cdns_mhdp_adjust_lt(struct cdns_mhdp_device *mhdp,
return ret;
}

static unsigned int max_link_rate(struct cdns_mhdp_host host,
struct cdns_mhdp_sink sink)
static unsigned int mhdp_max_link_rate(struct cdns_mhdp_device *mhdp)
{
return min(host.link_rate, sink.link_rate);
return min(mhdp->host.link_rate, mhdp->sink.link_rate);
}

static u8 mhdp_max_num_lanes(struct cdns_mhdp_host host,
struct cdns_mhdp_sink sink)
static u8 mhdp_max_num_lanes(struct cdns_mhdp_device *mhdp)
{
return min_t(u8, sink.lanes_cnt, host.lanes_cnt);
return min_t(u8, mhdp->sink.lanes_cnt, mhdp->host.lanes_cnt);
}

static u8 eq_training_pattern_supported(struct cdns_mhdp_host host,
struct cdns_mhdp_sink sink)
static u8 mhdp_eq_training_pattern_supported(struct cdns_mhdp_device *mhdp)
{
return fls(host.pattern_supp & sink.pattern_supp);
return fls(mhdp->host.pattern_supp & mhdp->sink.pattern_supp);
}

static bool mhdp_get_ssc_supported(struct cdns_mhdp_device *mhdp)
Expand Down Expand Up @@ -975,14 +972,16 @@ static int cdns_mhdp_attach(struct drm_bridge *bridge)
if (ret)
return ret;

conn->display_info.bus_flags = DRM_BUS_FLAG_DE_HIGH;
conn->display_info.bus_flags = mhdp->conn_bus_flags_defaults;
/*
* HACK: DP is internal to J7 SoC and we need to use DRIVE_POSEDGE
* in the display controller. This is achieved for the time being
* by defining SAMPLE_NEGEDGE here.
*/
conn->display_info.bus_flags |= DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE |
DRM_BUS_FLAG_SYNC_SAMPLE_NEGEDGE;
if (!(strcmp(mhdp_ids->compatible, "ti,j721e-mhdp8546")))
conn->display_info.bus_flags |=
DRM_BUS_FLAG_PIXDATA_SAMPLE_NEGEDGE |
DRM_BUS_FLAG_SYNC_SAMPLE_NEGEDGE;

ret = drm_connector_attach_encoder(conn, bridge->encoder);
if (ret) {
Expand Down Expand Up @@ -1370,7 +1369,7 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
unsigned int training_interval)
{
u32 reg32;
const u8 eq_tps = eq_training_pattern_supported(mhdp->host, mhdp->sink);
const u8 eq_tps = mhdp_eq_training_pattern_supported(mhdp);

while (1) {
if (!mhdp_link_training_cr(mhdp)) {
Expand All @@ -1385,8 +1384,7 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
dev_dbg(mhdp->dev,
"Reducing lanes number during CR phase\n");
mhdp->link.num_lanes >>= 1;
mhdp->link.rate = max_link_rate(mhdp->host,
mhdp->sink);
mhdp->link.rate = mhdp_max_link_rate(mhdp);

continue;
}
Expand All @@ -1411,7 +1409,7 @@ static int mhdp_link_training(struct cdns_mhdp_device *mhdp,
dev_dbg(mhdp->dev,
"Reducing link rate during EQ phase\n");
lower_link_rate(&mhdp->link);
mhdp->link.num_lanes = mhdp_max_num_lanes(mhdp->host, mhdp->sink);
mhdp->link.num_lanes = mhdp_max_num_lanes(mhdp);

continue;
}
Expand Down Expand Up @@ -1544,8 +1542,8 @@ static int cdns_mhdp_link_up(struct cdns_mhdp_device *mhdp)

mhdp_fill_sink_caps(mhdp, reg0);

mhdp->link.rate = max_link_rate(mhdp->host, mhdp->sink);
mhdp->link.num_lanes = mhdp_max_num_lanes(mhdp->host, mhdp->sink);
mhdp->link.rate = mhdp_max_link_rate(mhdp);
mhdp->link.num_lanes = mhdp_max_num_lanes(mhdp);

/* Disable framer for link training */
cdns_mhdp_reg_read(mhdp, CDNS_DP_FRAMER_GLOBAL_CONFIG, &resp);
Expand Down Expand Up @@ -1913,6 +1911,7 @@ static int mhdp_probe(struct platform_device *pdev)

mhdp->clk = clk;
mhdp->dev = &pdev->dev;
mhdp->conn_bus_flags_defaults = DRM_BUS_FLAG_DE_HIGH;
mutex_init(&mhdp->mbox_mutex);
spin_lock_init(&mhdp->start_lock);
dev_set_drvdata(&pdev->dev, mhdp);
Expand Down
1 change: 1 addition & 0 deletions drivers/gpu/drm/bridge/cdns-mhdp.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,7 @@ struct cdns_mhdp_device {
spinlock_t start_lock;
u8 bridge_attached : 1;
enum mhdp_hw_state hw_state;
enum drm_bus_flags conn_bus_flags_defaults;
};


Expand Down