File tree Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Expand file tree Collapse file tree 3 files changed +11
-4
lines changed Original file line number Diff line number Diff line change @@ -285,7 +285,6 @@ struct platform_driver dp_driver = {
285
285
.remove_new = exynos_dp_remove ,
286
286
.driver = {
287
287
.name = "exynos-dp" ,
288
- .owner = THIS_MODULE ,
289
288
.pm = pm_ptr (& exynos_dp_pm_ops ),
290
289
.of_match_table = exynos_dp_match ,
291
290
},
Original file line number Diff line number Diff line change @@ -309,6 +309,7 @@ static int vidi_get_modes(struct drm_connector *connector)
309
309
struct vidi_context * ctx = ctx_from_connector (connector );
310
310
struct edid * edid ;
311
311
int edid_len ;
312
+ int count ;
312
313
313
314
/*
314
315
* the edid data comes from user side and it would be set
@@ -328,7 +329,11 @@ static int vidi_get_modes(struct drm_connector *connector)
328
329
329
330
drm_connector_update_edid_property (connector , edid );
330
331
331
- return drm_add_edid_modes (connector , edid );
332
+ count = drm_add_edid_modes (connector , edid );
333
+
334
+ kfree (edid );
335
+
336
+ return count ;
332
337
}
333
338
334
339
static const struct drm_connector_helper_funcs vidi_connector_helper_funcs = {
Original file line number Diff line number Diff line change @@ -887,11 +887,11 @@ static int hdmi_get_modes(struct drm_connector *connector)
887
887
int ret ;
888
888
889
889
if (!hdata -> ddc_adpt )
890
- return 0 ;
890
+ goto no_edid ;
891
891
892
892
edid = drm_get_edid (connector , hdata -> ddc_adpt );
893
893
if (!edid )
894
- return 0 ;
894
+ goto no_edid ;
895
895
896
896
hdata -> dvi_mode = !connector -> display_info .is_hdmi ;
897
897
DRM_DEV_DEBUG_KMS (hdata -> dev , "%s : width[%d] x height[%d]\n" ,
@@ -906,6 +906,9 @@ static int hdmi_get_modes(struct drm_connector *connector)
906
906
kfree (edid );
907
907
908
908
return ret ;
909
+
910
+ no_edid :
911
+ return drm_add_modes_noedid (connector , 640 , 480 );
909
912
}
910
913
911
914
static int hdmi_find_phy_conf (struct hdmi_context * hdata , u32 pixel_clock )
You can’t perform that action at this time.
0 commit comments