|
@@ -110,7 +110,7 @@ static unsigned char analogix_dp_calc_edid_check_sum(unsigned char *edid_data)
|
|
|
|
|
|
static int analogix_dp_read_edid(struct analogix_dp_device *dp)
|
|
static int analogix_dp_read_edid(struct analogix_dp_device *dp)
|
|
{
|
|
{
|
|
- unsigned char edid[EDID_BLOCK_LENGTH * 2];
|
|
|
|
|
|
+ unsigned char *edid = dp->edid;
|
|
unsigned int extend_block = 0;
|
|
unsigned int extend_block = 0;
|
|
unsigned char sum;
|
|
unsigned char sum;
|
|
unsigned char test_vector;
|
|
unsigned char test_vector;
|
|
@@ -904,12 +904,6 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)
|
|
DRM_ERROR("failed to disable the panel\n");
|
|
DRM_ERROR("failed to disable the panel\n");
|
|
}
|
|
}
|
|
|
|
|
|
- ret = analogix_dp_handle_edid(dp);
|
|
|
|
- if (ret) {
|
|
|
|
- dev_err(dp->dev, "unable to handle edid\n");
|
|
|
|
- return;
|
|
|
|
- }
|
|
|
|
-
|
|
|
|
ret = analogix_dp_set_link_train(dp, dp->video_info.max_lane_count,
|
|
ret = analogix_dp_set_link_train(dp, dp->video_info.max_lane_count,
|
|
dp->video_info.max_link_rate);
|
|
dp->video_info.max_link_rate);
|
|
if (ret) {
|
|
if (ret) {
|
|
@@ -939,8 +933,14 @@ static void analogix_dp_commit(struct analogix_dp_device *dp)
|
|
int analogix_dp_get_modes(struct drm_connector *connector)
|
|
int analogix_dp_get_modes(struct drm_connector *connector)
|
|
{
|
|
{
|
|
struct analogix_dp_device *dp = to_dp(connector);
|
|
struct analogix_dp_device *dp = to_dp(connector);
|
|
|
|
+ struct edid *edid = (struct edid *)dp->edid;
|
|
int num_modes = 0;
|
|
int num_modes = 0;
|
|
|
|
|
|
|
|
+ if (analogix_dp_handle_edid(dp) == 0) {
|
|
|
|
+ drm_mode_connector_update_edid_property(&dp->connector, edid);
|
|
|
|
+ num_modes += drm_add_edid_modes(&dp->connector, edid);
|
|
|
|
+ }
|
|
|
|
+
|
|
if (dp->plat_data->panel)
|
|
if (dp->plat_data->panel)
|
|
num_modes += drm_panel_get_modes(dp->plat_data->panel);
|
|
num_modes += drm_panel_get_modes(dp->plat_data->panel);
|
|
|
|
|
|
@@ -978,6 +978,7 @@ static void analogix_dp_connector_destroy(struct drm_connector *connector)
|
|
{
|
|
{
|
|
drm_connector_unregister(connector);
|
|
drm_connector_unregister(connector);
|
|
drm_connector_cleanup(connector);
|
|
drm_connector_cleanup(connector);
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
static const struct drm_connector_funcs analogix_dp_connector_funcs = {
|
|
static const struct drm_connector_funcs analogix_dp_connector_funcs = {
|
|
@@ -1348,6 +1349,8 @@ int analogix_dp_bind(struct device *dev, struct drm_device *drm_dev,
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ analogix_dp_init_dp(dp);
|
|
|
|
+
|
|
ret = devm_request_irq(&pdev->dev, dp->irq, analogix_dp_irq_handler,
|
|
ret = devm_request_irq(&pdev->dev, dp->irq, analogix_dp_irq_handler,
|
|
irq_flags, "analogix-dp", dp);
|
|
irq_flags, "analogix-dp", dp);
|
|
if (ret) {
|
|
if (ret) {
|