Merge tag 'v4.3-rc2' into k.o/for-4.3-v1

[firefly-linux-kernel-4.4.55.git] / drivers / gpu / drm / nouveau / nouveau_connector.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_connector.c b/drivers/gpu/drm/nouveau/nouveau_connector.c
index 054f0f25c8beec441b800e36cf3a662bc066ce69..2e7cbe933533c97b9a211827d5005d2adc282496 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_connector.c
+++ b/drivers/gpu/drm/nouveau/nouveau_connector.c
@@ -125,9 +125,9 @@ nouveau_connector_ddc_detect(struct drm_connector *connector)
         * is handled by the SOR itself, and not required for LVDS DDC.
         */
        if (nv_connector->type == DCB_CONNECTOR_eDP) {
-               panel = gpio->get(gpio, 0, DCB_GPIO_PANEL_POWER, 0xff);
+               panel = nvkm_gpio_get(gpio, 0, DCB_GPIO_PANEL_POWER, 0xff);
                if (panel == 0) {
-                       gpio->set(gpio, 0, DCB_GPIO_PANEL_POWER, 0xff, 1);
+                       nvkm_gpio_set(gpio, 0, DCB_GPIO_PANEL_POWER, 0xff, 1);
                        msleep(300);
                }
        }
@@ -157,7 +157,7 @@ nouveau_connector_ddc_detect(struct drm_connector *connector)
         * state to avoid confusing the SOR for other output types.
         */
        if (!nv_encoder && panel == 0)
-               gpio->set(gpio, 0, DCB_GPIO_PANEL_POWER, 0xff, panel);
+               nvkm_gpio_set(gpio, 0, DCB_GPIO_PANEL_POWER, 0xff, panel);
 
        return nv_encoder;
 }
@@ -1256,8 +1256,8 @@ nouveau_connector_create(struct drm_device *dev, int index)
                break;
        }
 
-       ret = nvif_notify_init(&disp->disp, NULL, nouveau_connector_hotplug,
-                               true, NV04_DISP_NTFY_CONN,
+       ret = nvif_notify_init(&disp->disp, nouveau_connector_hotplug, true,
+                              NV04_DISP_NTFY_CONN,
                               &(struct nvif_notify_conn_req_v0) {
                                .mask = NVIF_NOTIFY_CONN_V0_ANY,
                                .conn = index,