diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c index 22717ee21d26..418d878d52a6 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.c +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.c @@ -1483,7 +1483,6 @@ static int rockchip_drm_bind(struct device *dev) s = to_rockchip_crtc_state(crtc->state); if (is_support_hotplug(s->output_type)) { - s->crtc_primary_fb = crtc->primary->fb; crtc->primary->fb = helper->fb; drm_framebuffer_get(helper->fb); } @@ -1551,15 +1550,8 @@ static int rockchip_drm_open(struct drm_device *dev, struct drm_file *file) { struct drm_crtc *crtc; - drm_for_each_crtc(crtc, dev) { - struct rockchip_crtc_state *s = NULL; - - s = to_rockchip_crtc_state(crtc->state); - if (s->crtc_primary_fb) { - crtc->primary->fb = s->crtc_primary_fb; - s->crtc_primary_fb = NULL; - } - } + drm_for_each_crtc(crtc, dev) + crtc->primary->fb = NULL; return 0; } diff --git a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h index 1bb801143854..901c1eae69a1 100644 --- a/drivers/gpu/drm/rockchip/rockchip_drm_drv.h +++ b/drivers/gpu/drm/rockchip/rockchip_drm_drv.h @@ -121,7 +121,6 @@ struct rockchip_crtc_state { int color_space; int eotf; struct rockchip_hdr_state hdr; - struct drm_framebuffer *crtc_primary_fb; }; #define to_rockchip_crtc_state(s) \ container_of(s, struct rockchip_crtc_state, base)