Commit eab007dd authored by Dave Airlie's avatar Dave Airlie
Browse files

Merge tag 'drm-misc-fixes-2019-05-22' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes 



- sun4i fixes to hdmi phy as well as u16 overflow in dsi (left from -next-fixes)
- gma500 fix to make lvds detection more reliable
- select devfreq for panfrost since it can't probe without it

Signed-off-by: default avatarDave Airlie <airlied@redhat.com>

From: Sean Paul <sean@poorly.run>
Link: https://patchwork.freedesktop.org/patch/msgid/20190522194440.GA22359@art_vandelay
parents 27e248c4 f3617b44

drivers/gpu/drm/gma500/cdv_intel_lvds.c

+3 −0
Original line number Diff line number Diff line
@@ -594,6 +594,9 @@ void cdv_intel_lvds_init(struct drm_device *dev, 
	int pipe;

	u8 pin;



	if (!dev_priv->lvds_enabled_in_vbt)

		return;



	pin = GMBUS_PORT_PANEL;

	if (!lvds_is_present_in_vbt(dev, &pin)) {

		DRM_DEBUG_KMS("LVDS is not present in VBT\n");

drivers/gpu/drm/gma500/intel_bios.c

+3 −0
Original line number Diff line number Diff line
@@ -436,6 +436,9 @@ parse_driver_features(struct drm_psb_private *dev_priv, 
	if (driver->lvds_config == BDB_DRIVER_FEATURE_EDP)

		dev_priv->edp.support = 1;



	dev_priv->lvds_enabled_in_vbt = driver->lvds_config != 0;

	DRM_DEBUG_KMS("LVDS VBT config bits: 0x%x\n", driver->lvds_config);



	/* This bit means to use 96Mhz for DPLL_A or not */

	if (driver->primary_lfp_id)

		dev_priv->dplla_96mhz = true;

drivers/gpu/drm/gma500/psb_drv.h

+1 −0
Original line number Diff line number Diff line
@@ -537,6 +537,7 @@ struct drm_psb_private { 
	int lvds_ssc_freq;

	bool is_lvds_on;

	bool is_mipi_on;

	bool lvds_enabled_in_vbt;

	u32 mipi_ctrl_display;



	unsigned int core_freq;

drivers/gpu/drm/panfrost/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -9,6 +9,7 @@ config DRM_PANFROST 
	select IOMMU_SUPPORT

	select IOMMU_IO_PGTABLE_LPAE

	select DRM_GEM_SHMEM_HELPER

	select PM_DEVFREQ

	help

	  DRM driver for ARM Mali Midgard (T6xx, T7xx, T8xx) and

	  Bifrost (G3x, G5x, G7x) GPUs.

drivers/gpu/drm/panfrost/panfrost_devfreq.c

+2 −11
Original line number Diff line number Diff line
@@ -140,8 +140,8 @@ int panfrost_devfreq_init(struct panfrost_device *pfdev) 
		return 0;



	ret = dev_pm_opp_of_add_table(&pfdev->pdev->dev);

	if (ret == -ENODEV) /* Optional, continue without devfreq */

		return 0;

	if (ret)

		return ret;



	panfrost_devfreq_reset(pfdev);
@@ -170,9 +170,6 @@ void panfrost_devfreq_resume(struct panfrost_device *pfdev) 
{

	int i;



	if (!pfdev->devfreq.devfreq)

		return;



	panfrost_devfreq_reset(pfdev);

	for (i = 0; i < NUM_JOB_SLOTS; i++)

		pfdev->devfreq.slot[i].busy = false;
@@ -182,9 +179,6 @@ void panfrost_devfreq_resume(struct panfrost_device *pfdev) 


void panfrost_devfreq_suspend(struct panfrost_device *pfdev)

{

	if (!pfdev->devfreq.devfreq)

		return;



	devfreq_suspend_device(pfdev->devfreq.devfreq);

}
@@ -194,9 +188,6 @@ static void panfrost_devfreq_update_utilization(struct panfrost_device *pfdev, i 
	ktime_t now;

	ktime_t last;



	if (!pfdev->devfreq.devfreq)

		return;



	now = ktime_get();

	last = pfdev->devfreq.slot[slot].time_last_update;