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

Commit 5965c673 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "drm/msm: compilation fixes for DRM on 4.14"

parents 44bfed7c 64947e56

drivers/gpu/drm/msm/Makefile

+1 −1
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

ccflags-y := -Idrivers/gpu/drm/msm -Idrivers/gpu/drm/msm/dsi-staging -Idrivers/gpu/drm/msm/dp

ccflags-y := -Iinclude/drm -Idrivers/gpu/drm/msm -Idrivers/gpu/drm/msm/dsi-staging -Idrivers/gpu/drm/msm/dp

ccflags-y += -Idrivers/gpu/drm/msm/display-manager

ccflags-$(CONFIG_DRM_MSM_DSI) += -Idrivers/gpu/drm/msm/dsi

ccflags-$(CONFIG_DRM_MSM_DSI_PLL) += -Idrivers/gpu/drm/msm/dsi

drivers/gpu/drm/msm/dp/dp_ctrl.c

+1 −1
Original line number Diff line number Diff line
@@ -242,7 +242,7 @@ static u64 rounddown_u64(u64 x, u64 y) 
static void dp_ctrl_calc_tu_parameters(struct dp_ctrl_private *ctrl,

		struct dp_vc_tu_mapping_table *tu_table)

{

	u32 const multiplier = 1000000;

	u32 multiplier = 1000000;

	u64 pclk, lclk;

	u8 bpp, ln_cnt;

	int run_idx = 0;

drivers/gpu/drm/msm/dp/dp_display.c

+1 −2
Original line number Diff line number Diff line
@@ -270,7 +270,6 @@ static void dp_display_deinitialize_hdcp(struct dp_display_private *dp) 


	sde_dp_hdcp2p2_deinit(dp->hdcp.data);

	dp_display_destroy_hdcp_workqueue(dp);

	if (&dp->hdcp_mutex)

	mutex_destroy(&dp->hdcp_mutex);

}

drivers/gpu/drm/msm/dsi-staging/dsi_phy_timing_calc.c

+2 −2
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ static int calc_clk_prepare(struct dsi_phy_hw *phy, 
			    s32 *actual_frac,

			    s64 *actual_intermediate)

{

	u64 const multiplier = BIT(20);

	u64 multiplier = BIT(20);

	struct timing_entry *t = &desc->clk_prepare;

	int rc = 0;

	u64 dividend, temp, temp_multiple;
@@ -196,7 +196,7 @@ static int calc_hs_prepare(struct dsi_phy_hw *phy, 
			struct phy_timing_desc *desc,

			u64 *temp_mul)

{

	u64 const multiplier = BIT(20);

	u64 multiplier = BIT(20);

	int rc = 0;

	struct timing_entry *t = &desc->hs_prepare;

	u64 temp_multiple, dividend, temp;

drivers/gpu/drm/msm/msm_drv.c

+1 −3
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 


#include <linux/of_address.h>

#include <linux/kthread.h>

#include <uapi/linux/sched/types.h>

#include <drm/drm_of.h>

#include "msm_drv.h"

#include "msm_debugfs.h"
@@ -332,7 +333,6 @@ static int msm_drm_uninit(struct device *dev) 
	drm_kms_helper_poll_fini(ddev);



	drm_mode_config_cleanup(ddev);

	drm_vblank_cleanup(ddev);



	if (priv->registered) {

		drm_dev_unregister(ddev);
@@ -1340,7 +1340,6 @@ static int msm_ioctl_register_event(struct drm_device *dev, void *data, 
		return -ENOMEM;



	client->base.file_priv = file;

	client->base.pid = current->pid;

	client->base.event = &client->event;

	client->event.type = req_event->event;

	memcpy(&client->info, req_event, sizeof(client->info));
@@ -1452,7 +1451,6 @@ void msm_mode_object_event_notify(struct drm_mode_object *obj, 
			continue;

		notify->base.file_priv = node->base.file_priv;

		notify->base.event = &notify->event;

		notify->base.pid = node->base.pid;

		notify->event.type = node->event.type;

		notify->event.length = event->length +

					sizeof(struct drm_msm_event_resp);