diff options
| author | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:38:54 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-07-15 10:38:54 +0200 |
| commit | 07ccdcd34ac39ddecb8ccd00e5f03d76e9be8881 (patch) | |
| tree | ffd8a0ffd6d803e5fa78c115a83b7dcd3c246d7c /drivers/gpu/drm/exynos/exynos_dp.c | |
| parent | 3c8fad9183ab7b3b3471fd2bb3d604104dd447cb (diff) | |
| parent | fa3a9f5744a92c0d7856d4e326c8d920d1d31116 (diff) | |
| download | lwn-07ccdcd34ac39ddecb8ccd00e5f03d76e9be8881.tar.gz lwn-07ccdcd34ac39ddecb8ccd00e5f03d76e9be8881.zip | |
Merge branch 'linus' into x86/apic, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'drivers/gpu/drm/exynos/exynos_dp.c')
| -rw-r--r-- | drivers/gpu/drm/exynos/exynos_dp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/gpu/drm/exynos/exynos_dp.c b/drivers/gpu/drm/exynos/exynos_dp.c index 468498e3fec1..4c1fb3f8b5a6 100644 --- a/drivers/gpu/drm/exynos/exynos_dp.c +++ b/drivers/gpu/drm/exynos/exynos_dp.c @@ -34,7 +34,7 @@ struct exynos_dp_device { struct drm_encoder encoder; - struct drm_connector connector; + struct drm_connector *connector; struct drm_bridge *ptn_bridge; struct drm_device *drm_dev; struct device *dev; @@ -70,7 +70,7 @@ static int exynos_dp_poweroff(struct analogix_dp_plat_data *plat_data) static int exynos_dp_get_modes(struct analogix_dp_plat_data *plat_data) { struct exynos_dp_device *dp = to_dp(plat_data); - struct drm_connector *connector = &dp->connector; + struct drm_connector *connector = dp->connector; struct drm_display_mode *mode; int num_modes = 0; @@ -103,6 +103,7 @@ static int exynos_dp_bridge_attach(struct analogix_dp_plat_data *plat_data, int ret; drm_connector_register(connector); + dp->connector = connector; /* Pre-empt DP connector creation if there's a bridge */ if (dp->ptn_bridge) { |