Commit 0a4334c9 authored by Dave Airlie's avatar Dave Airlie

Merge tag 'drm-hisilicon-next-2017-11-01' of github.com:xin3liang/linux into drm-next

For 4.15

* tag 'drm-hisilicon-next-2017-11-01' of github.com:xin3liang/linux:
  drm/hisilicon: Ensure LDI regs are properly configured.
parents 87331c83 a2f04243
...@@ -534,9 +534,12 @@ static void ade_crtc_atomic_begin(struct drm_crtc *crtc, ...@@ -534,9 +534,12 @@ static void ade_crtc_atomic_begin(struct drm_crtc *crtc,
{ {
struct ade_crtc *acrtc = to_ade_crtc(crtc); struct ade_crtc *acrtc = to_ade_crtc(crtc);
struct ade_hw_ctx *ctx = acrtc->ctx; struct ade_hw_ctx *ctx = acrtc->ctx;
struct drm_display_mode *mode = &crtc->state->mode;
struct drm_display_mode *adj_mode = &crtc->state->adjusted_mode;
if (!ctx->power_on) if (!ctx->power_on)
(void)ade_power_up(ctx); (void)ade_power_up(ctx);
ade_ldi_set_mode(acrtc, mode, adj_mode);
} }
static void ade_crtc_atomic_flush(struct drm_crtc *crtc, static void ade_crtc_atomic_flush(struct drm_crtc *crtc,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment