Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21689a44 authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge branch 'drm-atmel-hlcdc-fixes' of git://github.com/bbrezillon/linux-at91 into drm-fixes 

minor atmel hclcdc fixes.

* 'drm-atmel-hlcdc-fixes' of git://github.com/bbrezillon/linux-at91:
  drm: atmel-hlcdc: remove clock polarity from crtc driver
  drm: atmel-hlcdc: remove useless pm_runtime_put_sync in probe
  drm: atmel-hlcdc: reset layer A2Q and UPDATE bits when disabling it
parents d1e488fd 0bb59cb0

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ static int atmel_hlcdc_crtc_mode_set(struct drm_crtc *c, 
		     (adj->crtc_hdisplay - 1) |

		     ((adj->crtc_vdisplay - 1) << 16));



	cfg = ATMEL_HLCDC_CLKPOL;

	cfg = 0;



	prate = clk_get_rate(crtc->dc->hlcdc->sys_clk);

	mode_rate = mode->crtc_clock * 1000;

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c

+0 −2
Original line number Diff line number Diff line
@@ -311,8 +311,6 @@ static int atmel_hlcdc_dc_load(struct drm_device *dev) 


	pm_runtime_enable(dev->dev);



	pm_runtime_put_sync(dev->dev);



	ret = atmel_hlcdc_dc_modeset_init(dev);

	if (ret < 0) {

		dev_err(dev->dev, "failed to initialize mode setting\n");

drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_layer.c

+2 −1
Original line number Diff line number Diff line
@@ -311,7 +311,8 @@ int atmel_hlcdc_layer_disable(struct atmel_hlcdc_layer *layer) 


	/* Disable the layer */

	regmap_write(regmap, desc->regs_offset + ATMEL_HLCDC_LAYER_CHDR,

		     ATMEL_HLCDC_LAYER_RST);

		     ATMEL_HLCDC_LAYER_RST | ATMEL_HLCDC_LAYER_A2Q |

		     ATMEL_HLCDC_LAYER_UPDATE);



	/* Clear all pending interrupts */

	regmap_read(regmap, desc->regs_offset + ATMEL_HLCDC_LAYER_ISR, &isr);