The CRTC has those fields and we can just use them.
Signed-off-by: Eric Anholt <eric@anholt.net>
(cherry picked from commit
2ad1a992b5194a01d2dbde9eead1d7a1e2b2677d
https://github.com/raspberrypi/linux raspi/rpi-4.15.y)
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>
struct drm_crtc base;
struct drm_encoder *encoder;
struct drm_connector *connector;
struct drm_crtc base;
struct drm_encoder *encoder;
struct drm_connector *connector;
- struct drm_plane *primary;
- struct drm_plane *cursor;
void __iomem *regs;
struct drm_pending_vblank_event *event;
void __iomem *regs;
struct drm_pending_vblank_event *event;
static void vc4_crtc_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
static void vc4_crtc_disable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
- struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-
/* Always turn the planes off on CRTC disable. In DRM, planes
* are enabled/disabled through the update/disable hooks
* above, and the CRTC enable/disable independently controls
* whether anything scans out at all, but the firmware doesn't
* give us a CRTC-level control for that.
*/
/* Always turn the planes off on CRTC disable. In DRM, planes
* are enabled/disabled through the update/disable hooks
* above, and the CRTC enable/disable independently controls
* whether anything scans out at all, but the firmware doesn't
* give us a CRTC-level control for that.
*/
- vc4_cursor_plane_atomic_disable(vc4_crtc->cursor,
- vc4_crtc->cursor->state);
- vc4_plane_set_primary_blank(vc4_crtc->primary, true);
+ vc4_cursor_plane_atomic_disable(crtc->cursor, crtc->cursor->state);
+ vc4_plane_set_primary_blank(crtc->primary, true);
}
static void vc4_crtc_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
}
static void vc4_crtc_enable(struct drm_crtc *crtc, struct drm_crtc_state *old_state)
{
- struct vc4_crtc *vc4_crtc = to_vc4_crtc(crtc);
-
/* Unblank the planes (if they're supposed to be displayed). */
/* Unblank the planes (if they're supposed to be displayed). */
- if (vc4_crtc->primary->state->fb)
- vc4_plane_set_primary_blank(vc4_crtc->primary, false);
- if (vc4_crtc->cursor->state->fb) {
- vc4_cursor_plane_atomic_update(vc4_crtc->cursor,
- vc4_crtc->cursor->state);
+ if (crtc->primary->state->fb)
+ vc4_plane_set_primary_blank(crtc->primary, false);
+ if (crtc->cursor->state->fb) {
+ vc4_cursor_plane_atomic_update(crtc->cursor,
+ crtc->cursor->state);
primary_plane->crtc = crtc;
cursor_plane->crtc = crtc;
primary_plane->crtc = crtc;
cursor_plane->crtc = crtc;
- vc4_crtc->primary = primary_plane;
- vc4_crtc->cursor = cursor_plane;
-
vc4_encoder = devm_kzalloc(dev, sizeof(*vc4_encoder), GFP_KERNEL);
if (!vc4_encoder)
return -ENOMEM;
vc4_encoder = devm_kzalloc(dev, sizeof(*vc4_encoder), GFP_KERNEL);
if (!vc4_encoder)
return -ENOMEM;